From 6b25d546487233833a7f675a1f6f9ecf0e2bb6da Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 28 Apr 2024 10:16:01 +0000 Subject: [PATCH 1/2] Reflect the current state of the implementation of SE-0387 The current (swift-DEVELOPMENT-SNAPSHOT-2024-04-27-a) SwiftPM implements the `swift sdk configure` as `swift sdk configuration` and the `--show-configuration` and `--reset` options as `show` and `reset` subcommands. --- proposals/0387-cross-compilation-destinations.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proposals/0387-cross-compilation-destinations.md b/proposals/0387-cross-compilation-destinations.md index c93ca111de..1608ab6364 100644 --- a/proposals/0387-cross-compilation-destinations.md +++ b/proposals/0387-cross-compilation-destinations.md @@ -379,7 +379,7 @@ Here's `swift-sdk.json` file for the `ubuntu_jammy` artifact previously introduc Since not all platforms can support self-contained Swift SDK bundles, users will be able to provide their own additional paths on the filesystem outside of bundles after a Swift SDK is installed. The exact options for specifying -paths are proposed in a subsequent section for a newly introduced `swift sdk configure` command. +paths are proposed in a subsequent section for a newly introduced `swift sdk configuration` command. ### Swift SDK Installation and Configuration @@ -397,12 +397,12 @@ To manage Swift SDKs, we'd like to introduce a new `swift sdk` command with thre `install` subcommand with `--update` flag to allow updating an already installed Swift SDK artifact to a new version. - `swift sdk list`, which prints a list of already installed Swift SDKs with their identifiers. -- `swift sdk configure `, which allows users to provide additional search paths and toolsets to be +- `swift sdk configuration set `, which allows users to provide additional search paths and toolsets to be used subsequently when building with a given Swift SDK. Specifically, multiple `--swift-resources-path`, `--include-search-path`, `--library-search-path`, and `--toolset` options with corresponding paths can be provided, which then will be stored as configuration for this Swift SDK. -`swift sdk configure --show-configuration` will print currently set paths, while -`swift sdk configure --reset` will reset all of those at once. +`swift sdk configuration show ` will print currently set paths, while +`swift sdk configuretion reset ` will reset all of those at once. - `swift sdk remove ` will remove a given Swift SDK from the filesystem. ### Using a Swift SDK From e95ab17386d4cd65d29aaeceb2db8ef353d4340e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 28 Apr 2024 10:19:53 +0000 Subject: [PATCH 2/2] Amend SE-0387 with the consistent command line interface This commit amends a part of SE-0387, `swift sdk configuration` command, to be consistent with `swift package config` command. --- proposals/0387-cross-compilation-destinations.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proposals/0387-cross-compilation-destinations.md b/proposals/0387-cross-compilation-destinations.md index 1608ab6364..c77955d5ac 100644 --- a/proposals/0387-cross-compilation-destinations.md +++ b/proposals/0387-cross-compilation-destinations.md @@ -379,7 +379,7 @@ Here's `swift-sdk.json` file for the `ubuntu_jammy` artifact previously introduc Since not all platforms can support self-contained Swift SDK bundles, users will be able to provide their own additional paths on the filesystem outside of bundles after a Swift SDK is installed. The exact options for specifying -paths are proposed in a subsequent section for a newly introduced `swift sdk configuration` command. +paths are proposed in a subsequent section for a newly introduced `swift sdk config` command. ### Swift SDK Installation and Configuration @@ -397,12 +397,12 @@ To manage Swift SDKs, we'd like to introduce a new `swift sdk` command with thre `install` subcommand with `--update` flag to allow updating an already installed Swift SDK artifact to a new version. - `swift sdk list`, which prints a list of already installed Swift SDKs with their identifiers. -- `swift sdk configuration set `, which allows users to provide additional search paths and toolsets to be +- `swift sdk config set `, which allows users to provide additional search paths and toolsets to be used subsequently when building with a given Swift SDK. Specifically, multiple `--swift-resources-path`, `--include-search-path`, `--library-search-path`, and `--toolset` options with corresponding paths can be provided, which then will be stored as configuration for this Swift SDK. -`swift sdk configuration show ` will print currently set paths, while -`swift sdk configuretion reset ` will reset all of those at once. +`swift sdk config show ` will print currently set paths, while +`swift sdk config reset ` will reset all of those at once. - `swift sdk remove ` will remove a given Swift SDK from the filesystem. ### Using a Swift SDK