Merge pull request #28091 from ahoppen/swiftevolve-unified-build

[build-script] Build SwiftEvolve as part of the unified build

Author: ahoppen

utils/swift_build_support/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata

@@ -10,10 +10,7 @@
 #
 # ----------------------------------------------------------------------------
 
-import os
-
 from . import skstresstester
-from .. import shell
 
 
 class SwiftEvolve(skstresstester.SKStressTester):
@@ -25,39 +22,9 @@ def product_source_name(cls):
         """
         return "swift-stress-tester"
 
-    @classmethod
-    def is_swiftpm_unified_build_product(cls):
-        return False
-
     def package_name(self):
         return 'SwiftEvolve'
 
-    # Copy of the build-script-helper invocation without the multiroot data 
-    # file. Remove again once SwiftEvolve also builds in the unified build.
-    def run_build_script_helper(self, action, additional_params=[]):
-        script_path = os.path.join(
-            self.source_dir, 'build-script-helper.py')
-
-        configuration = 'release' if self.is_release() else 'debug'
-
-        helper_cmd = [
-            script_path,
-            action,
-            '--package-dir', self.package_name(),
-            '--toolchain', self.install_toolchain_path(),
-            '--config', configuration,
-            '--build-dir', self.build_dir,
-            # There might have been a Package.resolved created by other builds
-            # or by the package being opened using Xcode. Discard that and
-            # reset the dependencies to be local.
-            '--update'
-        ]
-        if self.args.verbose_build:
-            helper_cmd.append('--verbose')
-        helper_cmd.extend(additional_params)
-
-        shell.call(helper_cmd)
-
     # Inherit the entire build configuration from the SourceKit stress tester
 
     def should_build(self, host_target):