Move swiftpm to swift_build_support infra

This will allow cleaning up most of the hacks in SwiftPM's build script.

<rdar://problem/56220087>

Author: aciidgh

utils/build-script

@@ -337,7 +337,6 @@ class BuildScriptInvocation(object):
             "--libdispatch-build-type", args.libdispatch_build_variant,
             "--libicu-build-type", args.libicu_build_variant,
             "--xctest-build-type", args.build_variant,
-            "--swiftpm-build-type", args.build_variant,
             "--llbuild-build-type", args.build_variant,
             "--swift-enable-assertions", str(args.swift_assertions).lower(),
             "--swift-stdlib-enable-assertions", str(
@@ -464,8 +463,6 @@ class BuildScriptInvocation(object):
             impl_args += ["--skip-build-libdispatch"]
         if not args.build_libicu:
             impl_args += ["--skip-build-libicu"]
-        if not args.build_swiftpm:
-            impl_args += ["--skip-build-swiftpm"]
         if not args.build_playgroundsupport:
             impl_args += ["--skip-build-playgroundsupport"]
         if args.build_swift_dynamic_stdlib:
@@ -508,7 +505,6 @@ class BuildScriptInvocation(object):
             impl_args += ["--skip-test-cmark",
                           "--skip-test-lldb",
                           "--skip-test-llbuild",
-                          "--skip-test-swiftpm",
                           "--skip-test-xctest",
                           "--skip-test-foundation",
                           "--skip-test-libdispatch",

utils/build_swift/driver_arguments.py

@@ -203,6 +203,7 @@ def _apply_default_arguments(args):
         args.test_tvos = False
         args.test_watchos = False
         args.test_android = False
+        args.test_swiftpm = False
         args.test_swiftsyntax = False
         args.test_indexstoredb = False
         args.test_sourcekitlsp = False
@@ -557,6 +558,9 @@ def create_argument_parser():
     option(['-p', '--swiftpm'], store_true('build_swiftpm'),
            help='build swiftpm')
 
+    option(['--install-swiftpm'], store_true('install_swiftpm'),
+           help='install swiftpm')
+
     option(['--swiftsyntax'], store_true('build_swiftsyntax'),
            help='build swiftSyntax')
 
@@ -968,6 +972,8 @@ def create_argument_parser():
            help='skip testing Android device targets on the host machine (the '
                 'phone itself)')
 
+    option('--skip-test-swiftpm', toggle_false('test_swiftpm'),
+           help='skip testing swiftpm')
     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

@@ -88,6 +88,7 @@
     'build_swiftevolve': False,
     'build_indexstoredb': False,
     'build_sourcekitlsp': False,
+    'install_swiftpm': False,
     'install_swiftsyntax': False,
     'skip_install_swiftsyntax_module': False,
     'swiftsyntax_verify_generated_files': False,
@@ -208,6 +209,7 @@
     'test_watchos': False,
     'test_watchos_host': False,
     'test_watchos_simulator': False,
+    'test_swiftpm': False,
     'test_swiftsyntax': False,
     'test_indexstoredb': False,
     'test_sourcekitlsp': False,
@@ -485,6 +487,7 @@ class BuildScriptImplOption(_BaseOption):
                  dest='skip_install_swiftsyntax_module'),
     EnableOption('--swiftsyntax-verify-generated-files',
                  dest='swiftsyntax_verify_generated_files'),
+    EnableOption('--install-swiftpm', dest='install_swiftpm'),
     EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),
     EnableOption('--install-skstresstester', dest='install_skstresstester'),
     EnableOption('--install-swiftevolve', dest='install_swiftevolve'),
@@ -542,6 +545,7 @@ class BuildScriptImplOption(_BaseOption):
     DisableOption('--skip-test-watchos-host', dest='test_watchos_host'),
     DisableOption('--skip-test-watchos-simulator',
                   dest='test_watchos_simulator'),
+    DisableOption('--skip-test-swiftpm', dest='test_swiftpm'),
     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/swiftpm.py

@@ -2,16 +2,81 @@
 #
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2019 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 product
+import os
+import platform
 
+from . import product
+from .. import shell
 
 class SwiftPM(product.Product):
-    pass
+    @classmethod
+    def product_source_name(cls):
+        return "swiftpm"
+
+    @classmethod
+    def is_build_script_impl_product(cls):
+        return False
+
+    def should_build(self, host_target):
+        return True
+
+    def run_build_script_helper(self, action, host_target, additional_params=[]):
+        script_path = os.path.join(
+            self.source_dir, 'Utilities', 'bootstrap')
+        toolchain_path = self.install_toolchain_path()
+        swiftc = os.path.join(toolchain_path, "usr", "bin", "swiftc")
+        sbt = os.path.join(toolchain_path, "usr", "bin", "swift-build-tool")
+
+        llbuild_src = os.path.join(
+             os.path.dirname(self.source_dir), "llbuild")
+
+        # FIXME: We require llbuild build directory in order to build. Is
+        # there a better way to get this?
+        build_root = os.path.dirname(self.build_dir)
+        llbuild_build_dir = os.path.join(
+                build_root, '%s-%s' % ("llbuild", host_target))
+
+        helper_cmd = [script_path]
+
+        if action != "build":
+            helper_cmd.append(action)
+
+        if self.is_release():
+            helper_cmd.append("--release")
+
+        helper_cmd += [
+            "--swiftc=" + swiftc,
+            "--sbt=" + sbt,
+            "--build", self.build_dir,
+            "--llbuild-source-dir=" + llbuild_src,
+            "--llbuild-build-dir=" + llbuild_build_dir,
+        ]
+        helper_cmd.extend(additional_params)
+
+        shell.call(helper_cmd)
+
+    def build(self, host_target):
+        self.run_build_script_helper('build', host_target)
+
+    def should_test(self, host_target):
+        return self.args.test_swiftpm
+
+    def test(self, host_target):
+        self.run_build_script_helper('test', host_target)
+
+    def should_install(self, host_target):
+        return self.args.install_swiftpm
+
+    def install(self, host_target):
+        install_prefix = self.args.install_destdir + self.args.install_prefix
+        self.run_build_script_helper('install', host_target, [
+            '--prefix', install_prefix
+        ])