Merge pull request #28663 from ahoppen/install-swiftsyntax-usr-lib

[build-script] Install SwiftSyntax to usr/lib instead of usr/lib/swift

Author: compnerd

utils/build-presets.ini

@@ -1183,7 +1183,6 @@ install-lldb
 install-llbuild
 install-swiftpm
 install-swiftsyntax
-skip-install-swiftsyntax-module
 install-skstresstester
 install-swiftevolve
 install-playgroundsupport

utils/build_swift/driver_arguments.py

@@ -579,9 +579,6 @@ def create_argument_parser():
            help='build SourceKitLSP')
     option('--install-swiftsyntax', toggle_true('install_swiftsyntax'),
            help='install SwiftSyntax')
-    option('--skip-install-swiftsyntax-module',
-           toggle_true('skip_install_swiftsyntax_module'),
-           help='skip installing the SwiftSyntax modules')
     option('--swiftsyntax-verify-generated-files',
            toggle_true('swiftsyntax_verify_generated_files'),
            help='set to verify that the generated files in the source tree '

utils/build_swift/tests/expected_options.py

@@ -91,7 +91,6 @@
     'build_sourcekitlsp': False,
     'install_swiftpm': False,
     'install_swiftsyntax': False,
-    'skip_install_swiftsyntax_module': False,
     'swiftsyntax_verify_generated_files': False,
     'install_sourcekitlsp': False,
     'install_skstresstester': False,
@@ -484,8 +483,6 @@ class BuildScriptImplOption(_BaseOption):
     EnableOption('--indexstore-db', dest='build_indexstoredb'),
     EnableOption('--sourcekit-lsp', dest='build_sourcekitlsp'),
     EnableOption('--install-swiftsyntax', dest='install_swiftsyntax'),
-    EnableOption('--skip-install-swiftsyntax-module',
-                 dest='skip_install_swiftsyntax_module'),
     EnableOption('--swiftsyntax-verify-generated-files',
                  dest='swiftsyntax_verify_generated_files'),
     EnableOption('--install-swiftpm', dest='install_swiftpm'),

utils/swift_build_support/swift_build_support/products/swiftsyntax.py

@@ -15,7 +15,6 @@
 from . import product
 from .. import multiroot_data_file
 from .. import shell
-from .. import targets
 
 
 class SwiftSyntax(product.Product):
@@ -80,26 +79,14 @@ def should_install(self, host_target):
         return self.args.install_swiftsyntax
 
     def install(self, target_name):
-        target = \
-            targets.StdlibDeploymentTarget.get_target_for_name(target_name)
         install_prefix = self.args.install_destdir + self.args.install_prefix
 
-        dylib_dir = os.path.join(install_prefix, 'lib', 'swift',
-                                 target.platform.name)
-        module_dir = os.path.join(dylib_dir, 'SwiftSyntax.swiftmodule')
+        dylib_dir = os.path.join(install_prefix, 'lib')
 
         additional_params = [
             '--dylib-dir', dylib_dir,
             '--install'
         ]
 
-        if not self.args.skip_install_swiftsyntax_module:
-            if not os.path.exists(module_dir):
-                os.makedirs(module_dir)
-            module_base_name = os.path.join(module_dir, target.arch)
-            additional_params.extend([
-                '--swiftmodule-base-name', module_base_name
-            ])
-
         self.run_swiftsyntax_build_script(target=target_name,
                                           additional_params=additional_params)