Skip to content

[6.0][SwiftPMBuildSystem] Adjust BuildParameters use to indicate a desti… #1454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2024
Merged

[6.0][SwiftPMBuildSystem] Adjust BuildParameters use to indicate a desti… #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ public actor SwiftPMBuildSystem {

private var modulesGraph: ModulesGraph
private let workspace: Workspace
@_spi(Testing) public let buildParameters: BuildParameters
@_spi(Testing) public let toolsBuildParameters: BuildParameters
@_spi(Testing) public let destinationBuildParameters: BuildParameters
private let fileSystem: FileSystem
private let toolchain: SKCore.Toolchain

Expand Down Expand Up @@ -235,7 +236,18 @@ public actor SwiftPMBuildSystem {
buildConfiguration = .release
}

self.buildParameters = try BuildParameters(
self.toolsBuildParameters = try BuildParameters(
destination: .host,
dataPath: location.scratchDirectory.appending(
component: swiftPMToolchain.targetTriple.platformBuildPathComponent
),
configuration: buildConfiguration,
toolchain: swiftPMToolchain,
flags: buildSetup.flags
)

self.destinationBuildParameters = try BuildParameters(
destination: .target,
dataPath: location.scratchDirectory.appending(
component: swiftPMToolchain.targetTriple.platformBuildPathComponent
),
Expand Down Expand Up @@ -313,12 +325,13 @@ extension SwiftPMBuildSystem {
let modulesGraph = try self.workspace.loadPackageGraph(
rootInput: PackageGraphRootInput(packages: [AbsolutePath(projectRoot)]),
forceResolvedVersions: forceResolvedVersions,
availableLibraries: self.buildParameters.toolchain.providedLibraries,
availableLibraries: [],
observabilityScope: observabilitySystem.topScope
)

let plan = try BuildPlan(
buildParameters: buildParameters,
productsBuildParameters: destinationBuildParameters,
toolsBuildParameters: toolsBuildParameters,
graph: modulesGraph,
fileSystem: fileSystem,
observabilityScope: observabilitySystem.topScope
Expand Down Expand Up @@ -384,12 +397,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? {
Expand Down
12 changes: 6 additions & 6 deletions Tests/SKSwiftPMWorkspaceTests/SwiftPMBuildSystemTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,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)
Expand Down Expand Up @@ -212,7 +212,7 @@ final class SwiftPMBuildSystemTests: XCTestCase {
try await swiftpmBuildSystem.generateBuildGraph(allowFileSystemWrites: false)

let aPlusSomething = packageRoot.appending(components: "Sources", "lib", "a+something.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)
Expand Down Expand Up @@ -275,7 +275,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)
Expand Down Expand Up @@ -514,7 +514,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)
Expand Down Expand Up @@ -596,7 +596,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(
Expand Down Expand Up @@ -829,7 +829,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)
Expand Down