SwiftTool: introduce --experimental-destination-selector option
#5922
Conversation
Also adds `experimental-destination list` subcommand, which prints a list of available destinations. `ArtifactsArchiveMetadata` schema version validation is implemented to accept new 1.1 schema version with the new destinations bundle type.
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
|
I think |
MaxDesiatov
requested review from
abertelrud,
neonichu,
tomerd and
elsh
as code owners
| @@ -103,7 +103,7 @@ public struct Destination: Encodable, Equatable { | |||
| } | |||
|
|
|||
| /// Additional flags to be passed to the build tools. | |||
| public let extraFlags: BuildFlags | |||
| public var extraFlags: BuildFlags | |||
There was a problem hiding this comment.
does it need to be mutated?
There was a problem hiding this comment.
Yes, it happens on https://github.com/apple/swift-package-manager/pull/5922/files#diff-ba866b666cdc2795c59e6713e0817015f0076f5447541e8c477db717cbb6baf3R114
Since it's a struct, I think making this var is safe, as any mutations are local and don't have side effects?
Sources/PackageModel/Manifest.swift
Outdated
| @@ -180,14 +180,14 @@ public final class Manifest { | |||
| } | |||
|
|
|||
| var requiredDependencies: Set<PackageIdentity> = [] | |||
| for targetTriple in self.targetsRequired(for: products) { | |||
| for targetDependency in targetTriple.dependencies { | |||
| for linuxGNUTargetTriple in self.targetsRequired(for: products) { | |||
There was a problem hiding this comment.
automated Xcode renaming is bad at this, sorry...
| @@ -48,7 +48,7 @@ public struct TestingObservability { | |||
| self.collector.hasWarnings | |||
| } | |||
|
|
|||
| struct Collector: ObservabilityHandlerProvider, DiagnosticsHandler, CustomStringConvertible { | |||
| final class Collector: ObservabilityHandlerProvider, DiagnosticsHandler, CustomStringConvertible { | |||
There was a problem hiding this comment.
As I'm using ObservabilityScope in this PR, I'm taking an opportunity to make this a class, because diagnostics: ThreadSafeArrayStore is a class instance, so there's no actual value semantics here even with a struct.
Sources/Workspace/Workspace.swift
Outdated
| try location.validate( | ||
| keyPath: \.sharedCrossCompilationDestinationsDirectory, | ||
| fileSystem: fileSystem, | ||
| getOrCreateHandler: { |
MaxDesiatov
force-pushed
the
maxd/list-destinations
branch
from
13ec06e to
23e8991
Compare
…xd/build-with-destinations # Conflicts: # Sources/SPMBuildCore/DestinationsBundle.swift
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
|
@swift-ci smoke test |
Depends on #5911.
Motivation:
With support for listing cross-compilation destinations with new
swift experimental-destinations listcommand, we also need a way to actually use those. New--experimental-destination-selectoroption is added, through which users can either select a destination via an ID or a target triple.Modifications:
Added new
crossCompilationDestinationSelectortoBuildOptions. ModifiedSwiftToolto select a destination from this selector string. Implemented destination selection based on a selector inDestinationsBundle.swift. RefactoredWorkspace.Locationto create shared locations in a unified way. Added a simple test for destination selection.Result:
Cross-compilation destinations can be selected when building a package.