Skip to content

Commit b374808

Browse files
committed
Merge pull request #1745 from apple/build-presets-shellscript-params-explicit-1
[build-presets] Remove explicit =1 for impl params
2 parents b75d19b + 5b575ba commit b374808

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

utils/build-presets.ini

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ validation-test
2929

3030
dash-dash
3131

32-
verbose-build=1
32+
verbose-build
3333
build-ninja
3434

3535
swift-sdks=OSX;IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR
3636

3737
# Build static standard library because it is used
3838
# to build external projects.
39-
build-swift-static-stdlib=1
40-
build-swift-stdlib-unittest-extra=1
39+
build-swift-static-stdlib
40+
build-swift-stdlib-unittest-extra
4141

4242
compiler-vendor=apple
4343

4444
darwin-crash-reporter-client=0
45-
install-swift=1
45+
install-swift
4646

4747
# Path to the root of the installation filesystem.
4848
install-destdir=%(install_destdir)s
@@ -116,7 +116,7 @@ dash-dash
116116

117117
swift-stdlib-build-type=RelWithDebInfo
118118
swift-stdlib-enable-assertions=false
119-
build-serialized-stdlib-unittest=1
119+
build-serialized-stdlib-unittest
120120

121121

122122
[preset: mixin_buildbot_tools_RA_stdlib_DA]
@@ -181,8 +181,8 @@ dash-dash
181181
skip-test-ios-host
182182
skip-test-tvos-host
183183
skip-test-watchos-host
184-
swift-enable-lto=1
185-
llvm-enable-lto=1
184+
swift-enable-lto
185+
llvm-enable-lto
186186

187187
#===------------------------------------------------------------------------===#
188188
# Incremental buildbots for Darwin OSes
@@ -198,13 +198,13 @@ dash-dash
198198
# in the build-script and build-presets.ini.
199199
reconfigure
200200

201-
verbose-build=1
201+
verbose-build
202202
build-ninja
203203

204204
# Don't build static standard library to speed up the build.
205205
build-swift-static-stdlib=0
206206

207-
build-swift-stdlib-unittest-extra=1
207+
build-swift-stdlib-unittest-extra
208208

209209
compiler-vendor=apple
210210

@@ -402,7 +402,7 @@ dash-dash
402402
reconfigure
403403

404404
# We want to always perform a verbose build
405-
verbose-build=1
405+
verbose-build
406406

407407
# Build ninja while we are at it
408408
build-ninja
@@ -411,7 +411,7 @@ build-ninja
411411
build-swift-static-stdlib=0
412412

413413
# We need to build the unittest extras so we can test
414-
build-swift-stdlib-unittest-extra=1
414+
build-swift-stdlib-unittest-extra
415415

416416
# Set the vendor to apple
417417
compiler-vendor=apple
@@ -435,15 +435,15 @@ swift-primary-variant-sdk=OSX
435435
swift-primary-variant-arch=x86_64
436436

437437
# Don't build the benchmarks
438-
skip-build-benchmarks=1
438+
skip-build-benchmarks
439439

440440
[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx,flto]
441441
mixin-preset=buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx
442442
build-subdir=buildbot_incremental
443443

444444
dash-dash
445445

446-
swift-enable-lto=1
446+
swift-enable-lto
447447

448448

449449
#===------------------------------------------------------------------------===#
@@ -469,12 +469,12 @@ dash-dash
469469
# in the build-script and build-presets.ini.
470470
reconfigure
471471

472-
verbose-build=1
472+
verbose-build
473473
build-ninja
474474

475475
# Don't build static standard library to speed up the build.
476476
build-swift-static-stdlib=0
477-
build-swift-stdlib-unittest-extra=1
477+
build-swift-stdlib-unittest-extra
478478

479479
skip-build-ios
480480
skip-test-ios
@@ -514,13 +514,13 @@ skip-test-osx
514514
# Always reconfigure so we pick up changes in the build-script and
515515
# build-presets.ini.
516516
reconfigure
517-
verbose-build=1
517+
verbose-build
518518
build-ninja
519519
# Don't build static standard library to speed up the build.
520520
build-swift-static-stdlib=0
521-
build-swift-stdlib-unittest-extra=1
521+
build-swift-stdlib-unittest-extra
522522
compiler-vendor=apple
523-
swift-runtime-enable-leak-checker=1
523+
swift-runtime-enable-leak-checker
524524

525525
[preset: buildbot_incremental_leaks,tools=RA,stdlib=R]
526526
mixin-preset=buildbot_incremental_leaks
@@ -579,13 +579,13 @@ install-swiftpm
579579
install-xctest
580580
install-prefix=/usr
581581
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;license
582-
build-swift-static-stdlib=1
583-
build-swift-stdlib-unittest-extra=1
584-
skip-test-lldb=1
582+
build-swift-static-stdlib
583+
build-swift-stdlib-unittest-extra
584+
skip-test-lldb
585585

586586
# Executes the lit tests for the installable package that is created
587587
# Assumes the swift-integration-tests repo is checked out
588-
test-installable-package=1
588+
test-installable-package
589589

590590
# Path to the root of the installation filesystem.
591591
install-destdir=%(install_destdir)s
@@ -637,13 +637,13 @@ install-swiftpm
637637
install-xctest
638638
install-prefix=/usr
639639
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;dev
640-
build-swift-static-stdlib=1
641-
skip-test-lldb=1
640+
build-swift-static-stdlib
641+
skip-test-lldb
642642

643643
# Executes the lit tests for the installable package that is created
644644
# Assumes the swift-package-tests repo is checked out
645645
# FIXME: Disabled until a home for the swift-snapshot-tests can be found.
646-
#test-installable-package=1
646+
#test-installable-package
647647

648648
# Path to the root of the installation filesystem.
649649
install-destdir=%(install_destdir)s
@@ -672,21 +672,21 @@ dash-dash
672672

673673
lldb-no-debugserver
674674
lldb-build-type=Release
675-
verbose-build=1
675+
verbose-build
676676
build-ninja
677-
build-swift-static-stdlib=1
678-
build-swift-stdlib-unittest-extra=1
677+
build-swift-static-stdlib
678+
build-swift-stdlib-unittest-extra
679679
compiler-vendor=apple
680680
swift-sdks=OSX;IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR
681681

682-
install-swift=1
683-
install-lldb=1
684-
install-llbuild=1
685-
install-swiftpm=1
682+
install-swift
683+
install-lldb
684+
install-llbuild
685+
install-swiftpm
686686

687687
install-destdir=%(install_destdir)s
688688

689-
darwin-install-extract-symbols=1
689+
darwin-install-extract-symbols
690690

691691
# Path where debug symbols will be installed.
692692
install-symroot=%(install_symroot)s
@@ -697,7 +697,7 @@ install-prefix=%(install_toolchain_dir)s/usr
697697

698698
# Executes the lit tests for the installable package that is created
699699
# Assumes the swift-integration-tests repo is checked out
700-
test-installable-package=1
700+
test-installable-package
701701

702702
# If someone uses this for incremental builds, force reconfiguration.
703703
reconfigure
@@ -755,7 +755,7 @@ darwin-toolchain-alias=%(darwin_toolchain_alias)s
755755

756756
[preset: LLDB_Nested]
757757
dash-dash
758-
skip-build-benchmarks=1
758+
skip-build-benchmarks
759759
install-destdir=%(swift_install_destdir)s
760760

761761
[preset: LLDB_Swift_DebugAssert]

0 commit comments

Comments
 (0)