Skip to content

[SwiftSyntax] Clean build script #59651

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
Jun 27, 2022
Merged

[SwiftSyntax] Clean build script #59651

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
35 changes: 21 additions & 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 @@ -49,46 +49,53 @@ def is_before_build_script_impl_product(cls):
def is_swiftpm_unified_build_product(cls):
return True

def run_swiftsyntax_build_script(self, target, additional_params=[]):
llvm_build_dir = os.path.join(self.build_dir, '..', 'llvm-' + target)
llvm_build_dir = os.path.realpath(llvm_build_dir)

def run_swiftsyntax_build_script(self, target, command, additional_params=[]):
script_path = os.path.join(self.source_dir, 'build-script.py')

build_cmd = [
script_path,
command,
'--build-dir', self.build_dir,
'--multiroot-data-file', MULTIROOT_DATA_FILE_PATH,
'--toolchain', self.install_toolchain_path(target),
'--filecheck-exec', os.path.join(llvm_build_dir, 'bin',
'FileCheck'),
'--toolchain', self.install_toolchain_path(target)
]

if self.is_release():
build_cmd.append('--release')

if self.args.swiftsyntax_verify_generated_files:
build_cmd.append('--verify-generated-files')

build_cmd.extend(additional_params)

if self.args.verbose_build:
build_cmd.append('--verbose')

build_cmd.extend(additional_params)

shell.call(build_cmd)

def should_build(self, host_target):
return True

def build(self, host_target):
self.run_swiftsyntax_build_script(target=host_target)
if self.args.swiftsyntax_verify_generated_files:
self.run_swiftsyntax_build_script(target=host_target,
command='verify-source-code')

self.run_swiftsyntax_build_script(target=host_target,
command='build')

def should_test(self, host_target):
return self.args.test_swiftsyntax

def test(self, host_target):
llvm_build_dir = os.path.join(self.build_dir, '..', 'llvm-' + host_target)
llvm_build_dir = os.path.realpath(llvm_build_dir)

self.run_swiftsyntax_build_script(target=host_target,
additional_params=['--test'])
command='test',
additional_params=[
'--filecheck-exec',
os.path.join(llvm_build_dir,
'bin',
'FileCheck')
])

def should_install(self, host_target):
return self.args.install_swiftsyntax
Expand Down