Skip to content

build: define build path structure in BuildSystemProvider.Kind #8298

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
Feb 26, 2025
Merged

build: define build path structure in BuildSystemProvider.Kind #8298

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
6 changes: 3 additions & 3 deletions Sources/CoreCommands/SwiftCommandState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ public final class SwiftCommandState {
self.observabilityHandler.progress,
self.observabilityHandler.prompt
)
let isXcodeBuildSystemEnabled = self.options.build.buildSystem == .xcode
let isXcodeBuildSystemEnabled = self.options.build.buildSystem.usesXcodeBuildEngine
let workspace = try Workspace(
fileSystem: self.fileSystem,
location: .init(
Expand All @@ -459,7 +459,7 @@ public final class SwiftCommandState {
configuration: .init(
skipDependenciesUpdates: options.resolver.skipDependencyUpdate,
prefetchBasedOnResolvedFile: options.resolver.shouldEnableResolverPrefetching,
shouldCreateMultipleTestProducts: toolWorkspaceConfiguration.wantsMultipleTestProducts || options.build.buildSystem == .xcode,
shouldCreateMultipleTestProducts: toolWorkspaceConfiguration.wantsMultipleTestProducts || options.build.buildSystem.usesXcodeBuildEngine,
createREPLProduct: toolWorkspaceConfiguration.wantsREPLProduct,
additionalFileRules: isXcodeBuildSystemEnabled ? FileRuleDescription.xcbuildFileTypes : FileRuleDescription.swiftpmFileTypes,
sharedDependenciesCacheEnabled: self.options.caching.useDependenciesCache,
Expand Down Expand Up @@ -795,7 +795,7 @@ public final class SwiftCommandState {
workers: options.build.jobs ?? UInt32(ProcessInfo.processInfo.activeProcessorCount),
sanitizers: options.build.enabledSanitizers,
indexStoreMode: options.build.indexStoreMode.buildParameter,
isXcodeBuildSystemEnabled: options.build.buildSystem == .xcode,
isXcodeBuildSystemEnabled: options.build.buildSystem.usesXcodeBuildEngine,
prepareForIndexing: prepareForIndexingMode,
debuggingParameters: .init(
debugInfoFormat: options.build.debugInfoFormat.buildParameter,
Expand Down
8 changes: 8 additions & 0 deletions Sources/SPMBuildCore/BuildSystem/BuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,14 @@ public struct BuildSystemProvider {
}
}

extension BuildSystemProvider.Kind {
public var usesXcodeBuildEngine: Bool {
switch self {
case .native: return false
case .xcode: return true
}
}
}
private enum Errors: Swift.Error {
case buildSystemProviderNotRegistered(kind: BuildSystemProvider.Kind)
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/SPMBuildCore/Triple+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ extension Triple {
// Use "apple" as the subdirectory because in theory Xcode build system
// can be used to build for any Apple platform and it has its own
// conventions for build subpaths based on platforms.
buildSystem == .xcode ? "apple" : self.platformBuildPathComponent
buildSystem.usesXcodeBuildEngine ? "apple" : self.platformBuildPathComponent
}
}
2 changes: 1 addition & 1 deletion Sources/swift-bootstrap/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ struct SwiftBootstrapBuildTool: AsyncParsableCommand {
triple: self.hostToolchain.targetTriple,
flags: buildFlags,
architectures: architectures,
isXcodeBuildSystemEnabled: buildSystem == .xcode,
isXcodeBuildSystemEnabled: buildSystem.usesXcodeBuildEngine,
driverParameters: .init(
explicitTargetDependencyImportCheckingMode: explicitTargetDependencyImportCheck == .error ? .error : .none,
useIntegratedSwiftDriver: useIntegratedSwiftDriver,
Expand Down