Skip to content

Resolve paths passed in the SwiftPM configuration to the project root #2150

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
May 14, 2025
Merged

Resolve paths passed in the SwiftPM configuration to the project root #2150

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
Resolve paths passed in the SwiftPM configuration to the project root 
Resolves #2148.
  • Loading branch information
@bnbarham
bnbarham committed May 13, 2025
commit 385f8ae79f2edbba9b921973b9c1d88bec8f5cb7
25 changes: 12 additions & 13 deletions Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,18 +203,23 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
throw Error.cannotDetermineHostToolchain
}

var absProjectRoot = try AbsolutePath(validating: projectRoot.filePath)
let hostSDK = try SwiftSDK.hostSwiftSDK(AbsolutePath(validating: destinationToolchainBinDir.filePath))
let hostSwiftPMToolchain = try UserToolchain(swiftSDK: hostSDK)

let destinationSDK = try SwiftSDK.deriveTargetSwiftSDK(
hostSwiftSDK: hostSDK,
hostTriple: hostSwiftPMToolchain.targetTriple,
customToolsets: options.swiftPMOrDefault.toolsets?.map { try AbsolutePath(validating: $0) } ?? [],
customToolsets: options.swiftPMOrDefault.toolsets?.map {
try AbsolutePath(validating: $0, relativeTo: absProjectRoot)
} ?? [],
customCompileTriple: options.swiftPMOrDefault.triple.map { try Triple($0) },
swiftSDKSelector: options.swiftPMOrDefault.swiftSDK,
store: SwiftSDKBundleStore(
swiftSDKsDirectory: localFileSystem.getSharedSwiftSDKsDirectory(
explicitDirectory: options.swiftPMOrDefault.swiftSDKsDirectory.map { try AbsolutePath(validating: $0) }
explicitDirectory: options.swiftPMOrDefault.swiftSDKsDirectory.map {
try AbsolutePath(validating: $0, relativeTo: absProjectRoot)
}
),
fileSystem: localFileSystem,
observabilityScope: observabilitySystem.topScope.makeChildScope(description: "SwiftPM Bundle Store"),
Expand All @@ -227,20 +232,14 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
let destinationSwiftPMToolchain = try UserToolchain(swiftSDK: destinationSDK)

var location = try Workspace.Location(
forRootPackage: try AbsolutePath(validating: projectRoot.filePath),
forRootPackage: absProjectRoot,
fileSystem: localFileSystem
)

if options.backgroundIndexingOrDefault {
location.scratchDirectory = try AbsolutePath(
validating: projectRoot.appendingPathComponent(".build").appendingPathComponent("index-build").filePath
)
} else if let scratchDirectory = options.swiftPMOrDefault.scratchPath,
let scratchDirectoryPath = try? AbsolutePath(
validating: scratchDirectory,
relativeTo: AbsolutePath(validating: projectRoot.filePath)
)
{
location.scratchDirectory = scratchDirectoryPath
location.scratchDirectory = absProjectRoot.appending(components: ".build", "index-build")
} else if let scratchDirectory = options.swiftPMOrDefault.scratchPath {
location.scratchDirectory = try AbsolutePath(validating: scratchDirectory, relativeTo: absProjectRoot)
}

var configuration = WorkspaceConfiguration.default
Expand Down