[build-script] Transform IndexStoreDB and SourcekitLSP to use ProductBuilders.

Create a new helper for IndexStoreDB and SourcekitLSP called
BuildScriptHelperBuilder. Move most of the code that existed in a
function in indexstoredb.py into that helper object.

Create small builders for IndexStoreDB and SourcekitLSP which use this
helper object as their base.

Modify the main build-script to invoke the new builder instead of the
specific do_build/do_test. This way, all products are using the same
system to be build, but some use build-script-impl, and others use
build-script-helper.py.

Author: drodriguez

utils/build-script

@@ -321,20 +321,14 @@ class BuildScriptInvocation(object):
 
         # Non-build-script-impl products...
         # Note: currently only supports building for the host.
-        for host_target in [self.args.host_target]:
+        for host_target in [
+                StdlibDeploymentTarget.get_target_for_name(
+                    self.args.host_target)]:
             for product_class in product_classes:
                 if product_class.is_build_script_impl_product():
                     continue
-                product_source = product_class.product_source_name()
-                product_name = product_class.product_name()
-                product = product_class(
-                    args=self.args,
-                    toolchain=self.toolchain,
-                    source_dir=self.workspace.source_dir(product_source),
-                    build_dir=self.workspace.build_dir(
-                        host_target, product_name))
-                product.do_build(host_target)
-                product.do_test(host_target)
+                self.__execute_build_action(host_target, product_class)
+                self.__execute_test_action(host_target, product_class)
 
         # Extract symbols...
         for host_target in all_hosts:

utils/swift_build_support/swift_build_support/products/build_script_helper_builder.py

@@ -0,0 +1,60 @@
+# swift_build_support/product_builders/build_script_helper_b... -*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# 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_builder
+from .. import shell, targets
+
+import os
+import platform
+
+
+class BuildScriptHelperBuilder(product_builder.ProductBuilder):
+    def __init__(self, product_class, args, toolchain, workspace, host):
+        self.__source_dir = workspace.source_dir(
+            product_class.product_source_name())
+        self.__build_dir = workspace.build_dir(host.name,
+                                               product_class.product_name())
+        self.__args = args
+
+    def do_build(self):
+        self.__run_build_script_helper('build')
+
+    def do_test(self):
+        if self._should_test():
+            self.__run_build_script_helper('test')
+
+    def _should_test(self):
+        raise NotImplementedError("_should_test should be overriden by "
+                                  "subclass {}.".format(self.__class__))
+
+    def __run_build_script_helper(self, action):
+        script_path = os.path.join(
+            self.__source_dir, 'Utilities', 'build-script-helper.py')
+        toolchain_path = self.__args.install_destdir
+        if platform.system() == 'Darwin':
+            # The prefix is an absolute path, so concatenate without os.path.
+            toolchain_path += \
+                targets.darwin_toolchain_prefix(self.__args.install_prefix)
+        if self.__args.build_variant == 'Debug':
+            configuration = 'debug'
+        else:
+            configuration = 'release'
+        helper_cmd = [
+            script_path,
+            action,
+            '--verbose',
+            '--package-path', self.__source_dir,
+            '--build-path', self.__build_dir,
+            '--configuration', configuration,
+            '--toolchain', toolchain_path,
+        ]
+        shell.call(helper_cmd)

utils/swift_build_support/swift_build_support/products/indexstoredb.py

@@ -10,12 +10,8 @@
 #
 # ----------------------------------------------------------------------------
 
-import os
-import platform
-
 from . import product
-from .. import shell
-from .. import targets
+from .build_script_helper_builder import BuildScriptHelperBuilder
 
 
 class IndexStoreDB(product.Product):
@@ -27,30 +23,16 @@ def product_source_name(cls):
     def is_build_script_impl_product(cls):
         return False
 
-    def do_build(self, host_target):
-        run_build_script_helper('build', host_target, self, self.args)
-
-    def do_test(self, host_target):
-        if self.args.test and self.args.test_indexstoredb:
-            run_build_script_helper('test', host_target, self, self.args)
-
-
-def run_build_script_helper(action, host_target, product, args):
-    script_path = os.path.join(
-        product.source_dir, 'Utilities', 'build-script-helper.py')
-    toolchain_path = args.install_destdir
-    if platform.system() == 'Darwin':
-        # The prefix is an absolute path, so concatenate without os.path.
-        toolchain_path += \
-            targets.darwin_toolchain_prefix(args.install_prefix)
-    configuration = 'debug' if args.build_variant == 'Debug' else 'release'
-    helper_cmd = [
-        script_path,
-        action,
-        '--verbose',
-        '--package-path', product.source_dir,
-        '--build-path', product.build_dir,
-        '--configuration', configuration,
-        '--toolchain', toolchain_path,
-    ]
-    shell.call(helper_cmd)
+    @classmethod
+    def make_builder(cls, args, toolchain, workspace, host):
+        return IndexStoreDBBuilder(args, toolchain, workspace, host)
+
+
+class IndexStoreDBBuilder(BuildScriptHelperBuilder):
+    def __init__(self, args, toolchain, workspace, host):
+        BuildScriptHelperBuilder.__init__(self, IndexStoreDB, args, toolchain,
+                                          workspace, host)
+        self.__args = args
+
+    def _should_test(self):
+        return self.__args.test and self.__args.test_indexstoredb

utils/swift_build_support/swift_build_support/products/product.py

@@ -40,20 +40,6 @@ def is_build_script_impl_product(cls):
         """
         return True
 
-    def do_build(self, host_target):
-        """do_build() -> void
-
-        Perform the build, for a non-build-script-impl product.
-        """
-        raise NotImplementedError
-
-    def do_test(self, host_target):
-        """do_build() -> void
-
-        Run the tests, for a non-build-script-impl product.
-        """
-        raise NotImplementedError
-
     @classmethod
     def make_builder(cls, args, toolchain, workspace, host):
         return BuildScriptImplBuilder(cls, args, toolchain, workspace, host)

utils/swift_build_support/swift_build_support/products/sourcekitlsp.py

@@ -10,8 +10,8 @@
 #
 # ----------------------------------------------------------------------------
 
-from . import indexstoredb
 from . import product
+from .build_script_helper_builder import BuildScriptHelperBuilder
 
 
 class SourceKitLSP(product.Product):
@@ -23,11 +23,16 @@ def product_source_name(cls):
     def is_build_script_impl_product(cls):
         return False
 
-    def do_build(self, host_target):
-        indexstoredb.run_build_script_helper(
-            'build', host_target, self, self.args)
+    @classmethod
+    def make_builder(cls, args, toolchain, workspace, host):
+        return SourceKitLSPBuilder(args, toolchain, workspace, host)
+
+
+class SourceKitLSPBuilder(BuildScriptHelperBuilder):
+    def __init__(self, args, toolchain, workspace, host):
+        BuildScriptHelperBuilder.__init__(self, SourceKitLSP, args, toolchain,
+                                          workspace, host)
+        self.__args = args
 
-    def do_test(self, host_target):
-        if self.args.test and self.args.test_sourcekitlsp:
-            indexstoredb.run_build_script_helper(
-                'test', host_target, self, self.args)
+    def _should_test(self):
+        return self.__args.test and self.__args.test_sourcekitlsp