stash

Author: J-ZhengLi

build.rs

@@ -2,7 +2,7 @@ use std::env;
 
 const TARGET_OVERRIDE_ENV: &str = "HOST_TRIPLE";
 const EDITION_OVERRIDE_ENV: &str = "EDITION";
-const DEFAULT_EDITION: &str = "community";
+const DEFAULT_EDITION: &str = "test";
 const FILES_TO_TRIGGER_REBUILD: &[&str] = &["locales/en.json", "locales/zh-CN.json"];
 
 fn main() {

configuration.toml

@@ -6,13 +6,11 @@ identifier = "xuanwu-rust"
 # For GUI
 home_page_url = 'https://xuanwu.beta.atomgit.com/'
 
+# Default download sources
 rustup_dist_server = 'https://xuanwu.base.atomgit.com'
 rustup_update_root = 'https://xuanwu.base.atomgit.com/rustup'
 rim_dist_server = 'https://rust-mirror.obs.cn-north-4.myhuaweicloud.com'
-
-[cargo]
-registry_name = 'xuanwu-sparse'
-registry_url = 'sparse+https://xuanwu.base.atomgit.com/index/'
+registry = { name = 'xuanwu-sparse', index = 'sparse+https://xuanwu.base.atomgit.com/index/' }
 
 [locale.en-US]
 logo_text = "XuanWu"
@@ -27,8 +25,3 @@ vendor = "Rust 中国社区"
 product = "Rust 中国社区发行版"
 app_name = "Rust 安装管理器"
 content_source = "内容来源：Rust 中国社区，Rust 原生社区，第三方开源社区"
-
-[override.bisheng]
-rustup_dist_server = 'https://rust-dist.obs.cn-north-4.myhuaweicloud.com/bisheng'
-rustup_update_root = 'https://xuanwu.base.atomgit.com/rustup'
-rim_dist_server = 'https://rust-mirror.obs.cn-north-4.myhuaweicloud.com'

locales/en-US.json

@@ -51,6 +51,7 @@
 	"downloading_latest_manager": "downloading the latest manager release (version '%{version}')...",
 	"downloading_rustup_init": "downloading rustup-init...",
 	"duplicated_config_files": "duplicated config file detected at these locations:\n1. %{first}\n2. %{second}\nconfiguration of the first one will be used",
+	"enforced_toolkit_config": "value of '%{key}' was enforced by the toolkit and cannot be changed",
 	"enter_choice_below": "please enter the index of your choice below",
 	"enter_path_or_url": "Enter Path or URL",
 	"executables": "executables",

locales/zh-CN.json

@@ -51,6 +51,7 @@
 	"downloading_latest_manager": "正在下载最新管理工具 (版本 '%{version}')...",
 	"downloading_rustup_init": "正在下载 rustup-init...",
 	"duplicated_config_files": "检查到以下重复配置文件:\n1. %{first}\n2. %{second}\n将读取第一个文件",
+	"enforced_toolkit_config": "'%{key}' 的值已由工具套件强制指定，无法被修改",
 	"enter_choice_below": "请在下方输入选项序号",
 	"enter_path_or_url": "输入路径或 URL",
 	"executables": "可执行文件",

resources/toolkit-manifest/offline/bisheng.toml

@@ -1,11 +1,17 @@
 
 # This file was automatically generated.
 # 此文件是自动生成的.
+rustup-dist-server = "https://rust-dist.obs.cn-north-4.myhuaweicloud.com/bisheng"
+rustup-update-root = "https://xuanwu.base.atomgit.com/rustup"
 name = "Rust 中国社区发行版 (毕昇)"
 version = "bisheng v1.72.0"
 edition = "bisheng"
 
-[rust]
+[cargo-registry]
+name = "xuanwu-sparse"
+index = "sparse+https://xuanwu.base.atomgit.com/index/"
+
+[toolchain]
 channel = "1.72.0"
 profile = "minimal"
 display-name = "Rust 官方工具"
@@ -15,7 +21,7 @@ optional-components = ["llvm-tools", "rust-analyzer"]
 group = "Rust 基础工具集"
 offline-dist-server = "toolchain"
 
-[rust.rustup]
+[toolchain.rustup]
 x86_64-unknown-linux-gnu = "tools/rustup-init"
 
 [tools.descriptions]

resources/toolkit-manifest/offline/community.toml

@@ -1,11 +1,17 @@
 
 # This file was automatically generated.
 # 此文件是自动生成的.
+rustup-dist-server = "https://xuanwu.base.atomgit.com/"
+rustup-update-root = "https://xuanwu.base.atomgit.com/rustup"
 name = "Rust 中国社区发行版"
 version = "stable v1.87.0"
 edition = "community"
 
-[rust]
+[cargo-registry]
+name = "xuanwu-sparse"
+index = "sparse+https://xuanwu.base.atomgit.com/index/"
+
+[toolchain]
 channel = "1.87.0"
 profile = "minimal"
 display-name = "Rust 官方工具"
@@ -15,7 +21,7 @@ optional-components = ["llvm-tools", "rust-docs", "rust-analyzer"]
 group = "Rust 基础工具集"
 offline-dist-server = "toolchain"
 
-[rust.rustup]
+[toolchain.rustup]
 aarch64-unknown-linux-gnu = "tools/rustup-init"
 x86_64-pc-windows-gnu = "tools/rustup-init.exe"
 x86_64-pc-windows-msvc = "tools/rustup-init.exe"

resources/toolkit-manifest/offline/test.toml

@@ -5,7 +5,7 @@ name = "Test-Only Toolkit"
 version = "stable v1.86.0"
 edition = "test"
 
-[rust]
+[toolchain]
 channel = "1.86.0"
 profile = "minimal"
 display-name = "Minimal"
@@ -15,7 +15,7 @@ optional-components = ["llvm-tools", "rust-docs"]
 group = "Rust"
 offline-dist-server = "toolchain"
 
-[rust.rustup]
+[toolchain.rustup]
 aarch64-unknown-linux-gnu = "tools/rustup-init"
 x86_64-pc-windows-gnu = "tools/rustup-init.exe"
 x86_64-pc-windows-msvc = "tools/rustup-init.exe"

resources/toolkit-manifest/online/bisheng.toml

@@ -1,11 +1,17 @@
 
 # This file was automatically generated.
 # 此文件是自动生成的.
+rustup-dist-server = "https://rust-dist.obs.cn-north-4.myhuaweicloud.com/bisheng"
+rustup-update-root = "https://xuanwu.base.atomgit.com/rustup"
 name = "Rust 中国社区发行版 (毕昇)"
 version = "bisheng v1.72.0"
 edition = "bisheng"
 
-[rust]
+[cargo-registry]
+name = "xuanwu-sparse"
+index = "sparse+https://xuanwu.base.atomgit.com/index/"
+
+[toolchain]
 channel = "1.72.0"
 profile = "minimal"
 display-name = "Rust 官方工具"
@@ -14,7 +20,7 @@ components = ["clippy", "rustfmt", "rust-src"]
 optional-components = ["llvm-tools", "rust-analyzer"]
 group = "Rust 基础工具集"
 
-[rust.rustup]
+[toolchain.rustup]
 
 [tools.descriptions]
 llvm-tools = "包含 LLVM 工具的集合"

resources/toolkit-manifest/online/community.toml

@@ -1,11 +1,17 @@
 
 # This file was automatically generated.
 # 此文件是自动生成的.
+rustup-dist-server = "https://xuanwu.base.atomgit.com/"
+rustup-update-root = "https://xuanwu.base.atomgit.com/rustup"
 name = "Rust 中国社区发行版"
 version = "stable v1.87.0"
 edition = "community"
 
-[rust]
+[cargo-registry]
+name = "xuanwu-sparse"
+index = "sparse+https://xuanwu.base.atomgit.com/index/"
+
+[toolchain]
 channel = "1.87.0"
 profile = "minimal"
 display-name = "Rust 官方工具"
@@ -14,7 +20,7 @@ components = ["clippy", "rustfmt", "rust-src"]
 optional-components = ["llvm-tools", "rust-docs", "rust-analyzer"]
 group = "Rust 基础工具集"
 
-[rust.rustup]
+[toolchain.rustup]
 
 [tools.descriptions]
 llvm-tools = "包含 LLVM 工具的集合"

resources/toolkit-manifest/online/test.toml

@@ -5,7 +5,7 @@ name = "Test-Only Toolkit"
 version = "stable v1.86.0"
 edition = "test"
 
-[rust]
+[toolchain]
 channel = "1.86.0"
 profile = "minimal"
 display-name = "Minimal"
@@ -14,7 +14,7 @@ components = ["clippy", "rustfmt", "rust-src"]
 optional-components = ["llvm-tools", "rust-docs"]
 group = "Rust"
 
-[rust.rustup]
+[toolchain.rustup]
 
 [tools.descriptions]
 clippy = "A collection of lints to catch common mistakes and improve your Rust code."