Fix the command line arguments order for the desktop runtime script

README.md

@@ -29,19 +29,19 @@ export MONO_SOURCE_ROOT=$HOME/git/mono
 
 ```bash
 # Build the runtimes for 32-bit and 64-bit Linux.
-./desktop.py linux configure --target=i686 --target=x86_64
-./desktop.py linux make --target=i686 --target=x86_64
+./linux.py configure --target=i686 --target=x86_64
+./linux.py make --target=i686 --target=x86_64
 
 # Build the runtimes for 32-bit and 64-bit Windows.
-./desktop.py windows configure --target=i686 --target=x86_64 --mxe-prefix=/usr
-./desktop.py windows make --target=i686 --target=x86_64 --mxe-prefix=/usr
+./windows.py configure --target=i686 --target=x86_64 --mxe-prefix=/usr
+./windows.py make --target=i686 --target=x86_64 --mxe-prefix=/usr
 
 # Build the runtime for 64-bit macOS.
-./desktop.py osx configure --target=x86_64
-./desktop.py osx make --target=x86_64
+./osx.py configure --target=x86_64
+./osx.py make --target=x86_64
 ```
 
-_AOT cross-compilers for desktop platforms cannot be built with this script yet._
+_AOT cross-compilers for desktop platforms cannot be built with these scripts yet._
 
 ## Android
 

desktop.py

@@ -1,4 +1,3 @@
-#!/usr/bin/python
 
 import os
 import os.path
@@ -13,8 +12,6 @@ import runtime
 
 # TODO: mono cross-compilers
 
-target_platforms = ['linux', 'windows', 'osx']
-
 targets = {
     'linux': ['i686', 'x86_64'],
     'windows': ['i686', 'x86_64'],
@@ -190,7 +187,7 @@ def clean(opts: DesktopOpts, product: str, target_platform: str, target: str):
     )
 
 
-def main(raw_args):
+def run_main(raw_args, target_platform):
     import cmd_utils
     from collections import OrderedDict
     from typing import Callable
@@ -201,22 +198,18 @@ def main(raw_args):
     actions['clean'] = clean
 
     parser = cmd_utils.build_arg_parser(description='Builds the Mono runtime for the Desktop')
-    subparsers = parser.add_subparsers(dest='platform')
 
     default_help = 'default: %(default)s'
 
-    for target_platform in target_platforms:
-        target_platform_subparser = subparsers.add_parser(target_platform)
-        target_platform_subparser.add_argument('action', choices=['configure', 'make', 'clean'])
-        target_platform_subparser.add_argument('--target', choices=targets[target_platform], action='append', required=True)
-        target_platform_subparser.add_argument('--with-llvm', action='store_true', default=False, help=default_help)
+    parser.add_argument('action', choices=['configure', 'make', 'clean'])
+    parser.add_argument('--target', choices=targets[target_platform], action='append', required=True)
+    parser.add_argument('--with-llvm', action='store_true', default=False, help=default_help)
 
     cmd_utils.add_runtime_arguments(parser, default_help)
 
     args = parser.parse_args(raw_args)
 
     input_action = args.action
-    input_target_platform = args.platform
     input_targets = args.target
 
     opts = desktop_opts_from_args(args)
@@ -225,21 +218,16 @@ def main(raw_args):
         print('Mono sources directory not found: ' + opts.mono_source_root)
         sys.exit(1)
 
-    if input_target_platform == 'osx' and sys.platform != 'darwin' and not 'OSXCROSS_ROOT' in os.environ:
+    if target_platform == 'osx' and sys.platform != 'darwin' and not 'OSXCROSS_ROOT' in os.environ:
         raise RuntimeError('The \'OSXCROSS_ROOT\' environment variable is required for cross-compiling to macOS')
 
-    if is_cross_compiling(input_target_platform) and sys.platform == 'darwin':
+    if is_cross_compiling(target_platform) and sys.platform == 'darwin':
         raise RuntimeError('Cross-compiling from macOS is not supported')
 
     action = actions[input_action]
 
     try:
         for target in input_targets:
-            action(opts, 'desktop-%s' % input_target_platform, input_target_platform, target)
+            action(opts, 'desktop-%s' % target_platform, target_platform, target)
     except BuildError as e:
         sys.exit(e.message)
-
-
-if __name__ == '__main__':
-    from sys import argv
-    main(argv[1:])

linux.py

@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+from desktop import run_main
+
+
+if __name__ == '__main__':
+    from sys import argv
+    run_main(argv[1:], target_platform='linux')

osx.py

@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+from desktop import run_main
+
+
+if __name__ == '__main__':
+    from sys import argv
+    run_main(argv[1:], target_platform='osx')

windows.py

@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+from desktop import run_main
+
+
+if __name__ == '__main__':
+    from sys import argv
+    run_main(argv[1:], target_platform='windows')