@@ -677,6 +677,56 @@ details of the setups of other systems or automated environments.""")
677
677
help = "skip building Swift stdlibs for MacOSX" ,
678
678
action = "store_true" )
679
679
680
+ run_build_group .add_argument (
681
+ "--skip-build-ios" ,
682
+ help = "skip building Swift stdlibs for iOS" ,
683
+ action = "store_true" )
684
+ run_build_group .add_argument (
685
+ "--skip-build-ios-device" ,
686
+ help = "skip building Swift stdlibs for iOS devices "
687
+ "(i.e. build simulators only)" ,
688
+ action = "store_true" )
689
+ run_build_group .add_argument (
690
+ "--skip-build-ios-simulator" ,
691
+ help = "skip building Swift stdlibs for iOS simulator "
692
+ "(i.e. build devices only)" ,
693
+ action = "store_true" )
694
+
695
+ run_build_group .add_argument (
696
+ "--skip-build-tvos" ,
697
+ help = "skip building Swift stdlibs for tvOS" ,
698
+ action = "store_true" )
699
+ run_build_group .add_argument (
700
+ "--skip-build-tvos-device" ,
701
+ help = "skip building Swift stdlibs for tvOS devices "
702
+ "(i.e. build simulators only)" ,
703
+ action = "store_true" )
704
+ run_build_group .add_argument (
705
+ "--skip-build-tvos-simulator" ,
706
+ help = "skip building Swift stdlibs for tvOS simulator "
707
+ "(i.e. build devices only)" ,
708
+ action = "store_true" )
709
+
710
+ run_build_group .add_argument (
711
+ "--skip-build-watchos" ,
712
+ help = "skip building Swift stdlibs for watchOS" ,
713
+ action = "store_true" )
714
+ run_build_group .add_argument (
715
+ "--skip-build-watchos-device" ,
716
+ help = "skip building Swift stdlibs for watchOS devices "
717
+ "(i.e. build simulators only)" ,
718
+ action = "store_true" )
719
+ run_build_group .add_argument (
720
+ "--skip-build-watchos-simulator" ,
721
+ help = "skip building Swift stdlibs for watchOS simulator "
722
+ "(i.e. build devices only)" ,
723
+ action = "store_true" )
724
+
725
+ run_build_group .add_argument (
726
+ "--skip-build-android" ,
727
+ help = "skip building Swift stdlibs for Android" ,
728
+ action = "store_true" )
729
+
680
730
run_build_group .add_argument (
681
731
"--skip-build-benchmarks" ,
682
732
help = "skip building Swift Benchmark Suite" ,
@@ -732,18 +782,33 @@ details of the setups of other systems or automated environments.""")
732
782
help = "also build for iOS, but disallow tests that require an iOS "
733
783
"device" ,
734
784
action = "store_true" )
785
+ parser .add_argument (
786
+ "--skip-ios" ,
787
+ help = "set to skip everything iOS-related" ,
788
+ dest = "ios" ,
789
+ action = "store_false" )
735
790
736
791
parser .add_argument (
737
792
"--tvos" ,
738
793
help = "also build for tvOS, but disallow tests that require a tvos "
739
794
"device" ,
740
795
action = "store_true" )
796
+ parser .add_argument (
797
+ "--skip-tvos" ,
798
+ help = "set to skip everything tvOS-related" ,
799
+ dest = "tvos" ,
800
+ action = "store_false" )
741
801
742
802
parser .add_argument (
743
803
"--watchos" ,
744
804
help = "also build for watchOS, but disallow tests that require an "
745
805
"watchOS device" ,
746
806
action = "store_true" )
807
+ parser .add_argument (
808
+ "--skip-watchos" ,
809
+ help = "set to skip everything watchOS-related" ,
810
+ dest = "watchos" ,
811
+ action = "store_false" )
747
812
748
813
parser .add_argument (
749
814
"--android" ,
@@ -1044,6 +1109,10 @@ details of the setups of other systems or automated environments.""")
1044
1109
args .skip_build_freebsd = True
1045
1110
args .skip_build_cygwin = True
1046
1111
args .skip_build_osx = True
1112
+ args .skip_build_ios = True
1113
+ args .skip_build_tvos = True
1114
+ args .skip_build_watchos = True
1115
+ args .skip_build_android = True
1047
1116
args .skip_build_benchmarks = True
1048
1117
args .build_lldb = False
1049
1118
args .build_llbuild = False
@@ -1052,6 +1121,23 @@ details of the setups of other systems or automated environments.""")
1052
1121
args .build_foundation = False
1053
1122
args .build_libdispatch = False
1054
1123
1124
+ # --skip-{ios,tvos,watchos} or --skip-build-{ios,tvos,watchos} are
1125
+ # merely shorthands for --skip-build-{**os}-{device,simulator}
1126
+ if not args .ios or args .skip_build_ios :
1127
+ args .skip_build_ios_device = True
1128
+ args .skip_build_ios_simulator = True
1129
+
1130
+ if not args .watchos or args .skip_build_watchos :
1131
+ args .skip_build_tvos_device = True
1132
+ args .skip_build_tvos_simulator = True
1133
+
1134
+ if not args .watchos or args .skip_build_watchos :
1135
+ args .skip_build_watchos_device = True
1136
+ args .skip_build_watchos_simulator = True
1137
+
1138
+ if not args .android or args .skip_build_android :
1139
+ args .skip_build_android = True
1140
+
1055
1141
# --validation-test implies --test.
1056
1142
if args .validation_test :
1057
1143
args .test = True
@@ -1071,16 +1157,33 @@ details of the setups of other systems or automated environments.""")
1071
1157
args .skip_test_watchos = True
1072
1158
1073
1159
# --skip-test-ios is merely a shorthand for host and simulator tests.
1074
- if args .skip_test_ios or not args . ios :
1160
+ if args .skip_test_ios :
1075
1161
args .skip_test_ios_host = True
1076
1162
args .skip_test_ios_simulator = True
1077
1163
# --skip-test-tvos is merely a shorthand for host and simulator tests.
1078
- if args .skip_test_tvos or not args . tvos :
1164
+ if args .skip_test_tvos :
1079
1165
args .skip_test_tvos_host = True
1080
1166
args .skip_test_tvos_simulator = True
1081
1167
# --skip-test-watchos is merely a shorthand for host and simulator tests.
1082
- if args .skip_test_watchos or not args .watchos :
1168
+ if args .skip_test_watchos :
1169
+ args .skip_test_watchos_host = True
1170
+ args .skip_test_watchos_simulator = True
1171
+
1172
+ # --skip-build-{ios,tvos,watchos}-{device,simulator} implies
1173
+ # --skip-test-{ios,tvos,watchos}-{host,simulator}
1174
+ if args .skip_build_ios_device :
1175
+ args .skip_test_ios_host = True
1176
+ if args .skip_build_ios_simulator :
1177
+ args .skip_test_ios_simulator = True
1178
+
1179
+ if args .skip_build_tvos_device :
1180
+ args .skip_test_tvos_host = True
1181
+ if args .skip_build_tvos_simulator :
1182
+ args .skip_test_tvos_simulator = True
1183
+
1184
+ if args .skip_build_watchos_device :
1083
1185
args .skip_test_watchos_host = True
1186
+ if args .skip_build_watchos_simulator :
1084
1187
args .skip_test_watchos_simulator = True
1085
1188
1086
1189
if not args .host_test :
@@ -1230,19 +1333,19 @@ details of the setups of other systems or automated environments.""")
1230
1333
build_script_impl_args += ["--skip-build-cygwin" ]
1231
1334
if args .skip_build_osx :
1232
1335
build_script_impl_args += ["--skip-build-osx" ]
1233
- if not args .ios or args . skip_build :
1234
- build_script_impl_args += ["--skip-build-ios" ,
1235
- "--skip-build-ios-device" ,
1236
- "--skip-build-ios-simulator" ]
1237
- if not args .tvos or args . skip_build :
1238
- build_script_impl_args += ["--skip-build-tvos" ,
1239
- "--skip-build-tvos-device" ,
1240
- "--skip-build-tvos-simulator" ]
1241
- if not args .watchos or args . skip_build :
1242
- build_script_impl_args += ["--skip-build-watchos" ,
1243
- "--skip-build-watchos-device" ,
1244
- "--skip-build-watchos-simulator" ]
1245
- if not args .android or args . skip_build :
1336
+ if args .skip_build_ios_device :
1337
+ build_script_impl_args += ["--skip-build-ios-device" ]
1338
+ if args . skip_build_ios_simulator :
1339
+ build_script_impl_args += [ "--skip-build-ios-simulator" ]
1340
+ if args .skip_build_tvos_device :
1341
+ build_script_impl_args += ["--skip-build-tvos-device" ]
1342
+ if args . skip_build_tvos_simulator :
1343
+ build_script_impl_args += [ "--skip-build-tvos-simulator" ]
1344
+ if args .skip_build_watchos_device :
1345
+ build_script_impl_args += ["--skip-build-watchos-device" ]
1346
+ if args . skip_build_watchos_simulator :
1347
+ build_script_impl_args += [ "--skip-build-watchos-simulator" ]
1348
+ if args .skip_build_android :
1246
1349
build_script_impl_args += ["--skip-build-android" ]
1247
1350
1248
1351
if not args .test and not args .long_test :
0 commit comments