Skip to content

Commit 5fa6997

Browse files
authored
[5.9] Fix remaining mentions of "cross-compilation destinations" (#6922)
Cherry-pick of #6918. Not all of the help strings were updated to use "Swift SDK" instead of "cross-compilation destination" after SE-0387 was accepted. Risk: very low, only help strings are updated. rdar://115680101
1 parent 3208036 commit 5fa6997

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
@@ -21,8 +21,8 @@ struct ResetConfiguration: ConfigurationSubcommand {
2121
static let configuration = CommandConfiguration(
2222
commandName: "reset",
2323
abstract: """
24-
Resets configuration properties currently applied to a given destination and run-time triple. If no specific \
25-
property is specified, all of them are reset for the destination.
24+
Resets configuration properties currently applied to a given Swift SDK and target triple. If no specific \
25+
property is specified, all of them are reset for the Swift SDK.
2626
"""
2727
)
2828

@@ -49,13 +49,13 @@ struct ResetConfiguration: ConfigurationSubcommand {
4949

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

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

6161
func run(
@@ -109,12 +109,12 @@ struct ResetConfiguration: ConfigurationSubcommand {
109109
if shouldResetAll {
110110
if try !configurationStore.resetConfiguration(sdkID: sdkID, targetTriple: targetTriple) {
111111
observabilityScope.emit(
112-
warning: "No configuration for destination \(sdkID)"
112+
warning: "No configuration for Swift SDK `\(sdkID)`"
113113
)
114114
} else {
115115
observabilityScope.emit(
116116
info: """
117-
All configuration properties of destination `\(sdkID) for run-time triple \
117+
All configuration properties of Swift SDK `\(sdkID)` for target triple \
118118
`\(targetTriple)` were successfully reset.
119119
"""
120120
)
@@ -126,7 +126,7 @@ struct ResetConfiguration: ConfigurationSubcommand {
126126

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

Sources/SwiftSDKTool/Configuration/SetConfiguration.swift

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

@@ -65,13 +65,13 @@ struct SetConfiguration: ConfigurationSubcommand {
6565

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

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

7777
func run(
@@ -125,7 +125,7 @@ struct SetConfiguration: ConfigurationSubcommand {
125125
guard !updatedProperties.isEmpty else {
126126
observabilityScope.emit(
127127
error: """
128-
No properties of destination `\(sdkID) for run-time triple `\(targetTriple)` were updated \
128+
No properties of Swift SDK `\(sdkID)` for target triple `\(targetTriple)` were updated \
129129
since none were specified. Pass `--help` flag to see the list of all available properties.
130130
"""
131131
)
@@ -138,7 +138,7 @@ struct SetConfiguration: ConfigurationSubcommand {
138138

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

Sources/SwiftSDKTool/Configuration/ShowConfiguration.swift

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

@@ -30,13 +30,13 @@ struct ShowConfiguration: ConfigurationSubcommand {
3030

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

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

4242
func run(

Sources/SwiftSDKTool/ListSwiftSDKs.swift

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

@@ -44,7 +44,7 @@ public struct ListSwiftSDKs: SwiftSDKSubcommand {
4444
)
4545

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

Sources/SwiftSDKTool/SwiftSDKSubcommand.swift

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

0 commit comments

Comments
 (0)