Skip to content

Commit 56e4be3

Browse files
committed
update component selection layout & add component type display
1 parent 3000316 commit 56e4be3

27 files changed

+412
-97
lines changed

locales/en-US.json

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"what_this_is": "This program will guide you through installing the Rust programming language, with additional third party tools of your choice.",
4242
"custom_install_help": "Enter the value of each installation options, or just press 'Enter' key to use the default value.",
4343
"installation_path": "Installation path",
44-
"select_components_to_install": "Choose what components to install: (separated multiple options by spaces, required tools are automatically selected)",
44+
"select_components_to_install": "Select components to install",
45+
"select_components_cli_hint": "separated multiple options by spaces, required tools are automatically selected",
4546
"select_components_to_update": "Choose what components to update: (separated multiple options by spaces)",
4647
"select_components_to_remove": "Choose what components to remove: (separated multiple options by spaces)",
4748
"question_try_demo": "Do you want to try Rust with a demo project?",
@@ -121,9 +122,6 @@
121122
"package_source_missing_info": "One or more selected components require separated packages, you need to manually provide a path or link to install those.",
122123
"default_source_hint": "Note: If no input is provided and a default value exists, the default value will be used.",
123124
"question_package_source": "Enter the package source (path or url) for '%{tool}'",
124-
"install_default": "default",
125-
"install_everything": "everything",
126-
"install_custom": "customize",
127125

128126
"skip_ssl_check": "skip SSL certificate verification",
129127
"update_all": "Update all (including toolkit and toolkit manager)",
@@ -140,6 +138,7 @@
140138
"no_toolkit_installed": "no toolkit was installed",
141139
"no_component_installed": "no component was installed",
142140
"component": "component",
141+
"components": "Components",
143142
"toolkit": "toolkit",
144143
"list_option": "List component/toolkit",
145144
"all": "all",
@@ -180,5 +179,26 @@
180179
"minimal_desc": "Contains only the required components sufficient to run Rust compiler, no other tools such as IDE are included",
181180
"standard": "Standard",
182181
"standard_desc": "Contains recommanded components such as IDE or ruleset for code check etc, does not includes optional tools. Recommanded for regular users.",
183-
"customize_desc": "Choose any recommanded and optional components of your preference, suitable for exprienced users."
182+
"customize_desc": "Choose any recommanded and optional components of your preference, suitable for exprienced users.",
183+
"select_all": "Select all",
184+
"toolchain": "toolchain",
185+
"toolchain_component": "toolchain component",
186+
"toolchain_component_help": "part of Rust official toolchain, can also be managed by rustup using `rustup component` command.",
187+
"third_party_tool": "third-party tool",
188+
"bin_crate": "binary crate",
189+
"bin_crate_help": "binary crates are source code that can be compiled to executable binary, and can also be managed using `cargo` install or uninstall.",
190+
"dependency_crate": "dependency crate",
191+
"dependency_crate_help": "dependency crates are source code that used in your rust project, often used as project dependencies.\nNote: Installing dependency crates using this method has a downside, which causes 'unused-patch' warning on projects that doesn't use this specific dependency, so you don't need to install this unless you absolutely need it.",
192+
"standalone_tool": "standalone tool",
193+
"standalone_tool_help": "standalone tool has it's own `bin` directory, which contains a bunch of executables that will be automatically added to the PATH.",
194+
"executables": "executables",
195+
"executables_help": "contains executables that will be placed under `cargo/bin` directory.",
196+
"installer": "installer",
197+
"installer_help": "installation of this tool will start a separated installer process that might needs your input.",
198+
"plugin": "plugin",
199+
"plugin_help": "this is an add-on package for another program.",
200+
"ruleset": "ruleset",
201+
"ruleset_help": "contains customized rules that are used for linting.",
202+
"type": "Type",
203+
"type_desc": "Type description"
184204
}

locales/zh-CN.json

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"what_this_is": "该程序将指导您安装 Rust 编程语言以及其他可选的第三方工具。",
4040
"custom_install_help": "请根据提示输入安装选项,或直接按回车键使用默认的值。",
4141
"installation_path": "安装路径",
42-
"select_components_to_install": "请选择要安装的组件: (选择多个组件时请用空格键分隔;必要组件会自动添加,无需额外选择)",
42+
"select_components_to_install": "选择要安装的组件",
43+
"select_components_cli_hint": "选择多个组件时请用空格键分隔;必要组件会自动添加,无需额外选择",
4344
"select_components_to_update": "请选择要更新的组件: (选择多个组件时请用空格键分隔)",
4445
"select_components_to_remove": "请选择要卸载的组件: (选择多个组件时请用空格键分隔)",
4546
"question_try_demo": "是否要通过一个示例项目尝试 Rust 编程?",
@@ -117,9 +118,6 @@
117118
"package_source_missing_info": "一个或多个选定的组件需要额外配置安装包路径,您需要提供路径或链接来安装它们。",
118119
"default_source_hint": "注:如果未提供输入且存在默认值,则将使用默认值安装。",
119120
"question_package_source": "请输入 '%{tool}' 的安装包路径或链接",
120-
"install_default": "默认安装",
121-
"install_everything": "全量安装",
122-
"install_custom": "自定义组件选择",
123121

124122
"skip_ssl_check": "跳过 SSL 证书验证",
125123
"update_all": "全部更新 (包括套件及此管理工具)",
@@ -137,6 +135,7 @@
137135
"no_component_installed": "未安装任何组件",
138136
"list_option": "显示组件/套件列表",
139137
"component": "组件",
138+
"components": "组件",
140139
"toolkit": "套件",
141140
"all": "全部",
142141

@@ -176,5 +175,26 @@
176175
"minimal_desc": "仅包含运行 Rust 编译器所需的最基础组件,不包含集成开发环境等非必需工具",
177176
"standard": "标准版",
178177
"standard_desc": "包含推荐的开发工具套件(如 IDE 和代码检查规则),不含可选组件。推荐大多数用户使用。",
179-
"customize_desc": "自由选择所有推荐组件和可选组件,适合了解自己需求的高级用户"
178+
"customize_desc": "自由选择所有推荐组件和可选组件,适合了解自己需求的高级用户",
179+
"select_all": "全选",
180+
"toolchain": "工具链",
181+
"toolchain_component": "工具链组件",
182+
"toolchain_component_help": "Rust官方工具链的组成部分,也可以通过使用`rustup component`命令进行管理。",
183+
"third_party_tool": "第三方工具",
184+
"bin_crate": "二进制crate",
185+
"bin_crate_help": "二进制crate是可以编译成可执行二进制文件的源代码,也可以通过`cargo` install或uninstall进行管理。",
186+
"dependency_crate": "依赖crate",
187+
"dependency_crate_help": "依赖crate是在您的Rust项目中使用的源代码,通常作为项目依赖项使用。\n注意:使用此方法安装依赖crate有一个缺点,会导致未使用此特定依赖的项目出现'unused-patch'警告,因此除非绝对需要,否则无需安装。",
188+
"standalone_tool": "独立工具",
189+
"standalone_tool_help": "独立工具拥有自己的`bin`目录,其中包含一系列可执行文件,这些文件将自动添加到PATH环境变量中。",
190+
"executables": "可执行文件",
191+
"executables_help": "包含将被放置在`cargo/bin`目录下的可执行文件。",
192+
"installer": "安装程序",
193+
"installer_help": "此工具的安装将启动一个单独的安装程序进程,可能需要您的输入。",
194+
"plugin": "插件",
195+
"plugin_help": "这是另一个程序的附加组件。",
196+
"ruleset": "规则集",
197+
"ruleset_help": "包含用于代码检查的自定义规则。",
198+
"type": "类型",
199+
"type_desc": "类型说明"
180200
}

resources/toolkit-manifest/offline/basic.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ Prerequisites = ["mingw64"]
3434
required = true
3535
version = "14.2.0-rt_v12-rev0"
3636
path = "tools/x86_64-14.2.0-release-posix-seh-ucrt-rt_v12-rev0.7z"
37+
kind = "dir-with-bin"

resources/toolkit-manifest/offline/bisheng.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,22 @@ IDE = ["vscode", "vscodium", "codearts-rust", "vscode-rust-analyzer"]
4949
gui-only = true
5050
version = "1.99.32562"
5151
path = "tools/VSCodium-linux-x64-1.99.32562.tar.gz"
52+
kind = "custom"
5253
display-name = "VSCodium"
5354

5455
[tools.target.x86_64-unknown-linux-gnu.vscode-rust-analyzer]
5556
gui-only = true
5657
version = "0.3.2379"
5758
path = "tools/rust-analyzer-linux-x64.vsix"
59+
kind = "plugin"
5860
display-name = "rust-analyzer (插件)"
5961
requires = ["vscodium"]
6062

6163
[tools.target.x86_64-unknown-linux-gnu.cargo-nextest]
6264
optional = true
6365
version = "0.9.94"
6466
path = "tools/cargo-nextest-0.9.94-x86_64-unknown-linux-gnu.tar.gz"
67+
kind = "executables"
6568

6669
[tools.target.x86_64-unknown-linux-gnu.coding-guidelines-ruleset]
6770
version = "0.1.0"

resources/toolkit-manifest/offline/community.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,20 @@ IDE = ["vscode", "vscodium", "codearts-rust", "vscode-rust-analyzer"]
5757
required = true
5858
version = "14.2.0-rt_v12-rev2"
5959
path = "tools/x86_64-14.2.0-release-posix-seh-ucrt-rt_v12-rev2.7z"
60+
kind = "dir-with-bin"
6061
display-name = "MinGW-w64"
6162

6263
[tools.target.x86_64-pc-windows-gnu.codearts-rust]
6364
version = "3.2.0"
6465
path = "tools/codearts-rust.zip"
66+
kind = "custom"
6567
display-name = "CodeArts IDE"
6668

6769
[tools.target.x86_64-pc-windows-gnu.cargo-nextest]
6870
optional = true
6971
version = "0.9.94"
7072
path = "tools/cargo-nextest-0.9.94-x86_64-pc-windows-msvc.zip"
73+
kind = "executables"
7174

7275
[tools.target.x86_64-pc-windows-gnu.coding-guidelines-ruleset]
7376
version = "0.1.0"
@@ -110,17 +113,20 @@ kind = "crate"
110113
required = true
111114
restricted = true
112115
default = "https://aka.ms/vs/17/release/vs_BuildTools.exe"
116+
kind = "custom"
113117
display-name = "Visual Studio Build Tools"
114118

115119
[tools.target.x86_64-pc-windows-msvc.codearts-rust]
116120
version = "3.2.0"
117121
path = "tools/codearts-rust.zip"
122+
kind = "custom"
118123
display-name = "CodeArts IDE"
119124

120125
[tools.target.x86_64-pc-windows-msvc.cargo-nextest]
121126
optional = true
122127
version = "0.9.94"
123128
path = "tools/cargo-nextest-0.9.94-x86_64-pc-windows-msvc.zip"
129+
kind = "executables"
124130

125131
[tools.target.x86_64-pc-windows-msvc.coding-guidelines-ruleset]
126132
version = "0.1.0"
@@ -163,19 +169,22 @@ kind = "crate"
163169
gui-only = true
164170
version = "1.99.32562"
165171
path = "tools/VSCodium-linux-x64-1.99.32562.tar.gz"
172+
kind = "custom"
166173
display-name = "VSCodium"
167174

168175
[tools.target.x86_64-unknown-linux-gnu.vscode-rust-analyzer]
169176
gui-only = true
170177
version = "0.3.2379"
171178
path = "tools/rust-analyzer-linux-x64.vsix"
179+
kind = "plugin"
172180
display-name = "rust-analyzer (插件)"
173181
requires = ["vscodium"]
174182

175183
[tools.target.x86_64-unknown-linux-gnu.cargo-nextest]
176184
optional = true
177185
version = "0.9.94"
178186
path = "tools/cargo-nextest-0.9.94-x86_64-unknown-linux-gnu.tar.gz"
187+
kind = "executables"
179188

180189
[tools.target.x86_64-unknown-linux-gnu.coding-guidelines-ruleset]
181190
version = "0.1.0"
@@ -218,19 +227,22 @@ kind = "crate"
218227
gui-only = true
219228
version = "1.99.32562"
220229
path = "tools/VSCodium-linux-arm64-1.99.32562.tar.gz"
230+
kind = "custom"
221231
display-name = "VSCodium"
222232

223233
[tools.target.aarch64-unknown-linux-gnu.vscode-rust-analyzer]
224234
gui-only = true
225235
version = "0.3.2379"
226236
path = "tools/rust-analyzer-linux-arm64.vsix"
237+
kind = "plugin"
227238
display-name = "rust-analyzer (插件)"
228239
requires = ["vscodium"]
229240

230241
[tools.target.aarch64-unknown-linux-gnu.cargo-nextest]
231242
optional = true
232243
version = "0.9.94"
233244
path = "tools/cargo-nextest-0.9.94-aarch64-unknown-linux-gnu.tar.gz"
245+
kind = "executables"
234246

235247
[tools.target.aarch64-unknown-linux-gnu.coding-guidelines-ruleset]
236248
version = "0.1.0"

resources/toolkit-manifest/online/basic.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ Prerequisites = ["mingw64"]
2929
required = true
3030
version = "14.2.0-rt_v12-rev0"
3131
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/x86_64-14.2.0-release-posix-seh-ucrt-rt_v12-rev0.7z"
32+
kind = "dir-with-bin"

resources/toolkit-manifest/online/bisheng.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,22 @@ IDE = ["vscode", "vscodium", "codearts-rust", "vscode-rust-analyzer"]
4747
gui-only = true
4848
version = "1.99.32562"
4949
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/1.99.32562/VSCodium-linux-x64-1.99.32562.tar.gz"
50+
kind = "custom"
5051
display-name = "VSCodium"
5152

5253
[tools.target.x86_64-unknown-linux-gnu.vscode-rust-analyzer]
5354
gui-only = true
5455
version = "0.3.2379"
5556
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2379/rust-analyzer-linux-x64.vsix"
57+
kind = "plugin"
5658
display-name = "rust-analyzer (插件)"
5759
requires = ["vscodium"]
5860

5961
[tools.target.x86_64-unknown-linux-gnu.cargo-nextest]
6062
optional = true
6163
version = "0.9.94"
6264
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/0.9.94/cargo-nextest-0.9.94-x86_64-unknown-linux-gnu.tar.gz"
65+
kind = "executables"
6366

6467
[tools.target.x86_64-unknown-linux-gnu.coding-guidelines-ruleset]
6568
version = "0.1.0"

resources/toolkit-manifest/online/community.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,20 @@ IDE = ["vscode", "vscodium", "codearts-rust", "vscode-rust-analyzer"]
5252
required = true
5353
version = "14.2.0-rt_v12-rev2"
5454
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/mingw64/14.2.0-rt_v12-rev2/x86_64-14.2.0-release-posix-seh-ucrt-rt_v12-rev2.7z"
55+
kind = "dir-with-bin"
5556
display-name = "MinGW-w64"
5657

5758
[tools.target.x86_64-pc-windows-gnu.codearts-rust]
5859
version = "3.2.0"
5960
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codearts/3.2.0/codearts-rust.zip"
61+
kind = "custom"
6062
display-name = "CodeArts IDE"
6163

6264
[tools.target.x86_64-pc-windows-gnu.cargo-nextest]
6365
optional = true
6466
version = "0.9.94"
6567
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/0.9.94/cargo-nextest-0.9.94-x86_64-pc-windows-msvc.zip"
68+
kind = "executables"
6669

6770
[tools.target.x86_64-pc-windows-gnu.coding-guidelines-ruleset]
6871
version = "0.1.0"
@@ -105,17 +108,20 @@ kind = "crate"
105108
required = true
106109
restricted = true
107110
default = "https://aka.ms/vs/17/release/vs_BuildTools.exe"
111+
kind = "custom"
108112
display-name = "Visual Studio Build Tools"
109113

110114
[tools.target.x86_64-pc-windows-msvc.codearts-rust]
111115
version = "3.2.0"
112116
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codearts/3.2.0/codearts-rust.zip"
117+
kind = "custom"
113118
display-name = "CodeArts IDE"
114119

115120
[tools.target.x86_64-pc-windows-msvc.cargo-nextest]
116121
optional = true
117122
version = "0.9.94"
118123
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/0.9.94/cargo-nextest-0.9.94-x86_64-pc-windows-msvc.zip"
124+
kind = "executables"
119125

120126
[tools.target.x86_64-pc-windows-msvc.coding-guidelines-ruleset]
121127
version = "0.1.0"
@@ -158,19 +164,22 @@ kind = "crate"
158164
gui-only = true
159165
version = "1.99.32562"
160166
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/1.99.32562/VSCodium-linux-x64-1.99.32562.tar.gz"
167+
kind = "custom"
161168
display-name = "VSCodium"
162169

163170
[tools.target.x86_64-unknown-linux-gnu.vscode-rust-analyzer]
164171
gui-only = true
165172
version = "0.3.2379"
166173
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2379/rust-analyzer-linux-x64.vsix"
174+
kind = "plugin"
167175
display-name = "rust-analyzer (插件)"
168176
requires = ["vscodium"]
169177

170178
[tools.target.x86_64-unknown-linux-gnu.cargo-nextest]
171179
optional = true
172180
version = "0.9.94"
173181
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/0.9.94/cargo-nextest-0.9.94-x86_64-unknown-linux-gnu.tar.gz"
182+
kind = "executables"
174183

175184
[tools.target.x86_64-unknown-linux-gnu.coding-guidelines-ruleset]
176185
version = "0.1.0"
@@ -213,19 +222,22 @@ kind = "crate"
213222
gui-only = true
214223
version = "1.99.32562"
215224
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/codium/1.99.32562/VSCodium-linux-arm64-1.99.32562.tar.gz"
225+
kind = "custom"
216226
display-name = "VSCodium"
217227

218228
[tools.target.aarch64-unknown-linux-gnu.vscode-rust-analyzer]
219229
gui-only = true
220230
version = "0.3.2379"
221231
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/rust-analyzer/0.3.2379/rust-analyzer-linux-arm64.vsix"
232+
kind = "plugin"
222233
display-name = "rust-analyzer (插件)"
223234
requires = ["vscodium"]
224235

225236
[tools.target.aarch64-unknown-linux-gnu.cargo-nextest]
226237
optional = true
227238
version = "0.9.94"
228239
url = "https://rust-mirror.obs.cn-north-4.myhuaweicloud.com/dist/toolset/cargo-nextest/0.9.94/cargo-nextest-0.9.94-aarch64-unknown-linux-gnu.tar.gz"
240+
kind = "executables"
229241

230242
[tools.target.aarch64-unknown-linux-gnu.coding-guidelines-ruleset]
231243
version = "0.1.0"

0 commit comments

Comments
 (0)