File tree Expand file tree Collapse file tree 4 files changed +16
-6
lines changed
swift_build_support/swift_build_support/products Expand file tree Collapse file tree 4 files changed +16
-6
lines changed Original file line number Diff line number Diff line change @@ -862,6 +862,7 @@ swift-testing-macros
862
862
xctest
863
863
swiftdocc
864
864
swiftformat
865
+ wasmkit
865
866
866
867
build-ninja
867
868
install-llvm
@@ -879,12 +880,11 @@ install-prefix=/usr
879
880
install-sourcekit-lsp
880
881
install-swiftformat
881
882
install-swiftdocc
883
+ install-wasmkit
882
884
build-swift-static-stdlib
883
885
build-swift-static-sdk-overlay
884
886
build-swift-stdlib-unittest-extra
885
887
build-embedded-stdlib-cross-compiling
886
-
887
- wasmkit
888
888
build-wasm-stdlib
889
889
890
890
# Executes the lit tests for the installable package that is created
@@ -958,6 +958,7 @@ mixin-preset=buildbot_linux
958
958
959
959
llvm-targets-to-build =X86; ARM;AArch64;WebAssembly
960
960
wasmkit
961
+ install-wasmkit
961
962
build-wasm-stdlib
962
963
# FIXME(katei): Test fails on a specific CI node.
963
964
# https://github.com/apple/swift/issues/70980
@@ -1416,6 +1417,7 @@ install-playgroundsupport
1416
1417
install-sourcekit-lsp
1417
1418
install-swiftformat
1418
1419
install-swiftdocc
1420
+ install-wasmkit
1419
1421
1420
1422
install-destdir =%(install_destdir)s
1421
1423
Original file line number Diff line number Diff line change @@ -823,11 +823,18 @@ def create_argument_parser():
823
823
option (['--build-minimal-stdlib' ], toggle_true ('build_minimalstdlib' ),
824
824
help = 'build the \' minimal\' freestanding stdlib variant into a '
825
825
'separate build directory ' )
826
+
827
+ # Wasm options
828
+
826
829
option (['--build-wasm-stdlib' ], toggle_true ('build_wasmstdlib' ),
827
830
help = 'build the stdlib for WebAssembly target into a'
828
831
'separate build directory ' )
829
832
option (['--wasmkit' ], toggle_true ('build_wasmkit' ),
830
833
help = 'build WasmKit' )
834
+ option (['--install-wasmkit' ], toggle_true ('install_wasmkit' ),
835
+ help = 'install SourceKitLSP' )
836
+
837
+ # Swift Testing options
831
838
832
839
option ('--swift-testing' , toggle_true ('build_swift_testing' ),
833
840
help = 'build Swift Testing' )
Original file line number Diff line number Diff line change 119
119
'install_swift_testing_macros' : False ,
120
120
'install_swift_driver' : False ,
121
121
'install_swiftdocc' : False ,
122
+ 'install_wasmkit' : False ,
122
123
'swiftsyntax_verify_generated_files' : False ,
123
124
'swiftsyntax_enable_rawsyntax_validation' : False ,
124
125
'swiftsyntax_enable_test_fuzzing' : False ,
@@ -684,6 +685,7 @@ class BuildScriptImplOption(_BaseOption):
684
685
EnableOption ('--install-swiftformat' , dest = 'install_swiftformat' ),
685
686
EnableOption ('--install-skstresstester' , dest = 'install_skstresstester' ),
686
687
EnableOption ('--install-swiftdocc' , dest = 'install_swiftdocc' ),
688
+ EnableOption ('--install-wasmkit' , dest = 'install_wasmkit' ),
687
689
EnableOption ('--toolchain-benchmarks' , dest = 'build_toolchainbenchmarks' ),
688
690
EnableOption ('--swift-inspect' , dest = 'build_swift_inspect' ),
689
691
EnableOption ('--tsan-libdispatch-test' ),
Original file line number Diff line number Diff line change @@ -47,8 +47,7 @@ def should_test(self, host_target):
47
47
return False
48
48
49
49
def should_install (self , host_target ):
50
- # Currently, it's only used for testing stdlib.
51
- return True
50
+ return self .args .install_wasmkit
52
51
53
52
def install (self , host_target ):
54
53
"""
@@ -61,10 +60,10 @@ def install(self, host_target):
61
60
62
61
def build (self , host_target ):
63
62
bin_path = run_swift_build (host_target , self , 'wasmkit-cli' )
64
- print ("Built wasmkit-cli at: " + bin_path )
63
+ print ("Built wasmkit-cli at: " + bin_path , flush = True )
65
64
# Copy the built binary to ./bin
66
65
dest_bin_path = self .__class__ .cli_file_path (self .build_dir )
67
- print ("Copying wasmkit-cli to: " + dest_bin_path )
66
+ print ("Copying wasmkit-cli to: " + dest_bin_path , flush = True )
68
67
os .makedirs (os .path .dirname (dest_bin_path ), exist_ok = True )
69
68
shutil .copy (bin_path , dest_bin_path )
70
69
You can’t perform that action at this time.
0 commit comments