From de3561442827aa310f245d3fce81256472c0fc9f Mon Sep 17 00:00:00 2001 From: Doug Gregor Date: Sat, 27 Aug 2022 00:27:34 -0700 Subject: [PATCH] Default to building the early SwiftSyntax package. One can disable this with `build-script --skip-early-swiftsyntax`. --- utils/build_swift/build_swift/driver_arguments.py | 5 +++-- utils/build_swift/tests/expected_options.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py index e6aa044e91e90..ea2e76367fde2 100644 --- a/utils/build_swift/build_swift/driver_arguments.py +++ b/utils/build_swift/build_swift/driver_arguments.py @@ -662,8 +662,9 @@ def create_argument_parser(): option(['--swiftsyntax'], toggle_true('build_swiftsyntax'), help='build swiftSyntax') - option(['--early-swiftsyntax'], toggle_true('build_early_swiftsyntax'), - help='build early SwiftSyntax') + option(['--skip-early-swiftsyntax'], + toggle_false('build_early_swiftsyntax'), + help='skip building early SwiftSyntax') option(['--skstresstester'], toggle_true('build_skstresstester'), help='build the SourceKit stress tester') diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py index f39396c84bdf9..3d789e22257c3 100644 --- a/utils/build_swift/tests/expected_options.py +++ b/utils/build_swift/tests/expected_options.py @@ -90,7 +90,7 @@ 'build_swiftpm': False, 'build_swift_driver': False, 'build_early_swift_driver': True, - 'build_early_swiftsyntax': False, + 'build_early_swiftsyntax': True, 'build_swiftsyntax': False, 'build_libparser_only': False, 'build_skstresstester': False, @@ -519,7 +519,6 @@ class BuildScriptImplOption(_BaseOption): SetTrueOption('--skip-build'), SetTrueOption('--swiftpm', dest='build_swiftpm'), SetTrueOption('--swift-driver', dest='build_swift_driver'), - SetTrueOption('--early-swiftsyntax', dest='build_early_swiftsyntax'), SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'), SetTrueOption('--build-libparser-only', dest='build_libparser_only'), SetTrueOption('--skstresstester', dest='build_skstresstester'), @@ -637,6 +636,7 @@ class BuildScriptImplOption(_BaseOption): DisableOption('--skip-clean-xctest', dest='clean_xctest'), DisableOption('--skip-clean-llbuild', dest='clean_llbuild'), DisableOption('--skip-early-swift-driver', dest='build_early_swift_driver'), + DisableOption('--skip-early-swiftsyntax', dest='build_early_swiftsyntax'), DisableOption('--skip-clean-swiftpm', dest='clean_swiftpm'), DisableOption('--skip-clean-swift-driver', dest='clean_swift_driver'), DisableOption('--skip-test-android', dest='test_android'),