Merge pull request #1361 from xedin/buildplan-parameter-split

[SwiftPMBuildSystem] Adjust `BuildParameters` use to indicate a desti…

Author: xedin

Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift

@@ -102,7 +102,8 @@ public actor SwiftPMBuildSystem {
   public var projectRoot: TSCAbsolutePath
   var modulesGraph: ModulesGraph
   let workspace: Workspace
-  public let buildParameters: BuildParameters
+  public let toolsBuildParameters: BuildParameters
+  public let destinationBuildParameters: BuildParameters
   let fileSystem: FileSystem
   private let toolchainRegistry: ToolchainRegistry
 
@@ -202,7 +203,16 @@ public actor SwiftPMBuildSystem {
       buildConfiguration = .release
     }
 
-    self.buildParameters = try BuildParameters(
+    self.toolsBuildParameters = try BuildParameters(
+      destination: .host,
+      dataPath: location.scratchDirectory.appending(component: toolchain.targetTriple.platformBuildPathComponent),
+      configuration: buildConfiguration,
+      toolchain: toolchain,
+      flags: buildSetup.flags
+    )
+
+    self.destinationBuildParameters = try BuildParameters(
+      destination: .target,
       dataPath: location.scratchDirectory.appending(component: toolchain.targetTriple.platformBuildPathComponent),
       configuration: buildConfiguration,
       toolchain: toolchain,
@@ -279,8 +289,8 @@ extension SwiftPMBuildSystem {
     )
 
     let plan = try BuildPlan(
-      productsBuildParameters: buildParameters,
-      toolsBuildParameters: buildParameters,
+      productsBuildParameters: destinationBuildParameters,
+      toolsBuildParameters: toolsBuildParameters,
       graph: modulesGraph,
       fileSystem: fileSystem,
       observabilityScope: observabilitySystem.topScope
@@ -345,11 +355,12 @@ extension SwiftPMBuildSystem: SKCore.BuildSystem {
   public nonisolated var supportsPreparation: Bool { true }
 
   public var buildPath: TSCAbsolutePath {
-    return TSCAbsolutePath(buildParameters.buildPath)
+    return TSCAbsolutePath(destinationBuildParameters.buildPath)
   }
 
   public var indexStorePath: TSCAbsolutePath? {
-    return buildParameters.indexStoreMode == .off ? nil : TSCAbsolutePath(buildParameters.indexStore)
+    return destinationBuildParameters.indexStoreMode == .off
+      ? nil : TSCAbsolutePath(destinationBuildParameters.indexStore)
   }
 
   public var indexDatabasePath: TSCAbsolutePath? {

Tests/SKSwiftPMWorkspaceTests/SwiftPMBuildSystemTests.swift

@@ -143,7 +143,7 @@ final class SwiftPMBuildSystemTests: XCTestCase {
       try await swiftpmBuildSystem.generateBuildGraph(allowFileSystemWrites: false)
 
       let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
-      let hostTriple = await swiftpmBuildSystem.buildParameters.triple
+      let hostTriple = await swiftpmBuildSystem.destinationBuildParameters.triple
       let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent)
 
       assertEqual(await swiftpmBuildSystem.buildPath, build)
@@ -214,7 +214,7 @@ final class SwiftPMBuildSystemTests: XCTestCase {
       try await swiftpmBuildSystem.generateBuildGraph(allowFileSystemWrites: false)
 
       let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
-      let hostTriple = await swiftpmBuildSystem.buildParameters.triple
+      let hostTriple = await swiftpmBuildSystem.destinationBuildParameters.triple
       let build = buildPath(root: packageRoot, config: config, platform: hostTriple.platformBuildPathComponent)
 
       assertEqual(await swiftpmBuildSystem.buildPath, build)
@@ -446,7 +446,7 @@ final class SwiftPMBuildSystemTests: XCTestCase {
       let acxx = packageRoot.appending(components: "Sources", "lib", "a.cpp")
       let bcxx = packageRoot.appending(components: "Sources", "lib", "b.cpp")
       let header = packageRoot.appending(components: "Sources", "lib", "include", "a.h")
-      let hostTriple = await swiftpmBuildSystem.buildParameters.triple
+      let hostTriple = await swiftpmBuildSystem.destinationBuildParameters.triple
       let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent)
 
       assertEqual(await swiftpmBuildSystem.buildPath, build)
@@ -528,7 +528,7 @@ final class SwiftPMBuildSystemTests: XCTestCase {
       let arguments = try await unwrap(swiftpmBuildSystem.buildSettings(for: aswift.asURI, language: .swift))
         .compilerArguments
       assertArgumentsContain("-target", arguments: arguments)  // Only one!
-      let hostTriple = await swiftpmBuildSystem.buildParameters.triple
+      let hostTriple = await swiftpmBuildSystem.destinationBuildParameters.triple
 
       #if os(macOS)
       assertArgumentsContain(
@@ -759,7 +759,7 @@ final class SwiftPMBuildSystemTests: XCTestCase {
       try await swiftpmBuildSystem.generateBuildGraph(allowFileSystemWrites: false)
 
       let aswift = packageRoot.appending(components: "Plugins", "MyPlugin", "a.swift")
-      let hostTriple = await swiftpmBuildSystem.buildParameters.triple
+      let hostTriple = await swiftpmBuildSystem.destinationBuildParameters.triple
       let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent)
 
       assertEqual(await swiftpmBuildSystem.buildPath, build)