mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/tools/mkbundle/mkbundle.cs
View File

@ -19,9 +19,7 @@ using System.Text;
using IKVM.Reflection;
#if NET_4_5
using System.Threading.Tasks;
#endif
class MakeBundle {
static string output = "a.out";
@ -704,6 +702,7 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
return system (cmdLine);
}
#if XAMARIN_ANDROID
// on Windows, we have to pipe the output of a
// `cmd` interpolation to dos2unix, because the shell does not
// strip the CRLFs generated by the native pkg-config distributed
@ -732,6 +731,7 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
}
// and if there is no dos2unix, just run cmd /c.
if (use_dos2unix == false) {
#endif
Console.WriteLine (cmdLine);
ProcessStartInfo dos2unix = new ProcessStartInfo ();
dos2unix.UseShellExecute = false;
@ -742,15 +742,19 @@ void mono_register_config_for_assembly (const char* assembly_name, cons
p.WaitForExit ();
return p.ExitCode;
}
#if XAMARIN_ANDROID
}
#endif
StringBuilder b = new StringBuilder ();
int count = 0;
for (int i = 0; i < cmdLine.Length; i++) {
if (cmdLine [i] == '`') {
#if XAMARIN_ANDROID
if (count % 2 != 0) {
b.Append ("|dos2unix");
}
#endif
count++;
}
b.Append (cmdLine [i]);