using System;
using System.Diagnostics;
using System.Xml;
-using System.Collections;
+using System.Collections.Generic;
using System.Reflection;
using System.IO;
+using System.IO.Compression;
using System.Runtime.InteropServices;
using System.Text;
-using Mono.Unix;
-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
+
+
+#if NET_4_5
+using System.Threading.Tasks;
+#endif
class MakeBundle {
static string output = "a.out";
static string object_out = null;
- static ArrayList link_paths = new ArrayList ();
+ static List<string> link_paths = new List<string> ();
static bool autodeps = false;
static bool keeptemp = false;
static bool compile_only = false;
static int Main (string [] args)
{
- ArrayList sources = new ArrayList ();
+ List<string> sources = new List<string> ();
int top = args.Length;
link_paths.Add (".");
keeptemp = true;
break;
case "--static":
- if (style == "windows") {
- Console.Error.WriteLine ("The option `{0}' is not supported on this platform.", args [i]);
- return 1;
- }
static_link = true;
Console.WriteLine ("Note that statically linking the LGPL Mono runtime has more licensing restrictions than dynamically linking.");
Console.WriteLine ("See http://www.mono-project.com/Licensing for details on licensing.");
break;
case "--nomain":
nomain = true;
+ break;
+ case "--style":
+ if (i+1 == top) {
+ Help ();
+ return 1;
+ }
+ style = args [++i];
+ switch (style) {
+ case "windows":
+ case "mac":
+ case "linux":
+ break;
+ default:
+ Console.Error.WriteLine ("Invalid style '{0}' - only 'windows', 'mac' and 'linux' are supported for --style argument", style);
+ return 1;
+ }
+
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);
Environment.Exit (1);
}
- ArrayList assemblies = LoadAssemblies (sources);
- ArrayList files = new ArrayList ();
+ List<Assembly> assemblies = LoadAssemblies (sources);
+ List<string> files = new List<string> ();
foreach (Assembly a in assemblies)
QueueAssembly (files, a.CodeBase);
+
+ // Special casing mscorlib.dll: any specified mscorlib.dll cannot be loaded
+ // by Assembly.ReflectionFromLoadFrom(). Instead the fx assembly which runs
+ // mkbundle.exe is loaded, which is not what we want.
+ // So, replace it with whatever actually specified.
+ foreach (string srcfile in sources) {
+ if (Path.GetFileName (srcfile) == "mscorlib.dll") {
+ foreach (string file in files) {
+ if (Path.GetFileName (new Uri (file).LocalPath) == "mscorlib.dll") {
+ files.Remove (file);
+ files.Add (new Uri (Path.GetFullPath (srcfile)).LocalPath);
+ break;
+ }
+ }
+ break;
+ }
+ }
GenerateBundles (files);
//GenerateJitWrapper ();
sw.WriteLine (
".globl {0}\n" +
"\t.section .rodata\n" +
- "\t.align 32\n" +
- "\t.type {0}, @object\n" +
+ "\t.p2align 5\n" +
+ "\t.type {0}, \"object\"\n" +
"\t.size {0}, {1}\n" +
"{0}:\n",
name, size);
case "osx":
sw.WriteLine (
"\t.section __TEXT,__text,regular,pure_instructions\n" +
- "\t.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32\n" +
"\t.globl _{0}\n" +
"\t.data\n" +
"\t.align 4\n" +
}
}
- static void GenerateBundles (ArrayList files)
+ static string [] chars = new string [256];
+
+ static void WriteBuffer (StreamWriter ts, Stream stream, byte[] buffer)
+ {
+ int n;
+
+ // Preallocate the strings we need.
+ if (chars [0] == null) {
+ for (int i = 0; i < chars.Length; i++)
+ chars [i] = string.Format ("{0}", i.ToString ());
+ }
+
+ while ((n = stream.Read (buffer, 0, buffer.Length)) != 0) {
+ int count = 0;
+ for (int i = 0; i < n; i++) {
+ if (count % 32 == 0) {
+ ts.Write ("\n\t.byte ");
+ } else {
+ ts.Write (",");
+ }
+ ts.Write (chars [buffer [i]]);
+ count ++;
+ }
+ }
+
+ ts.WriteLine ();
+ }
+
+ static void GenerateBundles (List<string> files)
{
string temp_s = "temp.s"; // Path.GetTempFileName ();
string temp_c = "temp.c";
temp_o = object_out;
try {
- ArrayList c_bundle_names = new ArrayList ();
- ArrayList config_names = new ArrayList ();
+ List<string> c_bundle_names = new List<string> ();
+ List<string[]> config_names = new List<string[]> ();
byte [] buffer = new byte [8192];
- StreamWriter ts = new StreamWriter (File.Create (temp_s));
- StreamWriter tc = new StreamWriter (File.Create (temp_c));
+ using (StreamWriter ts = new StreamWriter (File.Create (temp_s))) {
+ using (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/mono-config.h>");
tc.WriteLine ("#include <mono/metadata/assembly.h>\n");
if (compress) {
tc.WriteLine ("} CompressedAssembly;\n");
}
- foreach (string url in files){
- string fname = new Uri (url).LocalPath;
- string aname = Path.GetFileName (fname);
- string encoded = aname.Replace ("-", "_").Replace (".", "_");
+ object monitor = new object ();
- if (prog == null)
- prog = aname;
-
- Console.WriteLine (" embedding: " + fname);
-
+ var streams = new Dictionary<string, Stream> ();
+ var sizes = new Dictionary<string, long> ();
+
+ // Do the file reading and compression in parallel
+ Action<string> body = delegate (string url) {
+ string fname = new Uri (url).LocalPath;
Stream stream = File.OpenRead (fname);
long real_size = stream.Length;
int n;
if (compress) {
MemoryStream ms = new MemoryStream ();
- DeflaterOutputStream deflate = new DeflaterOutputStream (ms);
- while ((n = stream.Read (buffer, 0, 8192)) != 0){
+ GZipStream deflate = new GZipStream (ms, CompressionMode.Compress, leaveOpen:true);
+ while ((n = stream.Read (buffer, 0, buffer.Length)) != 0){
deflate.Write (buffer, 0, n);
}
stream.Close ();
- deflate.Finish ();
+ deflate.Close ();
byte [] bytes = ms.GetBuffer ();
stream = new MemoryStream (bytes, 0, (int) ms.Length, false, false);
}
- WriteSymbol (ts, "assembly_data_" + encoded, stream.Length);
-
- while ((n = stream.Read (buffer, 0, 8192)) != 0){
- for (int i = 0; i < n; i++){
- ts.Write ("\t.byte {0}\n", buffer [i]);
- }
+ lock (monitor) {
+ streams [url] = stream;
+ sizes [url] = real_size;
}
- ts.WriteLine ();
+ };
+
+ //#if NET_4_5
+#if FALSE
+ Parallel.ForEach (files, body);
+#else
+ foreach (var url in files)
+ body (url);
+#endif
+
+ // The non-parallel part
+ foreach (var url in files) {
+ string fname = new Uri (url).LocalPath;
+ string aname = Path.GetFileName (fname);
+ string encoded = aname.Replace ("-", "_").Replace (".", "_");
+
+ if (prog == null)
+ prog = aname;
+
+ var stream = streams [url];
+ var real_size = sizes [url];
+
+ Console.WriteLine (" embedding: " + fname);
+
+ WriteSymbol (ts, "assembly_data_" + encoded, stream.Length);
+
+ WriteBuffer (ts, stream, buffer);
if (compress) {
tc.WriteLine ("extern const unsigned char assembly_data_{0} [];", encoded);
tc.WriteLine ("static CompressedAssembly assembly_bundle_{0} = {{{{\"{1}\"," +
- " assembly_data_{0}, {2}}}, {3}}};",
- encoded, aname, real_size, stream.Length);
+ " assembly_data_{0}, {2}}}, {3}}};",
+ encoded, aname, real_size, stream.Length);
double ratio = ((double) stream.Length * 100) / real_size;
Console.WriteLine (" compression ratio: {0:.00}%", ratio);
} else {
tc.WriteLine ("extern const unsigned char assembly_data_{0} [];", encoded);
tc.WriteLine ("static const MonoBundledAssembly assembly_bundle_{0} = {{\"{1}\", assembly_data_{0}, {2}}};",
- encoded, aname, real_size);
+ encoded, aname, real_size);
}
stream.Close ();
Console.WriteLine (" config from: " + fname + ".config");
tc.WriteLine ("extern const unsigned char assembly_config_{0} [];", encoded);
WriteSymbol (ts, "assembly_config_" + encoded, cf.Length);
- while ((n = cf.Read (buffer, 0, 8192)) != 0){
- for (int i = 0; i < n; i++){
- ts.Write ("\t.byte {0}\n", buffer [i]);
- }
- }
+ WriteBuffer (ts, cf, buffer);
ts.WriteLine ();
config_names.Add (new string[] {aname, encoded});
} catch (FileNotFoundException) {
/* we ignore if the config file doesn't exist */
}
-
}
+
if (config_file != null){
FileStream conf;
try {
return;
}
Console.WriteLine ("System config from: " + config_file);
- tc.WriteLine ("extern const unsigned char system_config;");
+ tc.WriteLine ("extern const char system_config;");
WriteSymbol (ts, "system_config", config_file.Length);
- int n;
- while ((n = conf.Read (buffer, 0, 8192)) != 0){
- for (int i = 0; i < n; i++){
- ts.Write ("\t.byte {0}\n", buffer [i]);
- }
- }
+ WriteBuffer (ts, conf, buffer);
// null terminator
ts.Write ("\t.byte 0\n");
ts.WriteLine ();
return;
}
Console.WriteLine ("Machine config from: " + machine_config_file);
- tc.WriteLine ("extern const unsigned char machine_config;");
+ tc.WriteLine ("extern const char machine_config;");
WriteSymbol (ts, "machine_config", machine_config_file.Length);
- int n;
- while ((n = conf.Read (buffer, 0, 8192)) != 0){
- for (int i = 0; i < n; i++){
- ts.Write ("\t.byte {0}\n", buffer [i]);
- }
- }
- // null terminator
+ WriteBuffer (ts, conf, buffer);
ts.Write ("\t.byte 0\n");
ts.WriteLine ();
}
if (static_link) {
string smonolib;
if (style == "osx")
- smonolib = "`pkg-config --variable=libdir mono`/libmono.a ";
+ smonolib = "`pkg-config --variable=libdir mono-2`/libmono-2.0.a ";
else
- smonolib = "-Wl,-Bstatic -lmono -Wl,-Bdynamic ";
- cmd = String.Format ("{4} -o {2} -Wall `pkg-config --cflags mono` {0} {3} " +
- "`pkg-config --libs-only-L mono` " + smonolib +
- "`pkg-config --libs-only-l mono | sed -e \"s/\\-lmono //\"` {1}",
+ 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` {3} {1}",
+ cmd = String.Format ("{4} " + debugging + " -o {2} -Wall {0} `pkg-config --cflags --libs mono-2` {3} {1}",
temp_c, temp_o, output, zlib, cc);
}
return;
}
Console.WriteLine ("Done");
+ }
+ }
} finally {
if (!keeptemp){
if (object_out == null){
}
}
- static ArrayList LoadAssemblies (ArrayList sources)
+ static List<Assembly> LoadAssemblies (List<string> sources)
{
- ArrayList assemblies = new ArrayList ();
+ List<Assembly> assemblies = new List<Assembly> ();
bool error = false;
foreach (string name in sources){
return assemblies;
}
- static void QueueAssembly (ArrayList files, string codebase)
+ static void QueueAssembly (List<string> files, string codebase)
{
if (files.Contains (codebase))
return;
{
Console.WriteLine ("Usage is: mkbundle [options] assembly1 [assembly2...]\n\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\n" +
- " -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" +
- " --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 Statically link to mono libs\n" +
- " --nomain Don't include a main() function, for libraries\n" +
- " -z Compress the assemblies before embedding.\n");
+ " -c Produce stub only, do not compile\n" +
+ " -o out Specifies output filename\n" +
+ " -oo obj Specifies output filename for helper object file\n" +
+ " -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" +
+ " --keeptemp Keeps the temporary files\n" +
+ " --config F Bundle system config file `F'\n" +
+ " --config-dir D Set MONO_CFG_DIR to `D'\n" +
+ " --machine-config F Use the given file as the machine.config for the application.\n" +
+ " --static Statically link to mono libs\n" +
+ " --nomain Don't include a main() function, for libraries\n" +
+ " -z Compress the assemblies before embedding.\n" +
+ " You need zlib development headers and libraries.\n");
}
[DllImport ("libc")]
return;
}
- IntPtr buf = UnixMarshal.AllocHeap(8192);
+ IntPtr buf = Marshal.AllocHGlobal (8192);
if (uname (buf) != 0){
Console.WriteLine ("Warning: Unable to detect OS");
+ Marshal.FreeHGlobal (buf);
return;
}
string os = Marshal.PtrToStringAnsi (buf);
if (os == "Darwin")
style = "osx";
- UnixMarshal.FreeHeap(buf);
+ Marshal.FreeHGlobal (buf);
}
static bool IsUnix {
get {
int p = (int) Environment.OSVersion.Platform;
- return ((p == 4) || (p == 128));
+ return ((p == 4) || (p == 128) || (p == 6));
}
}
projects / mono.git / blobdiff