Skip to content

Fix remaining mentions of "cross-compilation destinations" #6918

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 3 commits into from
Sep 19, 2023
Merged

Fix remaining mentions of "cross-compilation destinations" #6918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95644af
Update remaining mentions of "cross-compilation destinations" to "Swi…
MaxDesiatov Sep 18, 2023
aa9396b
Fix remaining help strings
MaxDesiatov Sep 18, 2023
10ada82
Fix "run-time triple" usage
MaxDesiatov Sep 18, 2023
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
2 changes: 1 addition & 1 deletion Sources/SwiftSDKTool/Configuration/ConfigureSwiftSDK.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public struct ConfigureSwiftSDK: ParsableCommand {
public static let configuration = CommandConfiguration(
commandName: "configuration",
abstract: """
Manages configuration options for installed cross-compilation destinations.
Manages configuration options for installed Swift SDKs.
""",
subcommands: [
ResetConfiguration.self,
Expand Down
14 changes: 7 additions & 7 deletions Sources/SwiftSDKTool/Configuration/ResetConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ struct ResetConfiguration: ConfigurationSubcommand {
static let configuration = CommandConfiguration(
commandName: "reset",
abstract: """
Resets configuration properties currently applied to a given destination and run-time triple. If no specific \
property is specified, all of them are reset for the destination.
Resets configuration properties currently applied to a given Swift SDK and target triple. If no specific \
property is specified, all of them are reset for the Swift SDK.
"""
)

Expand All @@ -47,13 +47,13 @@ struct ResetConfiguration: ConfigurationSubcommand {

@Argument(
help: """
An identifier of an already installed destination. Use the `list` subcommand to see all available \
An identifier of an already installed Swift SDK. Use the `list` subcommand to see all available \
identifiers.
"""
)
var sdkID: String

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

func run(
Expand Down Expand Up @@ -107,12 +107,12 @@ struct ResetConfiguration: ConfigurationSubcommand {
if shouldResetAll {
if try !configurationStore.resetConfiguration(sdkID: sdkID, targetTriple: targetTriple) {
observabilityScope.emit(
warning: "No configuration for destination \(sdkID)"
warning: "No configuration for Swift SDK `\(sdkID)`"
)
} else {
observabilityScope.emit(
info: """
All configuration properties of destination `\(sdkID) for run-time triple \
All configuration properties of Swift SDK `\(sdkID)` for target triple \
`\(targetTriple)` were successfully reset.
"""
)
Expand All @@ -124,7 +124,7 @@ struct ResetConfiguration: ConfigurationSubcommand {

observabilityScope.emit(
info: """
These properties of destination `\(sdkID) for run-time triple \
These properties of Swift SDK `\(sdkID)` for target triple \
`\(targetTriple)` were successfully reset: \(resetProperties.joined(separator: ", ")).
"""
)
Expand Down
10 changes: 5 additions & 5 deletions Sources/SwiftSDKTool/Configuration/SetConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct SetConfiguration: ConfigurationSubcommand {
static let configuration = CommandConfiguration(
commandName: "set",
abstract: """
Sets configuration options for installed cross-compilation destinations.
Sets configuration options for installed Swift SDKs.
"""
)

Expand Down Expand Up @@ -63,13 +63,13 @@ struct SetConfiguration: ConfigurationSubcommand {

@Argument(
help: """
An identifier of an already installed destination. Use the `list` subcommand to see all available \
An identifier of an already installed Swift SDK. Use the `list` subcommand to see all available \
identifiers.
"""
)
var sdkID: String

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

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

observabilityScope.emit(
info: """
These properties of destination `\(sdkID) for run-time triple \
These properties of Swift SDK `\(sdkID)` for target triple \
`\(targetTriple)` were successfully updated: \(updatedProperties.joined(separator: ", ")).
"""
)
Expand Down
6 changes: 3 additions & 3 deletions Sources/SwiftSDKTool/Configuration/ShowConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct ShowConfiguration: ConfigurationSubcommand {
static let configuration = CommandConfiguration(
commandName: "show",
abstract: """
Prints all configuration properties currently applied to a given destination and run-time triple.
Prints all configuration properties currently applied to a given Swift SDK and target triple.
"""
)

Expand All @@ -28,13 +28,13 @@ struct ShowConfiguration: ConfigurationSubcommand {

@Argument(
help: """
An identifier of an already installed destination. Use the `list` subcommand to see all available \
An identifier of an already installed Swift SDK. Use the `list` subcommand to see all available \
identifiers.
"""
)
var sdkID: String

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

func run(
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftSDKTool/ListSwiftSDKs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public struct ListSwiftSDKs: SwiftSDKSubcommand {
commandName: "list",
abstract:
"""
Print a list of IDs of available cross-compilation destinations available on the filesystem.
Print a list of IDs of available Swift SDKs available on the filesystem.
"""
)

Expand All @@ -42,7 +42,7 @@ public struct ListSwiftSDKs: SwiftSDKSubcommand {
)

guard !validBundles.isEmpty else {
print("No cross-compilation destinations are currently installed.")
print("No Swift SDKs are currently installed.")
return
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftSDKTool/SwiftSDKSubcommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extension SwiftSDKSubcommand {
) else {
let expectedPath = try fileSystem.swiftSDKsDirectory
throw StringError(
"Couldn't find or create a directory where cross-compilation destinations are stored: `\(expectedPath)`"
"Couldn't find or create a directory where Swift SDKs are stored: `\(expectedPath)`"
)
}

Expand Down