Skip to content

Affirmative names for argument parsing namespace destinations. #11952

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 5 commits into from
Sep 15, 2017
Merged

Affirmative names for argument parsing namespace destinations. #11952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e3793e
Added new OptionalTrueAction and OptionalFalseAction classes to the a…
Rostepher Sep 15, 2017
8f193af
Fixed missing return statement in help-test generator.
Rostepher Sep 15, 2017
837f60a
Renamed all the `skip_build_*` names to the more simple and affirmati…
Rostepher Sep 15, 2017
f9f8727
Renamed all the `skip_test_*` names to the more simple and affirmativ…
Rostepher Sep 15, 2017
dc7cdce
Added documentation to the OptionalTrueAction and OptionalFalseAction…
Rostepher Sep 15, 2017
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
100 changes: 50 additions & 50 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,80 +268,80 @@ class BuildScriptInvocation(object):
# iterate over all supported platforms.

self.platforms_to_skip_build = set()
if args.skip_build_linux:
if not args.build_linux:
self.platforms_to_skip_build.add(StdlibDeploymentTarget.Linux)
if args.skip_build_freebsd:
if not args.build_freebsd:
self.platforms_to_skip_build.add(StdlibDeploymentTarget.FreeBSD)
if args.skip_build_cygwin:
if not args.build_cygwin:
self.platforms_to_skip_build.add(StdlibDeploymentTarget.Cygwin)
if args.skip_build_osx:
if not args.build_osx:
self.platforms_to_skip_build.add(StdlibDeploymentTarget.OSX)
if args.skip_build_ios_device:
if not args.build_ios_device:
self.platforms_to_skip_build.add(StdlibDeploymentTarget.iOS)
if args.skip_build_ios_simulator:
if not args.build_ios_simulator:
self.platforms_to_skip_build.add(
StdlibDeploymentTarget.iOSSimulator)
if args.skip_build_tvos_device:
if not args.build_tvos_device:
self.platforms_to_skip_build.add(StdlibDeploymentTarget.AppleTV)
if args.skip_build_tvos_simulator:
if not args.build_tvos_simulator:
self.platforms_to_skip_build.add(
StdlibDeploymentTarget.AppleTVSimulator)
if args.skip_build_watchos_device:
if not args.build_watchos_device:
self.platforms_to_skip_build.add(StdlibDeploymentTarget.AppleWatch)
if args.skip_build_watchos_simulator:
if not args.build_watchos_simulator:
self.platforms_to_skip_build.add(
StdlibDeploymentTarget.AppleWatchSimulator)
if args.skip_build_android:
if not args.build_android:
self.platforms_to_skip_build.add(StdlibDeploymentTarget.Android)

self.platforms_to_skip_test = set()
self.platforms_archs_to_skip_test = set()
if args.skip_test_linux:
if not args.test_linux:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.Linux)
if args.skip_test_freebsd:
if not args.test_freebsd:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.FreeBSD)
if args.skip_test_cygwin:
if not args.test_cygwin:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.Cygwin)
if args.skip_test_osx:
if not args.test_osx:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.OSX)
if args.skip_test_ios_host:
if not args.test_ios_device:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.iOS)
else:
exit_rejecting_arguments("error: iOS device tests are not " +
"supported in open-source Swift.")
if args.skip_test_ios_simulator:
if not args.test_ios_simulator:
self.platforms_to_skip_test.add(
StdlibDeploymentTarget.iOSSimulator)
if args.skip_test_ios_32bit_simulator:
if not args.test_ios_32bit_simulator:
self.platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.iOSSimulator.i386)
if args.skip_test_tvos_host:
if not args.test_tvos_device:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.AppleTV)
else:
exit_rejecting_arguments("error: tvOS device tests are not " +
"supported in open-source Swift.")
if args.skip_test_tvos_simulator:
if not args.test_tvos_simulator:
self.platforms_to_skip_test.add(
StdlibDeploymentTarget.AppleTVSimulator)
if args.skip_test_watchos_host:
if not args.test_watchos_device:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.AppleWatch)
else:
exit_rejecting_arguments("error: watchOS device tests are not " +
"supported in open-source Swift.")
if args.skip_test_watchos_simulator:
if not args.test_watchos_simulator:
self.platforms_to_skip_test.add(
StdlibDeploymentTarget.AppleWatchSimulator)

if args.skip_test_android_host:
if not args.test_android_device:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.Android)

self.platforms_to_skip_test_host = set()
if args.skip_test_ios_host:
if not args.test_ios_device:
self.platforms_to_skip_test_host.add(StdlibDeploymentTarget.iOS)
if args.skip_test_tvos_host:
if not args.test_tvos_device:
self.platforms_to_skip_test_host.add(
StdlibDeploymentTarget.AppleTV)
if args.skip_test_watchos_host:
if not args.test_watchos_device:
self.platforms_to_skip_test_host.add(
StdlibDeploymentTarget.AppleWatch)

Expand Down Expand Up @@ -501,7 +501,7 @@ class BuildScriptInvocation(object):
impl_args += ["--skip-build-cmark",
"--skip-build-llvm",
"--skip-build-swift"]
if args.skip_build_benchmarks:
if not args.build_benchmarks:
impl_args += ["--skip-build-benchmarks"]
if not args.build_foundation:
impl_args += ["--skip-build-foundation"]
Expand Down Expand Up @@ -532,27 +532,27 @@ class BuildScriptInvocation(object):
if args.build_swift_static_sdk_overlay:
impl_args += ["--build-swift-static-sdk-overlay"]

if args.skip_build_linux:
if not args.build_linux:
impl_args += ["--skip-build-linux"]
if args.skip_build_freebsd:
if not args.build_freebsd:
impl_args += ["--skip-build-freebsd"]
if args.skip_build_cygwin:
if not args.build_cygwin:
impl_args += ["--skip-build-cygwin"]
if args.skip_build_osx:
if not args.build_osx:
impl_args += ["--skip-build-osx"]
if args.skip_build_ios_device:
if not args.build_ios_device:
impl_args += ["--skip-build-ios-device"]
if args.skip_build_ios_simulator:
if not args.build_ios_simulator:
impl_args += ["--skip-build-ios-simulator"]
if args.skip_build_tvos_device:
if not args.build_tvos_device:
impl_args += ["--skip-build-tvos-device"]
if args.skip_build_tvos_simulator:
if not args.build_tvos_simulator:
impl_args += ["--skip-build-tvos-simulator"]
if args.skip_build_watchos_device:
if not args.build_watchos_device:
impl_args += ["--skip-build-watchos-device"]
if args.skip_build_watchos_simulator:
if not args.build_watchos_simulator:
impl_args += ["--skip-build-watchos-simulator"]
if args.skip_build_android:
if not args.build_android:
impl_args += ["--skip-build-android"]

if not args.test and not args.long_test:
Expand All @@ -568,29 +568,29 @@ class BuildScriptInvocation(object):
"--skip-test-libicu",
"--skip-test-playgroundlogger",
"--skip-test-playgroundsupport"]
if args.skip_test_linux:
if not args.test_linux:
impl_args += ["--skip-test-linux"]
if args.skip_test_freebsd:
if not args.test_freebsd:
impl_args += ["--skip-test-freebsd"]
if args.skip_test_cygwin:
if not args.test_cygwin:
impl_args += ["--skip-test-cygwin"]
if args.skip_test_osx:
if not args.test_osx:
impl_args += ["--skip-test-osx"]
if args.skip_test_ios_host:
if not args.test_ios_device:
impl_args += ["--skip-test-ios-host"]
if args.skip_test_ios_simulator:
if not args.test_ios_simulator:
impl_args += ["--skip-test-ios-simulator"]
if args.skip_test_ios_32bit_simulator:
if not args.test_ios_32bit_simulator:
impl_args += ["--skip-test-ios-32bit-simulator"]
if args.skip_test_tvos_host:
if not args.test_tvos_device:
impl_args += ["--skip-test-tvos-host"]
if args.skip_test_tvos_simulator:
if not args.test_tvos_simulator:
impl_args += ["--skip-test-tvos-simulator"]
if args.skip_test_watchos_host:
if not args.test_watchos_device:
impl_args += ["--skip-test-watchos-host"]
if args.skip_test_watchos_simulator:
if not args.test_watchos_simulator:
impl_args += ["--skip-test-watchos-simulator"]
if args.skip_test_android_host:
if not args.test_android_device:
impl_args += ["--skip-test-android-host"]
if args.build_runtime_with_host_compiler:
impl_args += ["--build-runtime-with-host-compiler"]
Expand Down
Loading