}
ctor_func = args [++i];
break;
+ case "--dos2unix":
+ case "--dos2unix=true":
+ use_dos2unix = true;
+ break;
+ case "--dos2unix=false":
+ use_dos2unix = false;
+ break;
default:
sources.Add (args [i]);
break;
}
-
- if (static_link && style == "windows") {
- Console.Error.WriteLine ("The option `{0}' is not supported on this platform.", args [i]);
- return 1;
- }
+
}
Console.WriteLine ("Sources: {0} Auto-dependencies: {1}", sources.Count, autodeps);
// Do the file reading and compression in parallel
Action<string> body = delegate (string url) {
- string fname = new Uri (url).LocalPath;
+ string fname = LocateFile (new Uri (url).LocalPath);
Stream stream = File.OpenRead (fname);
long real_size = stream.Length;
// The non-parallel part
byte [] buffer = new byte [8192];
foreach (var url in files) {
- string fname = new Uri (url).LocalPath;
+ string fname = LocateFile (new Uri (url).LocalPath);
string aname = Path.GetFileName (fname);
string encoded = aname.Replace ("-", "_").Replace (".", "_");
}
ts.Close ();
- string assembler = GetEnv ("AS", IsUnix ? "as" : "i686-pc-mingw32-as");
-
- Console.WriteLine ("Compiling:");
- string cmd = String.Format ("{0} -o {1} {2} ", assembler, temp_o, temp_s);
- int ret = Execute (cmd);
- if (ret != 0){
- Error ("[Fail]");
- return;
- }
-
if (compress)
tc.WriteLine ("\nstatic const CompressedAssembly *compressed [] = {");
else
string maintemplate = st.ReadToEnd ();
tc.Write (maintemplate);
}
-
+
tc.Close ();
+ string assembler = GetEnv("AS", "as");
+ string as_cmd = String.Format("{0} -o {1} {2} ", assembler, temp_o, temp_s);
+ Execute(as_cmd);
+
if (compile_only)
return;
+ Console.WriteLine("Compiling:");
+
+ if (style == "windows")
+ {
+
+ Func<string, string> quote = (pp) => { return "\"" + pp + "\""; };
+
+ string compiler = GetEnv("CC", "cl.exe");
+ string winsdkPath = GetEnv("WINSDK", @"C:\Program Files (x86)\Windows Kits\8.1");
+ string vsPath = GetEnv("VSINCLUDE", @"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC");
+ string monoPath = GetEnv("MONOPREFIX", @"C:\Program Files (x86)\Mono");
+
+ string[] includes = new string[] {winsdkPath + @"\Include\um", winsdkPath + @"\Include\shared", vsPath + @"\include", monoPath + @"\include\mono-2.0"};
+ string[] libs = new string[] { winsdkPath + @"\Lib\winv6.3\um\x86" , vsPath + @"\lib" };
+ string monoFile;
- string zlib = (compress ? "-lz" : "");
- string debugging = "-g";
- string cc = GetEnv ("CC", IsUnix ? "cc" : "i686-pc-mingw32-gcc");
+ var compilerArgs = new List<string>();
+ foreach (string include in includes)
+ compilerArgs.Add(String.Format ("/I {0}", quote (include)));
- if (style == "linux")
- debugging = "-ggdb";
- if (static_link) {
- string smonolib;
- if (style == "osx")
- smonolib = "`pkg-config --variable=libdir mono-2`/libmono-2.0.a ";
+ if (static_link)
+ monoFile = LocateFile (monoPath + @"\lib\monosgen-2.0.lib");
else
- smonolib = "-Wl,-Bstatic -lmono-2.0 -Wl,-Bdynamic ";
- cmd = String.Format ("{4} -o {2} -Wall `pkg-config --cflags mono-2` {0} {3} " +
- "`pkg-config --libs-only-L mono-2` " + smonolib +
- "`pkg-config --libs-only-l mono-2 | sed -e \"s/\\-lmono-2.0 //\"` {1}",
- temp_c, temp_o, output, zlib, cc);
- } else {
-
- cmd = String.Format ("{4} " + debugging + " -o {2} -Wall {0} `pkg-config --cflags --libs mono-2` {3} {1}",
- temp_c, temp_o, output, zlib, cc);
+ monoFile = LocateFile (monoPath + @"\lib\monosgen-2.0.dll");
+
+ compilerArgs.Add("/MD");
+ compilerArgs.Add(temp_c);
+ compilerArgs.Add(temp_o);
+ compilerArgs.Add("/link");
+
+ if (nomain)
+ compilerArgs.Add("/NOENTRY");
+ compilerArgs.Add("/DLL");
+
+ foreach (string lib in libs)
+ compilerArgs.Add(String.Format ("/LIBPATH:{0}", quote(lib)));
+ compilerArgs.Add (quote(monoFile));
+
+ string cl_cmd = String.Format("{0} {1}", compiler, String.Join(" ", compilerArgs.ToArray()));
+ Execute (cl_cmd);
}
-
- ret = Execute (cmd);
- if (ret != 0){
- Error ("[Fail]");
- return;
+ else
+ {
+ string zlib = (compress ? "-lz" : "");
+ string debugging = "-g";
+ string cc = GetEnv("CC", "cc");
+ string cmd = null;
+
+ if (style == "linux")
+ debugging = "-ggdb";
+ if (static_link)
+ {
+ string smonolib;
+ if (style == "osx")
+ smonolib = "`pkg-config --variable=libdir mono-2`/libmono-2.0.a ";
+ else
+ smonolib = "-Wl,-Bstatic -lmono-2.0 -Wl,-Bdynamic ";
+ cmd = String.Format("{4} -o {2} -Wall `pkg-config --cflags mono-2` {0} {3} " +
+ "`pkg-config --libs-only-L mono-2` " + smonolib +
+ "`pkg-config --libs-only-l mono-2 | sed -e \"s/\\-lmono-2.0 //\"` {1}",
+ temp_c, temp_o, output, zlib, cc);
+ }
+ else
+ {
+
+ cmd = String.Format("{4} " + debugging + " -o {2} -Wall {0} `pkg-config --cflags --libs mono-2` {3} {1}",
+ temp_c, temp_o, output, zlib, cc);
+ }
+ Execute (cmd);
}
+
Console.WriteLine ("Done");
- }
- }
+ }
+ }
} finally {
if (!keeptemp){
if (object_out == null){
}
assemblies.Add (a.CodeBase);
- } catch (Exception e) {
+ } catch (Exception) {
if (skip_scan) {
Console.WriteLine ("File will not be scanned: {0}", name);
assemblies.Add (new Uri (new FileInfo (name).FullName).ToString ());
if (!QueueAssembly (files, a.CodeBase))
return false;
}
- } catch (Exception e) {
+ } catch (Exception) {
if (!skip_scan)
throw;
}
" -L path Adds `path' to the search path for assemblies\n" +
" --nodeps Turns off automatic dependency embedding (default)\n" +
" --deps Turns on automatic dependency embedding\n" +
+ " --dos2unix[=true|false]\n" +
+ " When no value provided, or when `true` specified\n" +
+ " `dos2unix` will be invoked to convert paths on Windows.\n" +
+ " When `--dos2unix=false` used, dos2unix is NEVER used.\n" +
" --keeptemp Keeps the temporary files\n" +
" --config F Bundle system config file `F'\n" +
" --config-dir D Set MONO_CFG_DIR to `D'\n" +
}
}
- static int Execute (string cmdLine)
+ static void Execute (string cmdLine)
{
if (IsUnix) {
- Console.WriteLine (cmdLine);
- return system (cmdLine);
+ Console.WriteLine ("[execute cmd]: " + cmdLine);
+ int ret = system (cmdLine);
+ if (ret != 0)
+ {
+ Error(String.Format("[Fail] {0}", ret));
+ }
+ return;
}
-
-#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
// with Mono.
//
// But if it's *not* on cygwin, just skip it.
-
+
// check if dos2unix is applicable.
- if (use_dos2unix == null) {
- use_dos2unix = false;
+ if (use_dos2unix == true)
try {
- var info = new ProcessStartInfo ("dos2unix");
- info.CreateNoWindow = true;
- info.RedirectStandardInput = true;
- info.UseShellExecute = false;
- var dos2unix = Process.Start (info);
- dos2unix.StandardInput.WriteLine ("aaa");
- dos2unix.StandardInput.WriteLine ("\u0004");
- dos2unix.StandardInput.Close ();
- dos2unix.WaitForExit ();
- if (dos2unix.ExitCode == 0)
- use_dos2unix = true;
- } catch {
- // ignore
- }
- }
- // 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;
- dos2unix.FileName = "cmd";
- dos2unix.Arguments = String.Format ("/c \"{0}\"", cmdLine);
-
- using (Process p = Process.Start (dos2unix)) {
- p.WaitForExit ();
- return p.ExitCode;
- }
-#if XAMARIN_ANDROID
+ var info = new ProcessStartInfo ("dos2unix");
+ info.CreateNoWindow = true;
+ info.RedirectStandardInput = true;
+ info.UseShellExecute = false;
+ var dos2unix = Process.Start (info);
+ dos2unix.StandardInput.WriteLine ("aaa");
+ dos2unix.StandardInput.WriteLine ("\u0004");
+ dos2unix.StandardInput.Close ();
+ dos2unix.WaitForExit ();
+ if (dos2unix.ExitCode == 0)
+ use_dos2unix = true;
+ } catch {
+ Console.WriteLine("Warning: dos2unix not found");
+ use_dos2unix = false;
}
-#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");
+ if (use_dos2unix == null)
+ use_dos2unix = false;
+
+ ProcessStartInfo psi = new ProcessStartInfo();
+ psi.UseShellExecute = false;
+
+ // if there is no dos2unix, just run cmd /c.
+ if (use_dos2unix == false)
+ {
+ psi.FileName = "cmd";
+ psi.Arguments = String.Format("/c \"{0}\"", cmdLine);
+ }
+ else
+ {
+ psi.FileName = "sh";
+ StringBuilder b = new StringBuilder();
+ int count = 0;
+ for (int i = 0; i < cmdLine.Length; i++)
+ {
+ if (cmdLine[i] == '`')
+ {
+ if (count % 2 != 0)
+ {
+ b.Append("|dos2unix");
+ }
+ count++;
}
-#endif
- count++;
+ b.Append(cmdLine[i]);
}
- b.Append (cmdLine [i]);
+ cmdLine = b.ToString();
+ psi.Arguments = String.Format("-c \"{0}\"", cmdLine);
}
- cmdLine = b.ToString ();
- Console.WriteLine (cmdLine);
-
- ProcessStartInfo psi = new ProcessStartInfo ();
- psi.UseShellExecute = false;
- psi.FileName = "sh";
- psi.Arguments = String.Format ("-c \"{0}\"", cmdLine);
+ Console.WriteLine(cmdLine);
using (Process p = Process.Start (psi)) {
p.WaitForExit ();
- return p.ExitCode;
+ int ret = p.ExitCode;
+ if (ret != 0){
+ Error (String.Format("[Fail] {0}", ret));
+ }
+ }
+ }
+
+ static string GetEnv(string name, string defaultValue)
+ {
+ string val = Environment.GetEnvironmentVariable(name);
+ if (val != null)
+ {
+ Console.WriteLine("{0} = {1}", name, val);
+ }
+ else
+ {
+ val = defaultValue;
+ Console.WriteLine("{0} = {1} (default)", name, val);
}
+ return val;
}
- static string GetEnv (string name, string defaultValue)
+ static string LocateFile(string default_path)
{
- string s = Environment.GetEnvironmentVariable (name);
- return s != null ? s : defaultValue;
+ var override_path = Path.Combine(Directory.GetCurrentDirectory(), Path.GetFileName(default_path));
+ if (File.Exists(override_path))
+ return override_path;
+ else if (File.Exists(default_path))
+ return default_path;
+ else
+ throw new FileNotFoundException(default_path);
}
}
projects / mono.git / blobdiff