Skip to content

Commit adbeb8b

Browse files
committed
[SwiftSyntax] Clean build script
swiftlang/swift-syntax#458
1 parent 0dae896 commit adbeb8b

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

utils/swift_build_support/swift_build_support/products/swiftsyntax.py

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,46 +49,53 @@ def is_before_build_script_impl_product(cls):
4949
def is_swiftpm_unified_build_product(cls):
5050
return True
5151

52-
def run_swiftsyntax_build_script(self, target, additional_params=[]):
53-
llvm_build_dir = os.path.join(self.build_dir, '..', 'llvm-' + target)
54-
llvm_build_dir = os.path.realpath(llvm_build_dir)
55-
52+
def run_swiftsyntax_build_script(self, target, command, additional_params=[]):
5653
script_path = os.path.join(self.source_dir, 'build-script.py')
5754

5855
build_cmd = [
5956
script_path,
57+
command,
6058
'--build-dir', self.build_dir,
6159
'--multiroot-data-file', MULTIROOT_DATA_FILE_PATH,
62-
'--toolchain', self.install_toolchain_path(target),
63-
'--filecheck-exec', os.path.join(llvm_build_dir, 'bin',
64-
'FileCheck'),
60+
'--toolchain', self.install_toolchain_path(target)
6561
]
6662

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

70-
if self.args.swiftsyntax_verify_generated_files:
71-
build_cmd.append('--verify-generated-files')
72-
73-
build_cmd.extend(additional_params)
74-
7566
if self.args.verbose_build:
7667
build_cmd.append('--verbose')
7768

69+
build_cmd.extend(additional_params)
70+
7871
shell.call(build_cmd)
7972

8073
def should_build(self, host_target):
8174
return True
8275

8376
def build(self, host_target):
84-
self.run_swiftsyntax_build_script(target=host_target)
77+
if self.args.swiftsyntax_verify_generated_files:
78+
self.run_swiftsyntax_build_script(target=host_target,
79+
command='verify-source-code')
80+
81+
self.run_swiftsyntax_build_script(target=host_target,
82+
command='build')
8583

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

8987
def test(self, host_target):
88+
llvm_build_dir = os.path.join(self.build_dir, '..', 'llvm-' + host_target)
89+
llvm_build_dir = os.path.realpath(llvm_build_dir)
90+
9091
self.run_swiftsyntax_build_script(target=host_target,
91-
additional_params=['--test'])
92+
command='test',
93+
additional_params=[
94+
'--filecheck-exec',
95+
os.path.join(llvm_build_dir,
96+
'bin',
97+
'FileCheck')
98+
])
9299

93100
def should_install(self, host_target):
94101
return self.args.install_swiftsyntax

0 commit comments

Comments
 (0)