Skip to content

Commit 8d7a150

Browse files
committed
[build-script][SR-237] Migrate --skip-{variant} --skip-build-{variant}
Eliminate some arguments tweaks from build-script-impl Migreated: --skip-ios --skip-tvos --skip-watchos --skip-build-ios --skip-build-ios-device --skip-build-ios-simulator --skip-build-tvos --skip-build-tvos-device --skip-build-tvos-simulator --skip-build-watchos --skip-build-watchos-device --skip-build-watchos-simulator --skip-build-android Removed from impl: // These args were merely shorthands for: // --skip-build-{variant}-{device,simulator} // --skip-test-{variant}-{host,simulator} --skip-ios --skip-tvos --skip-watchos --skip-build-ios --skip-build-tvos --skip-build-watchos
1 parent 2988223 commit 8d7a150

File tree

2 files changed

+119
-97
lines changed

2 files changed

+119
-97
lines changed

utils/build-script

Lines changed: 119 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,56 @@ details of the setups of other systems or automated environments.""")
677677
help="skip building Swift stdlibs for MacOSX",
678678
action="store_true")
679679

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+
680730
run_build_group.add_argument(
681731
"--skip-build-benchmarks",
682732
help="skip building Swift Benchmark Suite",
@@ -732,18 +782,33 @@ details of the setups of other systems or automated environments.""")
732782
help="also build for iOS, but disallow tests that require an iOS "
733783
"device",
734784
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")
735790

736791
parser.add_argument(
737792
"--tvos",
738793
help="also build for tvOS, but disallow tests that require a tvos "
739794
"device",
740795
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")
741801

742802
parser.add_argument(
743803
"--watchos",
744804
help="also build for watchOS, but disallow tests that require an "
745805
"watchOS device",
746806
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")
747812

748813
parser.add_argument(
749814
"--android",
@@ -1044,6 +1109,10 @@ details of the setups of other systems or automated environments.""")
10441109
args.skip_build_freebsd = True
10451110
args.skip_build_cygwin = True
10461111
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
10471116
args.skip_build_benchmarks = True
10481117
args.build_lldb = False
10491118
args.build_llbuild = False
@@ -1052,6 +1121,23 @@ details of the setups of other systems or automated environments.""")
10521121
args.build_foundation = False
10531122
args.build_libdispatch = False
10541123

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+
10551141
# --validation-test implies --test.
10561142
if args.validation_test:
10571143
args.test = True
@@ -1071,16 +1157,33 @@ details of the setups of other systems or automated environments.""")
10711157
args.skip_test_watchos = True
10721158

10731159
# --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:
10751161
args.skip_test_ios_host = True
10761162
args.skip_test_ios_simulator = True
10771163
# --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:
10791165
args.skip_test_tvos_host = True
10801166
args.skip_test_tvos_simulator = True
10811167
# --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:
10831185
args.skip_test_watchos_host = True
1186+
if args.skip_build_watchos_simulator:
10841187
args.skip_test_watchos_simulator = True
10851188

10861189
if not args.host_test:
@@ -1230,19 +1333,19 @@ details of the setups of other systems or automated environments.""")
12301333
build_script_impl_args += ["--skip-build-cygwin"]
12311334
if args.skip_build_osx:
12321335
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:
12461349
build_script_impl_args += ["--skip-build-android"]
12471350

12481351
if not args.test and not args.long_test:

utils/build-script-impl

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,17 @@ KNOWN_SETTINGS=(
105105
swift-sdks "" "build target binaries only for specified SDKs (semicolon-separated list)"
106106
swift-primary-variant-sdk "" "default SDK for target binaries"
107107
swift-primary-variant-arch "" "default arch for target binaries"
108-
skip-ios "" "set to skip everything iOS-related"
109-
skip-tvos "" "set to skip everything tvOS-related"
110-
skip-watchos "" "set to skip everything watchOS-related"
111108
skip-build-cmark "" "set to skip building CommonMark"
112109
skip-build-llvm "" "set to skip building LLVM/Clang"
113110
skip-build-swift "" "set to skip building Swift"
114111
skip-build-linux "" "set to skip building Swift stdlibs for Linux"
115112
skip-build-freebsd "" "set to skip building Swift stdlibs for FreeBSD"
116113
skip-build-cygwin "" "set to skip building Swift stdlibs for Cygwin"
117114
skip-build-osx "" "set to skip building Swift stdlibs for OSX"
118-
skip-build-ios "" "set to skip building Swift stdlibs for iOS"
119115
skip-build-ios-device "" "set to skip building Swift stdlibs for iOS devices (i.e. build simulators only)"
120116
skip-build-ios-simulator "" "set to skip building Swift stdlibs for iOS simulators (i.e. build devices only)"
121-
skip-build-tvos "" "set to skip building Swift stdlibs for tvOS"
122117
skip-build-tvos-device "" "set to skip building Swift stdlibs for tvOS devices (i.e. build simulators only)"
123118
skip-build-tvos-simulator "" "set to skip building Swift stdlibs for tvOS simulators (i.e. build devices only)"
124-
skip-build-watchos "" "set to skip building Swift stdlibs for Apple watchOS"
125119
skip-build-watchos-device "" "set to skip building Swift stdlibs for Apple watchOS devices (i.e. build simulators only)"
126120
skip-build-watchos-simulator "" "set to skip building Swift stdlibs for Apple watchOS simulators (i.e. build devices only)"
127121
skip-build-android "" "set to skip building Swift stdlibs for Android"
@@ -706,81 +700,6 @@ if [[ "${CHECK_ARGS_ONLY}" ]]; then
706700
exit 0
707701
fi
708702

709-
if [[ "${SKIP_IOS}" ]] ; then
710-
SKIP_BUILD_IOS=1
711-
SKIP_BUILD_IOS_DEVICE=1
712-
SKIP_BUILD_IOS_SIMULATOR=1
713-
SKIP_TEST_IOS_HOST=1
714-
SKIP_TEST_IOS_SIMULATOR=1
715-
fi
716-
717-
if [[ "${SKIP_TVOS}" ]] ; then
718-
SKIP_BUILD_TVOS=1
719-
SKIP_BUILD_TVOS_DEVICE=1
720-
SKIP_BUILD_TVOS_SIMULATOR=1
721-
SKIP_TEST_TVOS_HOST=1
722-
SKIP_TEST_TVOS_SIMULATOR=1
723-
fi
724-
725-
if [[ "${SKIP_WATCHOS}" ]] ; then
726-
SKIP_BUILD_WATCHOS=1
727-
SKIP_BUILD_WATCHOS_DEVICE=1
728-
SKIP_BUILD_WATCHOS_SIMULATOR=1
729-
SKIP_TEST_WATCHOS_HOST=1
730-
SKIP_TEST_WATCHOS_SIMULATOR=1
731-
fi
732-
733-
if [[ "${SKIP_BUILD_IOS}" ]] ; then
734-
SKIP_BUILD_IOS=1
735-
SKIP_BUILD_IOS_DEVICE=1
736-
SKIP_BUILD_IOS_SIMULATOR=1
737-
SKIP_TEST_IOS_HOST=1
738-
SKIP_TEST_IOS_SIMULATOR=1
739-
fi
740-
741-
if [[ "${SKIP_BUILD_TVOS}" ]] ; then
742-
SKIP_BUILD_TVOS=1
743-
SKIP_BUILD_TVOS_DEVICE=1
744-
SKIP_BUILD_TVOS_SIMULATOR=1
745-
SKIP_TEST_TVOS_HOST=1
746-
SKIP_TEST_TVOS_SIMULATOR=1
747-
fi
748-
749-
if [[ "${SKIP_BUILD_WATCHOS}" ]] ; then
750-
SKIP_BUILD_WATCHOS=1
751-
SKIP_BUILD_WATCHOS_DEVICE=1
752-
SKIP_BUILD_WATCHOS_SIMULATOR=1
753-
SKIP_TEST_WATCHOS_HOST=1
754-
SKIP_TEST_WATCHOS_SIMULATOR=1
755-
fi
756-
757-
if [[ "${SKIP_BUILD_IOS_DEVICE}" ]] ; then
758-
SKIP_BUILD_IOS_DEVICE=1
759-
fi
760-
761-
if [[ "${SKIP_BUILD_TVOS_DEVICE}" ]] ; then
762-
SKIP_BUILD_TVOS_DEVICE=1
763-
fi
764-
765-
if [[ "${SKIP_BUILD_WATCHOS_DEVICE}" ]] ; then
766-
SKIP_BUILD_WATCHOS_DEVICE=1
767-
fi
768-
769-
if [[ "${SKIP_BUILD_IOS_SIMULATOR}" ]] ; then
770-
SKIP_BUILD_IOS_SIMULATOR=1
771-
SKIP_TEST_IOS_SIMULATOR=1
772-
fi
773-
774-
if [[ "${SKIP_BUILD_TVOS_SIMULATOR}" ]] ; then
775-
SKIP_BUILD_TVOS_SIMULATOR=1
776-
SKIP_TEST_TVOS_SIMULATOR=1
777-
fi
778-
779-
if [[ "${SKIP_BUILD_WATCHOS_SIMULATOR}" ]] ; then
780-
SKIP_BUILD_WATCHOS_SIMULATOR=1
781-
SKIP_TEST_WATCHOS_SIMULATOR=1
782-
fi
783-
784703
# FIXME: We currently do not support building compiler-rt with the
785704
# Xcode generator.
786705
if [[ "${CMAKE_GENERATOR}" == "Xcode" ]]; then

0 commit comments

Comments
 (0)