Rename --linux-distribution* to just --distribution*, fixup README and typo in GeneratorError.unknownLinuxDistribution

Author: xtremekforever

README.md

@@ -132,7 +132,7 @@ platforms and environments, supply the `--target` flag with the full target trip
 The Linux distribution name and version can also be passed to change from the default of Ubuntu Jammy:
 
 ```bash
-swift run swift-sdk-generator make-linux-sdk --linux-distribution-name ubuntu --linux-distribution-version noble
+swift run swift-sdk-generator make-linux-sdk --distribution-name ubuntu --distribution-version 24.04
 ```
 
 ### Host Toolchain
@@ -144,13 +144,13 @@ and are likely not using the Swift OSS toolchain to build and run Swift projects
 is included by *default*. This default behavior can be changed by passing  `--no-host-toolchain`:
 
 ```bash
-swift run swift-sdk-generator make-linux-sdk --no-host-toolchain --target x86_64
+swift run swift-sdk-generator make-linux-sdk --no-host-toolchain --target-arch x86_64
 ```
 
 Or, if on Linux, and desiring to generate the Swift SDK with the host toolchain included, add `--host-toolchain`:
 
 ```bash
-swift run swift-sdk-generator make-linux-sdk --host-toolchain --target aarch64
+swift run swift-sdk-generator make-linux-sdk --host-toolchain --target-arch aarch64
 ```
 
 ## Building an SDK from a container image
@@ -162,10 +162,10 @@ Jammy image:
 ```
 swift run swift-sdk-generator make-linux-sdk --with-docker
 ```
-To build a RHEL images, use the `--linux-distribution-name` option.
+To build a RHEL images, use the `--distribution-name` option.
 The following command will build a `ubi9`-based image:
 ```
-swift run swift-sdk-generator make-linux-sdk --with-docker --linux-distribution-name rhel
+swift run swift-sdk-generator make-linux-sdk --with-docker --distribution-name rhel
 ```
 
 You can also specify the base container image by name:
@@ -175,7 +175,7 @@ swift run swift-sdk-generator make-linux-sdk --from-container-image swift:5.9-ja
 ```
 
 ```
-swift run swift-sdk-generator make-linux-sdk --with-docker --linux-distribution-name rhel --from-container-image swift:5.9-rhel-ubi9
+swift run swift-sdk-generator make-linux-sdk --with-docker --distribution-name rhel --from-container-image swift:5.9-rhel-ubi9
 ```
 
 ### Including extra Linux libraries

Sources/GeneratorCLI/GeneratorCLI.swift

@@ -214,16 +214,16 @@ extension GeneratorCLI {
         """,
       transform: LinuxDistribution.Name.init(nameString:)
     )
-    var linuxDistributionName = LinuxDistribution.Name.ubuntu
+    var distributionName = LinuxDistribution.Name.ubuntu
 
     @Option(
       help: """
         Version of the Linux distribution used as a target platform.
-        Available options for Ubuntu: `20.04`, `22.04` (default when `--linux-distribution-name` is `ubuntu`), `24.04`.
-        Available options for RHEL: `ubi9` (default when `--linux-distribution-name` is `rhel`).
+        Available options for Ubuntu: `20.04`, `22.04` (default when `--distribution-name` is `ubuntu`), `24.04`.
+        Available options for RHEL: `ubi9` (default when `--distribution-name` is `rhel`).
         """
     )
-    var linuxDistributionVersion: String?
+    var distributionVersion: String?
 
     func deriveTargetTriple(hostTriple: Triple) -> Triple {
       if let target = generatorOptions.target {
@@ -245,17 +245,17 @@ extension GeneratorCLI {
           "deprecated: Please explicitly specify the subcommand to run. For example: $ swift-sdk-generator make-linux-sdk"
         )
       }
-      let linuxDistributionDefaultVersion: String
-      switch self.linuxDistributionName {
+      let distributionDefaultVersion: String
+      switch self.distributionName {
       case .rhel:
-        linuxDistributionDefaultVersion = "ubi9"
+        distributionDefaultVersion = "ubi9"
       case .ubuntu:
-        linuxDistributionDefaultVersion = "22.04"
+        distributionDefaultVersion = "22.04"
       }
-      let linuxDistributionVersion =
-        self.linuxDistributionVersion ?? linuxDistributionDefaultVersion
+      let distributionVersion =
+        self.distributionVersion ?? distributionDefaultVersion
       let linuxDistribution = try LinuxDistribution(
-        name: linuxDistributionName, version: linuxDistributionVersion)
+        name: distributionName, version: distributionVersion)
       let hostTriple = try self.generatorOptions.deriveHostTriple()
       let targetTriple = self.deriveTargetTriple(hostTriple: hostTriple)
 

Sources/SwiftSDKGenerator/SystemUtils/GeneratorError.swift

@@ -40,7 +40,7 @@ extension GeneratorError: CustomStringConvertible {
       return "Process launched with \(commandInfo) failed with exit code \(exitCode)"
     case let .unknownLinuxDistribution(name, version):
       return
-        "Linux distribution `\(name)`\(version.map { " with version \($0)" } ?? "")` is not supported by this generator."
+        "Linux distribution `\(name)`\(version.map { " with version `\($0)`" } ?? "") is not supported by this generator."
     case let .unknownMacOSVersion(version):
       return "macOS version `\(version)` is not supported by this generator."
     case let .unknownCPUArchitecture(cpu):

Tests/SwiftSDKGeneratorTests/EndToEndTests.swift

@@ -138,7 +138,7 @@ final class RepeatedBuildTests: XCTestCase {
     do {
       try await Shell.run("docker ps")
       possibleArguments.append(
-        "--with-docker --linux-distribution-name rhel --linux-distribution-version ubi9")
+        "--with-docker --distribution-name rhel --distribution-version ubi9")
     } catch {
       self.logger.warning(
         "Docker CLI does not seem to be working, skipping tests that involve Docker.")
@@ -198,7 +198,7 @@ struct SDKConfiguration {
       "--swift-version \(swiftVersion)-RELEASE",
       testLinuxSwiftSDKs ? "--host \(hostArch!)-unknown-linux-gnu" : nil,
       "--target \(architecture)-unknown-linux-gnu",
-      "--linux-distribution-name \(linuxDistributionName)",
+      "--distribution-name \(linuxDistributionName)",
     ].compactMap { $0 }.joined(separator: " ")
   }
 }