[mono/mono] [2 commits] 0a4a52cb: [mkbundle] New mkbundle options for better handling integration with native libs.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/2a4a45902114...cd474dc5525a

   Commit: 0a4a52cb9662f8ecb5c155cf1e0f66b8c60f4076
   Author: Rodrigo Kumpera <[email protected]> (kumpera)
     Date: 2013-10-21 19:22:47 GMT
      URL: https://github.com/mono/mono/commit/0a4a52cb9662f8ecb5c155cf1e0f66b8c60f4076

[mkbundle] New mkbundle options for better handling integration with native libs.

New --skip-scan flag allow us to handle resource assemblies as opaque data.
New --static-ctor flag allows us to better interop with weird C libraries requirements.

Changed paths:
  M mcs/tools/mkbundle/mkbundle.cs

Modified: mcs/tools/mkbundle/mkbundle.cs
===================================================================
@@ -38,6 +38,8 @@ class MakeBundle {
 	static bool compress;
 	static bool nomain;
 	static bool? use_dos2unix = null;
+	static bool skip_scan;
+	static string ctor_func;
 	
 	static int Main (string [] args)
 	{
@@ -146,6 +148,16 @@ static int Main (string [] args)
 				}
 					
 				break;
+			case "--skip-scan":
+				skip_scan = true;
+				break;
+			case "--static-ctor":
+				if (i+1 == top) {
+					Help ();
+					return 1;
+				}
+				ctor_func = args [++i];
+				break;
 			default:
 				sources.Add (args [i]);
 				break;
@@ -163,10 +175,10 @@ static int Main (string [] args)
 			Environment.Exit (1);
 		}
 
-		List<Assembly> assemblies = LoadAssemblies (sources);
+		List<string> assemblies = LoadAssemblies (sources);
 		List<string> files = new List<string> ();
-		foreach (Assembly a in assemblies)
-			QueueAssembly (files, a.CodeBase);
+		foreach (string file in assemblies)
+			QueueAssembly (files, file);
 			
 		// Special casing mscorlib.dll: any specified mscorlib.dll cannot be loaded
 		// by Assembly.ReflectionFromLoadFrom(). Instead the fx assembly which runs
@@ -437,6 +449,12 @@ static void GenerateBundles (List<string> files)
 			tc.WriteLine ("\tNULL\n};\n");
 			tc.WriteLine ("static char *image_name = \"{0}\";", prog);
 
+			if (ctor_func != null) {
+				tc.WriteLine ("\nextern void {0} (void);", ctor_func);
+				tc.WriteLine ("\n__attribute__ ((constructor)) static void mono_mkbundle_ctor (void)");
+				tc.WriteLine ("{{\n\t{0} ();\n}}", ctor_func);
+			}
+
 			tc.WriteLine ("\nstatic void install_dll_config_files (void) {\n");
 			foreach (string[] ass in config_names){
 				tc.WriteLine ("\tmono_register_config_for_assembly (\"{0}\", assembly_config_{1});\n", ass [0], ass [1]);
@@ -518,20 +536,29 @@ static void GenerateBundles (List<string> files)
 		}
 	}
 	
-	static List<Assembly> LoadAssemblies (List<string> sources)
+	static List<string> LoadAssemblies (List<string> sources)
 	{
-		List<Assembly> assemblies = new List<Assembly> ();
+		List<string> assemblies = new List<string> ();
 		bool error = false;
 		
 		foreach (string name in sources){
-			Assembly a = LoadAssembly (name);
+			try {
+				Assembly a = LoadAssembly (name);
 
-			if (a == null){
-				error = true;
-				continue;
-			}
+				if (a == null){
+					error = true;
+					continue;
+				}
 			
-			assemblies.Add (a);
+				assemblies.Add (a.CodeBase);
+			} catch (Exception e) {
+				if (skip_scan) {
+					Console.WriteLine ("File will not be scanned: {0}", name);
+					assemblies.Add (new Uri (new FileInfo (name).FullName).ToString ());
+				} else {
+					throw;
+				}
+			}
 		}
 
 		if (error)
@@ -544,18 +571,23 @@ static List<Assembly> LoadAssemblies (List<string> sources)
 	
 	static void QueueAssembly (List<string> files, string codebase)
 	{
+		// Console.WriteLine ("CODE BASE IS {0}", codebase);
 		if (files.Contains (codebase))
 			return;
 
 		files.Add (codebase);
-		Assembly a = universe.LoadFile (new Uri(codebase).LocalPath);
-
 		if (!autodeps)
 			return;
-		
-		foreach (AssemblyName an in a.GetReferencedAssemblies ()) {
-			a = universe.Load (an.Name);
-			QueueAssembly (files, a.CodeBase);
+		try {
+			Assembly a = universe.LoadFile (new Uri(codebase).LocalPath);
+
+			foreach (AssemblyName an in a.GetReferencedAssemblies ()) {
+				a = universe.Load (an.Name);
+				QueueAssembly (files, a.CodeBase);
+			}
+		} catch (Exception e) {
+			if (!skip_scan)
+				throw;
 		}
 	}
 
@@ -626,6 +658,8 @@ static void Help ()
 				   "    --static            Statically link to mono libs\n" +
 				   "    --nomain            Don't include a main() function, for libraries\n" +
 				   "    -z                  Compress the assemblies before embedding.\n" +
+				   "    --skip-scan         Skip scanning assemblies that could not be loaded (but still embed them).\n" +
+				   "    --static-ctor ctor  Add a constructor call to the supplied function.\n" +
 				   "                        You need zlib development headers and libraries.\n");
 	}
 

   Commit: cd474dc5525a37b2a7ffe517f835dd5047519cf3
   Author: Rodrigo Kumpera <[email protected]> (kumpera)
     Date: 2013-10-21 19:25:46 GMT
      URL: https://github.com/mono/mono/commit/cd474dc5525a37b2a7ffe517f835dd5047519cf3

Bump mono to 3.2.5

Changed paths:
  M configure.in

Modified: configure.in
===================================================================
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #AC_PREREQ([2.62])
 
-AC_INIT(mono, [3.2.3],
+AC_INIT(mono, [3.2.5],
         [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
 
 AC_CONFIG_SRCDIR([README])


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches