From bbccd445fe95e2185f59c2adc59b15e5cf212a3e Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Fri, 20 Oct 2017 15:42:14 -0500 Subject: [PATCH] [macos][mmp] Update mmp's help to note registrar and fix aot mistake (#2913) - https://bugzilla.xamarin.com/show_bug.cgi?id=60294 --- tools/mmp/driver.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/mmp/driver.cs b/tools/mmp/driver.cs index ef547077f2..4c20f5b2e7 100644 --- a/tools/mmp/driver.cs +++ b/tools/mmp/driver.cs @@ -288,8 +288,7 @@ namespace Xamarin.Bundler { { "target-framework=", "Specify the .NET target framework to use (defaults to '" + Xamarin.Utils.TargetFramework.Default + "')", v => SetTargetFramework (v) }, { "force-thread-check", "Keep UI thread checks inside (even release) builds", v => { thread_check = true; }}, { "disable-thread-check", "Remove UI thread checks inside (even debug) builds", v => { thread_check = false; }}, - { "registrar:", "Specify the registrar to use (dynamic [default], IL or static)", v => - { + { "registrar:", "Specify the registrar to use (dynamic [default], static, partial)", v => { switch (v) { case "static": Registrar = RegistrarMode.Static; @@ -308,9 +307,9 @@ namespace Xamarin.Bundler { Registrar = RegistrarMode.Default; break; default: - throw new MonoMacException (20, true, "The valid options for '{0}' are '{1}'.", "--registrar", "il, dynamic, static or default"); + throw new MonoMacException (20, true, "The valid options for '{0}' are '{1}'.", "--registrar", "dynamic, static, partial, or default"); } - }, true /* hidden for now */ + } }, { "sdk=", "Specifies the SDK version to compile against (version, for example \"10.9\")", v => { @@ -358,7 +357,7 @@ namespace Xamarin.Bundler { { "xamarin-framework-directory=", "The framework directory", v => { xm_framework_dir = v; }, true }, { "xamarin-full-framework", "Used with --target-framework=4.5 to select XM Full Target Framework", v => { IsUnifiedFullXamMacFramework = true; } }, { "xamarin-system-framework", "Used with --target-framework=4.5 to select XM Full Target Framework", v => { IsUnifiedFullSystemFramework = true; } }, - { "aot:", "Specify assemblies that should be AOT compiled\n- none - No AOT (default)\n- all - Every assembly in MonoBundle\n- core - Xamarin.Mac, System, mscorlib\n- sdk - Xamarin.Mac.dll and BCL assemblies\n- |hybrid after option enables hybrid AOT which allows IL stripping but is slower (only valid for 'all')\n - Individual files can be included for AOT via +FileName.dll and excluded via -FileName.dll\n\nExamples:\n --aot:all,-MyAssembly.dll\n --aot:core|hybrid,+MyOtherAssembly.dll,-mscorlib.dll", + { "aot:", "Specify assemblies that should be AOT compiled\n- none - No AOT (default)\n- all - Every assembly in MonoBundle\n- core - Xamarin.Mac, System, mscorlib\n- sdk - Xamarin.Mac.dll and BCL assemblies\n- |hybrid after option enables hybrid AOT which allows IL stripping but is slower (only valid for 'all')\n - Individual files can be included for AOT via +FileName.dll and excluded via -FileName.dll\n\nExamples:\n --aot:all,-MyAssembly.dll\n --aot:core,+MyOtherAssembly.dll,-mscorlib.dll", v => { aotOptions = new AOTOptions (v); }