Merge pull request #2998 from lateralusX/jlorenss/win-x64-full-aot-support

[mono.git] / mcs / tools / mkbundle / mkbundle.cs

diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs
index 6395e90ff41b3499337d075e126a72376dd6f35e..9f75c85749a37752bcad3cd58875435b4db876a1 100755 (executable)
--- a/mcs/tools/mkbundle/mkbundle.cs
+++ b/mcs/tools/mkbundle/mkbundle.cs
@@ -10,8 +10,8 @@
 // (C) 2016 Xamarin Inc
 //
 // Missing features:
-// * Implement --cross, --local-targets, --list-targets, --no-auto-fetch
-// * concatenate target with package to form native binary
+// * Add support for packaging native libraries, extracting at runtime and setting the library path.
+// * Implement --list-targets lists all the available remote targets
 //
 using System;
 using System.Diagnostics;
@@ -24,6 +24,7 @@ using System.Text;
 using IKVM.Reflection;
 using System.Linq;
 using System.Diagnostics;
+using System.Net;
 using System.Threading.Tasks;
 
 class MakeBundle {
@@ -46,9 +47,12 @@ class MakeBundle {
        static bool skip_scan;
        static string ctor_func;
        static bool quiet;
+       static string cross_target = null;
+       static string fetch_target = null;
        static bool custom_mode = true;
        static string embedded_options = null;
        static string runtime = null;
+       static string target_server = "https://download.mono-project.com/runtimes/raw/";
        
        static int Main (string [] args)
        {
@@ -76,7 +80,44 @@ class MakeBundle {
                        case "-c":
                                compile_only = true;
                                break;
+
+                       case "--local-targets":
+                               CommandLocalTargets ();
+                               return 0;
+
+                       case "--cross":
+                               if (i+1 == top){
+                                       Help (); 
+                                       return 1;
+                               }
+                               custom_mode = false;
+                               autodeps = true;
+                               cross_target = args [++i];
+                               break;
+
+                       case "--fetch-target":
+                               if (i+1 == top){
+                                       Help (); 
+                                       return 1;
+                               }
+                               fetch_target = args [++i];
+                               break;
+
+                       case "--list-targets":
+                               var wc = new WebClient ();
+                               var s = wc.DownloadString (new Uri (target_server + "target-list.txt"));
+                               Console.WriteLine ("Cross-compilation targets available:\n" + s);
+                               
+                               return 0;
                                
+                       case "--target-server":
+                               if (i+1 == top){
+                                       Help (); 
+                                       return 1;
+                               }
+                               target_server = args [++i];
+                               break;
+
                        case "-o": 
                                if (i+1 == top){
                                        Help (); 
@@ -230,14 +271,59 @@ class MakeBundle {
                        if (!QueueAssembly (files, file))
                                return 1;
 
+               if (fetch_target != null){
+                       var truntime = Path.Combine (targets_dir, fetch_target, "mono");
+                       Directory.CreateDirectory (Path.GetDirectoryName (truntime));
+                       var wc = new WebClient ();
+                       var uri = new Uri ($"{target_server}{fetch_target}");
+                       try {
+                               wc.DownloadFile (uri, truntime);
+                       } catch {
+                               Console.Error.WriteLine ($"Failure to download the specified runtime from {uri}");
+                               File.Delete (truntime);
+                               return 1;
+                       }
+                       return 0;
+               }
+               
                if (custom_mode)
                        GenerateBundles (files);
-               else
+               else {
+                       if (cross_target == "default")
+                               runtime = null;
+                       else {
+                               var truntime = Path.Combine (targets_dir, cross_target, "mono");
+                               if (!File.Exists (truntime)){
+                                       Console.Error.WriteLine ($"The runtime for the {cross_target} does not exist, use --fetch-target {cross_target} to download first");
+                                       return 1;
+                               }
+                       }                               
                        GeneratePackage (files);
+               }
                
                return 0;
        }
 
+       static string targets_dir = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".mono", "targets");
+       
+       static void CommandLocalTargets ()
+       {
+               string [] targets;
+
+               Console.WriteLine ("Available targets:");
+               Console.WriteLine ("\tdefault\t- Current System Mono");
+               try {
+                       targets = Directory.GetDirectories (targets_dir);
+               } catch {
+                       return;
+               }
+               foreach (var target in targets){
+                       var p = Path.Combine (target, "mono");
+                       if (File.Exists (p))
+                               Console.WriteLine ("\t{0}", Path.GetFileName (target));
+               }
+       }
+
        static void WriteSymbol (StreamWriter sw, string name, long size)
        {
                switch (style){
@@ -934,10 +1020,10 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
                                   "--simple   Simple mode does not require a C toolchain and can cross compile\n" + 
                                   "    --cross TARGET      Generates a binary for the given TARGET\n"+
                                   "    --local-targets     Lists locally available targets\n" +
-                                  "    --list-targets [SERVER] Lists available targets on the remote server\n" +
-                                  "    --no-auto-fetch     Prevents the tool from auto-fetching a TARGET\n" +
+                                  "    --list-targets      Lists available targets on the remote server\n" +
                                   "    --options OPTIONS   Embed the specified Mono command line options on target\n" +
-                                  "    --runtime RUNTIME   Manually specifies the Mono runtime to use\n" + 
+                                  "    --runtime RUNTIME   Manually specifies the Mono runtime to use\n" +
+                                  "    --target-server URL Specified a server to download targets from, default is " + target_server + "\n" +
                                   "\n" +
                                   "--custom   Builds a custom launcher, options for --custom\n" +
                                   "    -c                  Produce stub only, do not compile\n" +