Merge pull request #32474 from DougGregor/build-script-swift-driver

[build-script] Add support for building, installing, and testing swift-driver

Author: DougGregor

utils/build-script

@@ -862,6 +862,8 @@ class BuildScriptInvocation(object):
         product_classes = []
         if self.args.build_swiftpm:
             product_classes.append(products.SwiftPM)
+        if self.args.build_swift_driver:
+            product_classes.append(products.SwiftDriver)
         if self.args.build_swiftsyntax:
             product_classes.append(products.SwiftSyntax)
         if self.args.build_skstresstester:

utils/build_swift/build_swift/driver_arguments.py

@@ -184,6 +184,7 @@ def _apply_default_arguments(args):
         args.test_watchos = False
         args.test_android = False
         args.test_swiftpm = False
+        args.test_swift_driver = False
         args.test_swiftsyntax = False
         args.test_indexstoredb = False
         args.test_sourcekitlsp = False
@@ -574,6 +575,9 @@ def create_argument_parser():
     option(['--swiftevolve'], store_true('build_swiftevolve'),
            help='build the swift-evolve tool')
 
+    option(['--swift-driver'], toggle_true('build_swift_driver'),
+           help='build swift-driver')
+
     option(['--indexstore-db'], toggle_true('build_indexstoredb'),
            help='build IndexStoreDB')
     option('--test-indexstore-db-sanitize-all',
@@ -596,6 +600,8 @@ def create_argument_parser():
            help='install SourceKitLSP')
     option(['--install-skstresstester'], toggle_true('install_skstresstester'),
            help='install the SourceKit stress tester')
+    option(['--install-swift-driver'], toggle_true('install_swift_driver'),
+           help='install new Swift driver')
     option(['--install-swiftevolve'], toggle_true('install_swiftevolve'),
            help='install SwiftEvolve')
     option(['--toolchain-benchmarks'],
@@ -1009,6 +1015,8 @@ def create_argument_parser():
 
     option('--skip-test-swiftpm', toggle_false('test_swiftpm'),
            help='skip testing swiftpm')
+    option('--skip-test-swift-driver', toggle_false('test_swift_driver'),
+           help='skip testing Swift driver')
     option('--skip-test-swiftsyntax', toggle_false('test_swiftsyntax'),
            help='skip testing SwiftSyntax')
     option('--skip-test-indexstore-db', toggle_false('test_indexstoredb'),

utils/build_swift/tests/expected_options.py

@@ -89,6 +89,7 @@
     'build_swift_static_stdlib': False,
     'build_swift_stdlib_unittest_extra': False,
     'build_swiftpm': False,
+    'build_swift_driver': False,
     'build_swiftsyntax': False,
     'build_tensorflow_swift_apis': False,
     'build_libparser_only': False,
@@ -99,6 +100,7 @@
     'test_sourcekitlsp_sanitize_all': False,
     'build_sourcekitlsp': False,
     'install_swiftpm': False,
+    'install_swift_driver': False,
     'install_swiftsyntax': False,
     'swiftsyntax_verify_generated_files': False,
     'install_playgroundsupport': False,
@@ -230,6 +232,7 @@
     'test_watchos_simulator': False,
     'test_playgroundsupport': True,
     'test_swiftpm': False,
+    'test_swift_driver': False,
     'test_swiftsyntax': False,
     'test_indexstoredb': False,
     'test_sourcekitlsp': False,
@@ -473,6 +476,7 @@ class BuildScriptImplOption(_BaseOption):
                   dest='install_tensorflow_swift_apis'),
     SetTrueOption('--skip-build'),
     SetTrueOption('--swiftpm', dest='build_swiftpm'),
+    SetTrueOption('--swift-driver', dest='build_swift_driver'),
     SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'),
     SetTrueOption('--build-libparser-only', dest='build_libparser_only'),
     SetTrueOption('--skstresstester', dest='build_skstresstester'),
@@ -523,6 +527,7 @@ class BuildScriptImplOption(_BaseOption):
     EnableOption('--swiftsyntax-verify-generated-files',
                  dest='swiftsyntax_verify_generated_files'),
     EnableOption('--install-swiftpm', dest='install_swiftpm'),
+    EnableOption('--install-swift-driver', dest='install_swift_driver'),
     EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),
     EnableOption('--install-skstresstester', dest='install_skstresstester'),
     EnableOption('--install-swiftevolve', dest='install_swiftevolve'),
@@ -588,6 +593,7 @@ class BuildScriptImplOption(_BaseOption):
     DisableOption('--skip-test-playgroundsupport',
                   dest='test_playgroundsupport'),
     DisableOption('--skip-test-swiftpm', dest='test_swiftpm'),
+    DisableOption('--skip-test-swift-driver', dest='test_swift_driver'),
     DisableOption('--skip-test-swiftsyntax', dest='test_swiftsyntax'),
     DisableOption('--skip-test-indexstore-db', dest='test_indexstoredb'),
     DisableOption('--skip-test-sourcekit-lsp', dest='test_sourcekitlsp'),

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -26,6 +26,7 @@
 from .skstresstester import SKStressTester
 from .sourcekitlsp import SourceKitLSP
 from .swift import Swift
+from .swiftdriver import SwiftDriver
 from .swiftevolve import SwiftEvolve
 from .swiftinspect import SwiftInspect
 from .swiftpm import SwiftPM
@@ -50,6 +51,7 @@
     'Swift',
     'SwiftInspect',
     'SwiftPM',
+    'SwiftDriver',
     'TensorFlowSwiftAPIs',
     'XCTest',
     'SwiftSyntax',

utils/swift_build_support/swift_build_support/products/swiftdriver.py

@@ -0,0 +1,67 @@
+# swift_build_support/products/swiftdriver.py -------------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ----------------------------------------------------------------------------
+
+from . import cmark
+from . import foundation
+from . import indexstoredb
+from . import libcxx
+from . import libdispatch
+from . import libicu
+from . import llbuild
+from . import llvm
+from . import product
+from . import swift
+from . import xctest
+
+
+class SwiftDriver(product.Product):
+    @classmethod
+    def product_source_name(cls):
+        return "swift-driver"
+
+    @classmethod
+    def is_build_script_impl_product(cls):
+        return False
+
+    def should_build(self, host_target):
+        return self.args.build_swift_driver
+
+    @classmethod
+    def get_dependencies(cls):
+        return [cmark.CMark,
+                llvm.LLVM,
+                libcxx.LibCXX,
+                libicu.LibICU,
+                swift.Swift,
+                libdispatch.LibDispatch,
+                foundation.Foundation,
+                xctest.XCTest,
+                llbuild.LLBuild]
+
+    def build(self, host_target):
+        indexstoredb.run_build_script_helper(
+            'build', host_target, self, self.args)
+
+    def should_test(self, host_target):
+        return self.args.test_swift_driver
+
+    def test(self, host_target):
+        indexstoredb.run_build_script_helper(
+            'test', host_target, self, self.args,
+            self.args.test_sourcekitlsp_sanitize_all)
+
+    def should_install(self, host_target):
+        return self.args.install_swift_driver
+
+    def install(self, host_target):
+        indexstoredb.run_build_script_helper(
+            'install', host_target, self, self.args)