Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,6 @@ install-lldb
install-llbuild
install-swiftpm
install-swiftsyntax
skip-install-swiftsyntax-module
install-skstresstester
install-swiftevolve
install-playgroundsupport
Expand Down
3 changes: 0 additions & 3 deletions utils/build_swift/driver_arguments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,9 +576,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 '
Expand Down
3 changes: 0 additions & 3 deletions utils/build_swift/tests/expected_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,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,
Expand Down Expand Up @@ -483,8 +482,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'),
Expand Down
15 changes: 1 addition & 14 deletions utils/swift_build_support/swift_build_support/products/swiftsyntax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from . import product
from .. import multiroot_data_file
from .. import shell
from .. import targets


class SwiftSyntax(product.Product):
Expand Down Expand Up @@ -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)