Another masterful innovation from MonoLabs\!

svn path=/trunk/mcs/; revision=36706

diff --git a/mcs/tools/mkbundle/Makefile b/mcs/tools/mkbundle/Makefile
index 268c484d6e412d1e7b244c9fd3d9f6c54db62387..17668708fb2c25ec13724d84db68e3e597063f5e 100644 (file)
--- a/mcs/tools/mkbundle/Makefile
+++ b/mcs/tools/mkbundle/Makefile
@@ -2,8 +2,10 @@ thisdir = tools/mkbundle
 SUBDIRS = 
 include ../../build/rules.make
 
-LOCAL_MCS_FLAGS=-r:Mono.Posix
+LOCAL_MCS_FLAGS=-r:Mono.Posix -resource:template.c
 
 PROGRAM = mkbundle.exe
 
 include ../../build/executable.make
+
+mkbundle.exe: mkbundle.cs template.c

diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs
index 506d5a1c6faed86d61c00fdf447dbaca925776e8..011df4305a0077f004dd50293a67ab1364ce85a0 100644 (file)
--- a/mcs/tools/mkbundle/mkbundle.cs
+++ b/mcs/tools/mkbundle/mkbundle.cs
@@ -18,9 +18,11 @@ using Mono.Posix;
 
 class MakeBundle {
        static string output = "a.out";
+       static string object_out = null;
        static ArrayList link_paths = new ArrayList ();
        static bool autodeps = false;
        static bool keeptemp = false;
+       static bool compile_only = false;
        
        static int Main (string [] args)
        {
@@ -29,15 +31,15 @@ class MakeBundle {
                link_paths.Add (".");
                
                for (int i = 0; i < top; i++){
-
                        switch (args [i]){
                        case "-h":
                                Help ();
                                return 1;
-                       }
-                       
-                       // Now process options that take an argument
-                       switch (args [i]){
+
+                       case "-c":
+                               compile_only = true;
+                               break;
+                               
                        case "-o": 
                                if (i+1 == top){
                                        Help (); 
@@ -46,6 +48,14 @@ class MakeBundle {
                                output = args [++i];
                                break;
 
+                       case "-oo":
+                               if (i+1 == top){
+                                       Help (); 
+                                       return 1;
+                               }
+                               object_out = args [++i];
+                               break;
+
                        case "-L":
                                if (i+1 == top){
                                        Help (); 
@@ -94,6 +104,11 @@ class MakeBundle {
                string temp_s = "temp.s"; // Path.GetTempFileName ();
                string temp_c = "temp.c";
                string temp_o = Path.GetTempFileName () + ".o";
+
+               if (compile_only)
+                       temp_c = output;
+               if (object_out != null)
+                       temp_o = object_out;
                
                try {
                        ArrayList c_bundle_names = new ArrayList ();
@@ -101,13 +116,18 @@ class MakeBundle {
 
                        StreamWriter ts = new StreamWriter (File.Create (temp_s));
                        StreamWriter tc = new StreamWriter (File.Create (temp_c));
+                       string prog = null;
 
+                       tc.WriteLine ("/* This source code was produced by mkbundle, do not edit */");
                        tc.WriteLine ("#include <mono/metadata/assembly.h>\n");
                        foreach (string url in files){
                                string fname = url.Substring (7);
                                string aname = fname.Substring (fname.LastIndexOf ("/") + 1);
                                string encoded = aname.Replace ("-", "_").Replace (".", "_");
 
+                               if (prog == null)
+                                       prog = aname;
+                               
                                Console.WriteLine ("   embedding: " + fname);
                                
                                FileInfo fi = new FileInfo (fname);
@@ -152,15 +172,15 @@ class MakeBundle {
                                tc.WriteLine ("\t&{0},", c);
                        }
                        tc.WriteLine ("\tNULL\n};\n");
-
-                       tc.WriteLine ("int mono_main (int argc, char* argv[]);");
-                       tc.WriteLine ("int main (int argc, char* argv[])\n" +
-                                     "{\n" +
-                                     "\tmono_register_bundled_assemblies(bundled);\n" +
-                                     "\treturn mono_main (argc, argv);\n" +
-                                     "}");
+                       tc.WriteLine ("static char *image_name = \"{0}\";", prog);
+                                     
+                       StreamReader s = new StreamReader (Assembly.GetAssembly (typeof(MakeBundle)).GetManifestResourceStream ("template.c"));
+                       tc.Write (s.ReadToEnd ());
                        tc.Close ();
 
+                       if (compile_only)
+                               return;
+                       
                        cmd = String.Format ("cc -o {2} -Wall {0} `pkg-config --cflags --libs mono` {1}",
                                             temp_c, temp_o, output);
                        Console.WriteLine (cmd);
@@ -172,9 +192,13 @@ class MakeBundle {
                        Console.WriteLine ("Done");
                } finally {
                        if (!keeptemp){
+                               if (object_out == null){
+                                       //File.Delete (temp_o);
+                               }
+                               if (!compile_only){
+                                       //File.Delete (temp_c);
+                               }
                                //File.Delete (temp_s);
-                               //File.Delete (temp_c);
-                               //File.Delete (temp_o);
                        }
                }
        }
@@ -269,7 +293,10 @@ class MakeBundle {
        static void Help ()
        {
                Console.WriteLine ("Usage is: mkbundle [options] assembly1 [assembly2...]\n\n" +
-                                  "Options:\n" + 
+                                  "Options:\n" +
+                                  "    -c          Produce stub only, do not compile\n" +
+                                  "    -o out      Specifies output filename\n" +
+                                  "    -oo obj     Specifies output filename for helper object file" +
                                   "    -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" +