[Build-Script-Helper] Avoid installing argument-parser into the toolchain, until needed

Code commented-out with TODOs

Author: artemcm

Utilities/build-script-helper.py

@@ -172,7 +172,7 @@ def handle_invocation(toolchain_bin, args):
   elif args.action == 'install':
     if platform.system() == 'Darwin':
       distribution_build_dir = os.path.join(args.build_path, 'dist')
-      build_for_distribution(args, toolchain_bin, distribution_build_dir)
+      build_for_toolchain_install(args, toolchain_bin, distribution_build_dir)
       install(args, distribution_build_dir)
     else:
       bin_path = swiftpm_bin_path(swift_exec, swiftpm_args, env)
@@ -210,7 +210,7 @@ def install(args, build_dir):
 
   # Binary Swift Modules:
   # swift-driver: SwiftDriver.swiftmodule, SwiftOptions.swiftmodule
-  # swift-argument-parser: ArgumentParser.swiftmodule
+  # TODO: swift-argument-parser: ArgumentParser.swiftmodule
   # swift-tools-support-core: TSCUtility.swiftmodule, TSCLibc.swiftmodule, TSCBasic.swiftmodule
   install_binary_swift_modules(args, build_dir, toolchain_lib)
 
@@ -275,36 +275,21 @@ def install_libraries(args, build_dir, universal_lib_dir, toolchain_lib_dir):
 
   # Install the libSwiftDriver and libSwiftOptions shared libraries into the toolchain lib
   for lib in ['libSwiftDriver', 'libSwiftOptions']:
-    shared_lib_file = lib + shared_lib_ext
-    output_dylib_path = os.path.join(universal_lib_dir, shared_lib_file)
-    lipo_cmd = ['lipo']
-    for arch in macos_target_architectures:
-      input_lib_path = os.path.join(build_dir, arch + '-apple-macos' + macos_deployment_target,
-                                    'swift-driver', 'lib', shared_lib_file)
-      lipo_cmd.append(input_lib_path)
-    lipo_cmd.extend(['-create', '-output', output_dylib_path])
-    subprocess.check_call(lipo_cmd)
-    install_binary(shared_lib_file, universal_lib_dir, toolchain_lib_dir, args.verbose)
+    install_library(args, build_dir, lib, universal_lib_dir, toolchain_lib_dir, 'swift-driver')
 
   for lib in ['libTSCBasic', 'libTSCLibc', 'libTSCUtility']:
-    shared_lib_file = lib + shared_lib_ext
-    output_dylib_path = os.path.join(universal_lib_dir, shared_lib_file)
-    lipo_cmd = ['lipo']
-    for arch in macos_target_architectures:
-      input_lib_path = os.path.join(build_dir, arch + '-apple-macos' + macos_deployment_target,
-                                    'swift-tools-support-core', 'lib', shared_lib_file)
-      lipo_cmd.append(input_lib_path)
-    lipo_cmd.extend(['-create', '-output', output_dylib_path])
-    subprocess.check_call(lipo_cmd)
-    install_binary(shared_lib_file, universal_lib_dir, toolchain_lib_dir, args.verbose)
+    install_library(args, build_dir, lib, universal_lib_dir, toolchain_lib_dir, 'swift-tools-support-core')
+
+  # TODO: Until the argument parser is used, avoid installing it into the toolchain
+  #install_library(args, build_dir, 'libArgumentParser', universal_lib_dir, toolchain_lib_dir, 'swift-argument-parser')
 
-def install_library(args, lib_name, ):
-  shared_lib_file = lib + shared_lib_ext
+def install_library(args, build_dir, lib_name, universal_lib_dir, toolchain_lib_dir, package_name):
+  shared_lib_file = lib_name + shared_lib_ext
   output_dylib_path = os.path.join(universal_lib_dir, shared_lib_file)
   lipo_cmd = ['lipo']
   for arch in macos_target_architectures:
     input_lib_path = os.path.join(build_dir, arch + '-apple-macos' + macos_deployment_target,
-                                  'swift-driver', 'lib', shared_lib_file)
+                                  package_name, 'lib', shared_lib_file)
     lipo_cmd.append(input_lib_path)
   lipo_cmd.extend(['-create', '-output', output_dylib_path])
   subprocess.check_call(lipo_cmd)
@@ -319,7 +304,8 @@ def install_binary_swift_modules(args, build_dir, toolchain_lib_dir):
     install_module(args, build_dir, product_subpath, toolchain_lib_dir, module, 'swift-driver')
 
   # swift-argument-parser
-  install_module(args, build_dir, product_subpath, toolchain_lib_dir, 'ArgumentParser', 'swift-argument-parser')
+  # TODO: Until the argument parser is used, avoid installing it into the toolchain
+  #install_module(args, build_dir, product_subpath, toolchain_lib_dir, 'ArgumentParser', 'swift-argument-parser')
 
   # swift-tools-support-core
   for module in ['TSCUtility', 'TSCLibc', 'TSCBasic']:
@@ -357,7 +343,7 @@ def install_module_includes(args, toolchain_include_dir, src_include_dir, dst_mo
     shutil.rmtree(toolchain_module_include_dir, ignore_errors=True)
   shutil.copytree(src_include_dir, toolchain_module_include_dir)
 
-def build_for_distribution(args, toolchain_bin, build_dir):
+def build_for_toolchain_install(args, toolchain_bin, build_dir):
   print('Preparing SwiftDriver for distribution using CMake.')
   swiftc_exec = os.path.join(toolchain_bin, 'swiftc')
 
@@ -427,7 +413,7 @@ def build_argument_parser_using_cmake(args, target, swiftc_exec, cmake_target_di
   print('Building Argument Parser for target: %s' % target)
   parser_source_dir = os.path.join(os.path.dirname(args.package_path), 'swift-argument-parser')
   parser_build_dir = os.path.join(cmake_target_dir, 'swift-argument-parser')
-  custom_flags = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_TESTING=NO', '-DBUILD_EXAMPLES=NO']
+  custom_flags = ['-DBUILD_TESTING=NO', '-DBUILD_EXAMPLES=NO']
   parser_flags = base_cmake_flags + custom_flags
   cmake_build(args, swiftc_exec, parser_flags, parser_source_dir, parser_build_dir)
   return