Skip to content

Commit 121c607

Browse files
authored
Fix remaining mentions of "cross-compilation destinations" (#6918)
Not all of the help strings were updated to use "Swift SDK" instead of "cross-compilation destination" after SE-0387 was accepted.
1 parent 9ae01ed commit 121c607

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

Sources/SwiftSDKTool/Configuration/ConfigureSwiftSDK.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public struct ConfigureSwiftSDK: ParsableCommand {
1616
public static let configuration = CommandConfiguration(
1717
commandName: "configuration",
1818
abstract: """
19-
Manages configuration options for installed cross-compilation destinations.
19+
Manages configuration options for installed Swift SDKs.
2020
""",
2121
subcommands: [
2222
ResetConfiguration.self,

Sources/SwiftSDKTool/Configuration/ResetConfiguration.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ struct ResetConfiguration: ConfigurationSubcommand {
1919
static let configuration = CommandConfiguration(
2020
commandName: "reset",
2121
abstract: """
22-
Resets configuration properties currently applied to a given destination and run-time triple. If no specific \
23-
property is specified, all of them are reset for the destination.
22+
Resets configuration properties currently applied to a given Swift SDK and target triple. If no specific \
23+
property is specified, all of them are reset for the Swift SDK.
2424
"""
2525
)
2626

@@ -47,13 +47,13 @@ struct ResetConfiguration: ConfigurationSubcommand {
4747

4848
@Argument(
4949
help: """
50-
An identifier of an already installed destination. Use the `list` subcommand to see all available \
50+
An identifier of an already installed Swift SDK. Use the `list` subcommand to see all available \
5151
identifiers.
5252
"""
5353
)
5454
var sdkID: String
5555

56-
@Argument(help: "A run-time triple of the destination specified by `destination-id` identifier string.")
56+
@Argument(help: "A target triple of the Swift SDK specified by `sdk-id` identifier string.")
5757
var targetTriple: String
5858

5959
func run(
@@ -107,12 +107,12 @@ struct ResetConfiguration: ConfigurationSubcommand {
107107
if shouldResetAll {
108108
if try !configurationStore.resetConfiguration(sdkID: sdkID, targetTriple: targetTriple) {
109109
observabilityScope.emit(
110-
warning: "No configuration for destination \(sdkID)"
110+
warning: "No configuration for Swift SDK `\(sdkID)`"
111111
)
112112
} else {
113113
observabilityScope.emit(
114114
info: """
115-
All configuration properties of destination `\(sdkID) for run-time triple \
115+
All configuration properties of Swift SDK `\(sdkID)` for target triple \
116116
`\(targetTriple)` were successfully reset.
117117
"""
118118
)
@@ -124,7 +124,7 @@ struct ResetConfiguration: ConfigurationSubcommand {
124124

125125
observabilityScope.emit(
126126
info: """
127-
These properties of destination `\(sdkID) for run-time triple \
127+
These properties of Swift SDK `\(sdkID)` for target triple \
128128
`\(targetTriple)` were successfully reset: \(resetProperties.joined(separator: ", ")).
129129
"""
130130
)

Sources/SwiftSDKTool/Configuration/SetConfiguration.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct SetConfiguration: ConfigurationSubcommand {
1919
static let configuration = CommandConfiguration(
2020
commandName: "set",
2121
abstract: """
22-
Sets configuration options for installed cross-compilation destinations.
22+
Sets configuration options for installed Swift SDKs.
2323
"""
2424
)
2525

@@ -63,13 +63,13 @@ struct SetConfiguration: ConfigurationSubcommand {
6363

6464
@Argument(
6565
help: """
66-
An identifier of an already installed destination. Use the `list` subcommand to see all available \
66+
An identifier of an already installed Swift SDK. Use the `list` subcommand to see all available \
6767
identifiers.
6868
"""
6969
)
7070
var sdkID: String
7171

72-
@Argument(help: "The run-time triple of the destination to configure.")
72+
@Argument(help: "The target triple of the Swift SDK to configure.")
7373
var targetTriple: String
7474

7575
func run(
@@ -123,7 +123,7 @@ struct SetConfiguration: ConfigurationSubcommand {
123123
guard !updatedProperties.isEmpty else {
124124
observabilityScope.emit(
125125
error: """
126-
No properties of destination `\(sdkID) for run-time triple `\(targetTriple)` were updated \
126+
No properties of Swift SDK `\(sdkID)` for target triple `\(targetTriple)` were updated \
127127
since none were specified. Pass `--help` flag to see the list of all available properties.
128128
"""
129129
)
@@ -136,7 +136,7 @@ struct SetConfiguration: ConfigurationSubcommand {
136136

137137
observabilityScope.emit(
138138
info: """
139-
These properties of destination `\(sdkID) for run-time triple \
139+
These properties of Swift SDK `\(sdkID)` for target triple \
140140
`\(targetTriple)` were successfully updated: \(updatedProperties.joined(separator: ", ")).
141141
"""
142142
)

Sources/SwiftSDKTool/Configuration/ShowConfiguration.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct ShowConfiguration: ConfigurationSubcommand {
1919
static let configuration = CommandConfiguration(
2020
commandName: "show",
2121
abstract: """
22-
Prints all configuration properties currently applied to a given destination and run-time triple.
22+
Prints all configuration properties currently applied to a given Swift SDK and target triple.
2323
"""
2424
)
2525

@@ -28,13 +28,13 @@ struct ShowConfiguration: ConfigurationSubcommand {
2828

2929
@Argument(
3030
help: """
31-
An identifier of an already installed destination. Use the `list` subcommand to see all available \
31+
An identifier of an already installed Swift SDK. Use the `list` subcommand to see all available \
3232
identifiers.
3333
"""
3434
)
3535
var sdkID: String
3636

37-
@Argument(help: "The run-time triple of the destination to configure.")
37+
@Argument(help: "The target triple of the Swift SDK to configure.")
3838
var targetTriple: String
3939

4040
func run(

Sources/SwiftSDKTool/ListSwiftSDKs.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public struct ListSwiftSDKs: SwiftSDKSubcommand {
2121
commandName: "list",
2222
abstract:
2323
"""
24-
Print a list of IDs of available cross-compilation destinations available on the filesystem.
24+
Print a list of IDs of available Swift SDKs available on the filesystem.
2525
"""
2626
)
2727

@@ -42,7 +42,7 @@ public struct ListSwiftSDKs: SwiftSDKSubcommand {
4242
)
4343

4444
guard !validBundles.isEmpty else {
45-
print("No cross-compilation destinations are currently installed.")
45+
print("No Swift SDKs are currently installed.")
4646
return
4747
}
4848

Sources/SwiftSDKTool/SwiftSDKSubcommand.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extension SwiftSDKSubcommand {
4848
) else {
4949
let expectedPath = try fileSystem.swiftSDKsDirectory
5050
throw StringError(
51-
"Couldn't find or create a directory where cross-compilation destinations are stored: `\(expectedPath)`"
51+
"Couldn't find or create a directory where Swift SDKs are stored: `\(expectedPath)`"
5252
)
5353
}
5454

0 commit comments

Comments
 (0)