Skip to content

[build] Remove unemployed 'skip-{build,test}-*' flags from build-script-impl #33154

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 1 commit into from
Aug 11, 2020
Merged

[build] Remove unemployed 'skip-{build,test}-*' flags from build-script-impl #33154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 0 additions & 55 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,9 +560,6 @@ class BuildScriptInvocation(object):
impl_args += ["--skip-build"]
if not args.build_benchmarks:
impl_args += ["--skip-build-benchmarks"]
# Currently we do not build external benchmarks by default.
if args.build_external_benchmarks:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can go.

impl_args += ["--skip-build-external-benchmarks=0"]

# Then add subproject install flags that either skip building them /or/
# if we are going to build them and install_all is set, we also install
Expand Down Expand Up @@ -596,26 +593,6 @@ class BuildScriptInvocation(object):
if args.build_swift_static_sdk_overlay:
impl_args += ["--build-swift-static-sdk-overlay"]

if not args.build_linux:
impl_args += ["--skip-build-linux"]
if not args.build_freebsd:
impl_args += ["--skip-build-freebsd"]
if not args.build_cygwin:
impl_args += ["--skip-build-cygwin"]
if not args.build_osx:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this really not do anything? I am pretty sure I have used these in the past bit.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If invoked originally from the Python build-script, it hasn't done anything in this bash script in many years, as it's handled in Python, #2880. As a result, the actual implementation of this flag in this bash script was removed last year in the aforementioned pull #26495.

impl_args += ["--skip-build-osx"]
if not args.build_ios_device:
impl_args += ["--skip-build-ios-device"]
if not args.build_ios_simulator:
impl_args += ["--skip-build-ios-simulator"]
if not args.build_tvos_device:
impl_args += ["--skip-build-tvos-device"]
if not args.build_tvos_simulator:
impl_args += ["--skip-build-tvos-simulator"]
if not args.build_watchos_device:
impl_args += ["--skip-build-watchos-device"]
if not args.build_watchos_simulator:
impl_args += ["--skip-build-watchos-simulator"]
if not args.build_android:
impl_args += ["--skip-build-android"]
if not args.build_clang_tools_extra:
Expand All @@ -633,32 +610,6 @@ class BuildScriptInvocation(object):
"--skip-test-libdispatch",
"--skip-test-libicu",
]
if not args.test_linux:
impl_args += ["--skip-test-linux"]
if not args.test_freebsd:
impl_args += ["--skip-test-freebsd"]
if not args.test_cygwin:
impl_args += ["--skip-test-cygwin"]
if not args.test_osx:
impl_args += ["--skip-test-osx"]
if not args.test_ios_host:
impl_args += ["--skip-test-ios-host"]
if not args.test_ios_simulator:
impl_args += ["--skip-test-ios-simulator"]
if not args.test_ios_32bit_simulator:
impl_args += ["--skip-test-ios-32bit-simulator"]
if not args.test_tvos_host:
impl_args += ["--skip-test-tvos-host"]
if not args.test_tvos_simulator:
impl_args += ["--skip-test-tvos-simulator"]
if not args.test_watchos_host:
impl_args += ["--skip-test-watchos-host"]
if not args.test_watchos_simulator:
impl_args += ["--skip-test-watchos-simulator"]
if not args.test_android:
impl_args += ["--skip-test-android"]
if not args.test_android_host:
impl_args += ["--skip-test-android-host"]
if args.build_runtime_with_host_compiler:
impl_args += ["--build-runtime-with-host-compiler"]
if args.validation_test:
Expand All @@ -673,12 +624,6 @@ class BuildScriptInvocation(object):
impl_args += ["--only-executable-test"]
if not args.benchmark:
impl_args += ["--skip-test-benchmarks"]
if not args.test_optimized:
impl_args += ["--skip-test-optimized"]
if not args.test_optimize_for_size:
impl_args += ["--skip-test-optimize-for-size"]
if not args.test_optimize_none_with_implicit_dynamic:
impl_args += ["--skip-test-optimize-none-with-implicit-dynamic"]
if args.build_libparser_only:
impl_args += ["--build-libparser-only"]
if args.android:
Expand Down
31 changes: 0 additions & 31 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,40 +126,9 @@ KNOWN_SETTINGS=(
skip-build-clang-tools-extra "" "set to skip building clang-tools-extra as part of llvm"
skip-build-compiler-rt "" "set to skip building Compiler-RT"
skip-build-lld "" "set to skip building lld as part of llvm (linux only)"
skip-build-cygwin "" "set to skip building Swift stdlibs for Cygwin"
skip-build-external-benchmarks "1" "set to skip building the external Swift Benchmark Suite. (skipped by default)"
skip-build-freebsd "" "set to skip building Swift stdlibs for FreeBSD"
skip-build-haiku "" "set to skip building Swift stdlibs for Haiku"
skip-build-ios-device "" "set to skip building Swift stdlibs for iOS devices (i.e. build simulators only)"
skip-build-ios-simulator "" "set to skip building Swift stdlibs for iOS simulators (i.e. build devices only)"
skip-build-linux "" "set to skip building Swift stdlibs for Linux"
skip-build-maccatalyst "" "set to skip building Swift stdlibs for macCatalyst"
skip-build-osx "" "set to skip building Swift stdlibs for OS X"
skip-build-tvos-device "" "set to skip building Swift stdlibs for tvOS devices (i.e. build simulators only)"
skip-build-tvos-simulator "" "set to skip building Swift stdlibs for tvOS simulators (i.e. build devices only)"
skip-build-watchos-device "" "set to skip building Swift stdlibs for Apple watchOS devices (i.e. build simulators only)"
skip-build-watchos-simulator "" "set to skip building Swift stdlibs for Apple watchOS simulators (i.e. build devices only)"

## Skip Test ...
skip-test-android "" "set to skip testing Swift stdlibs for Android"
skip-test-android-host "" "set to skip testing the host parts of the Android toolchain"
skip-test-cygwin "" "set to skip testing Swift stdlibs for Cygwin"
skip-test-freebsd "" "set to skip testing Swift stdlibs for FreeBSD"
skip-test-haiku "" "set to skip testing Swift stdlibs for Haiku"
skip-test-ios-32bit-simulator "" "set to skip testing Swift stdlibs for iOS 32bit simulators"
skip-test-ios-host "" "set to skip testing the host parts of the iOS toolchain"
skip-test-ios-simulator "" "set to skip testing Swift stdlibs for iOS simulators (i.e. test devices only)"
skip-test-linux "" "set to skip testing Swift stdlibs for Linux"
skip-test-maccatalyst "" "set to skip testing Swift stdlibs for macCatalyst"
skip-test-osx "" "set to skip testing Swift stdlibs for OS X"
skip-test-tvos-host "" "set to skip testing the host parts of the tvOS toolchain"
skip-test-tvos-simulator "" "set to skip testing Swift stdlibs for tvOS simulators (i.e. test devices only)"
skip-test-watchos-host "" "set to skip testing the host parts of the watchOS toolchain"
skip-test-watchos-simulator "" "set to skip testing Swift stdlibs for Apple watchOS simulators (i.e. test devices only)"
skip-test-benchmarks "" "set to skip running Swift Benchmark Suite"
skip-test-optimized "" "set to skip testing the test suite in optimized mode"
skip-test-optimize-for-size "" "set to skip testing the test suite in optimize for size mode"
skip-test-optimize-none-with-implicit-dynamic "" "set to skip testing the test suite in optimize none with implicit dynamic mode"
skip-test-sourcekit "" "set to skip testing SourceKit"

## Extra ... CMake Options
Expand Down