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);
// Preallocate the strings we need.
if (chars [0] == null) {
for (int i = 0; i < chars.Length; i++)
- chars [i] = string.Format ("\t.byte {0}\n", i.ToString ());
+ chars [i] = string.Format ("{0}", i.ToString ());
}
while ((n = stream.Read (buffer, 0, buffer.Length)) != 0) {
- for (int i = 0; i < n; i++)
+ 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 (ArrayList files)
+ 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];
using (StreamWriter ts = new StreamWriter (File.Create (temp_s))) {
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);
- // Compression can be parallelized
long real_size = stream.Length;
int n;
if (compress) {
MemoryStream ms = new MemoryStream ();
- DeflaterOutputStream deflate = new DeflaterOutputStream (ms);
+ 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);
}
+ lock (monitor) {
+ streams [url] = stream;
+ sizes [url] = real_size;
+ }
+ };
+
+ //#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 ();
} catch (FileNotFoundException) {
/* we ignore if the config file doesn't exist */
}
-
}
+
if (config_file != null){
FileStream conf;
try {
}
}
- 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;
return;
}
- IntPtr buf = UnixMarshal.AllocHeap(8192);
+ IntPtr buf = Marshal.AllocHGlobal (8192);
if (uname (buf) != 0){
Console.WriteLine ("Warning: Unable to detect OS");
- UnixMarshal.FreeHeap(buf);
+ Marshal.FreeHGlobal (buf);
return;
}
string os = Marshal.PtrToStringAnsi (buf);
if (os == "Darwin")
style = "osx";
- UnixMarshal.FreeHeap(buf);
+ Marshal.FreeHGlobal (buf);
}
static bool IsUnix {
projects / mono.git / blobdiff