xtask: simplify lists

This commit is contained in:
eupn 2024-03-31 21:31:02 +04:00
parent 698cc497c9
commit 12ef383353
No known key found for this signature in database
GPG key ID: 6A550BE33BE768A9
3 changed files with 41 additions and 41 deletions

View file

@ -350,9 +350,9 @@ impl Builder {
} }
/// Add a list of services /// Add a list of services
pub fn add_services<'a>(&'a mut self, service_list: &Vec<String>) -> &'a mut Builder { pub fn add_services<S: AsRef<str>>(&mut self, service_list: impl IntoIterator<Item = S>) -> &mut Builder {
for service in service_list { for service in service_list {
self.services.push(service.as_str().into()); self.services.push(service.as_ref().into());
} }
self self
} }
@ -367,9 +367,9 @@ impl Builder {
} }
/// Add a list of apps. Apps can be remote or downloaded externally. /// Add a list of apps. Apps can be remote or downloaded externally.
pub fn add_apps<'a>(&'a mut self, app_list: &Vec<String>) -> &'a mut Builder { pub fn add_apps<S: AsRef<str>>(&mut self, app_list: impl IntoIterator<Item = S>) -> &mut Builder {
for app in app_list { for app in app_list {
self.apps.push(app.as_str().into()); self.apps.push(app.as_ref().into());
} }
self self
} }
@ -415,11 +415,11 @@ impl Builder {
fn builder( fn builder(
&self, &self,
packages: &Vec<CrateSpec>, packages: &Vec<CrateSpec>,
features: &Vec<String>, features: &[String],
target: &Option<&str>, target: &Option<&str>,
// the stream is specified separately here because the loader is special-case always release // the stream is specified separately here because the loader is special-case always release
stream: BuildStream, stream: BuildStream,
extra_args: &Vec<String>, extra_args: &[String],
no_default_features: bool, no_default_features: bool,
) -> Result<Vec<String>, DynError> { ) -> Result<Vec<String>, DynError> {
// list of build artifacts, as full paths specific to the host OS // list of build artifacts, as full paths specific to the host OS
@ -795,7 +795,7 @@ impl Builder {
if self.run_svd2repl { if self.run_svd2repl {
Command::new(cargo()) Command::new(cargo())
.current_dir(project_root()) .current_dir(project_root())
.args(&[ .args([
"run", "run",
"-p", "-p",
"svd2repl", "svd2repl",
@ -836,7 +836,7 @@ impl Builder {
loader_presign.push("loader_presign.bin"); loader_presign.push("loader_presign.bin");
let status = Command::new(cargo()) let status = Command::new(cargo())
.current_dir(project_root()) .current_dir(project_root())
.args(&[ .args([
"run", "run",
"--package", "--package",
"tools", "tools",
@ -853,7 +853,7 @@ impl Builder {
let status = Command::new(cargo()) let status = Command::new(cargo())
.current_dir(project_root()) .current_dir(project_root())
.args(&[ .args([
"run", "run",
"--package", "--package",
"tools", "tools",
@ -879,7 +879,7 @@ impl Builder {
let status = Command::new(cargo()) let status = Command::new(cargo())
.current_dir(project_root()) .current_dir(project_root())
.args(&[ .args([
"run", "run",
"--package", "--package",
"tools", "tools",

View file

@ -177,33 +177,33 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("renode-image") => { Some("renode-image") => {
builder builder
.target_renode() .target_renode()
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_apps(&get_cratespecs()); .add_apps(&get_cratespecs());
} }
Some("renode-image-debug") => { Some("renode-image-debug") => {
builder builder
.target_renode() .target_renode()
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.stream(BuildStream::Debug) .stream(BuildStream::Debug)
.add_apps(&get_cratespecs()); .add_apps(&get_cratespecs());
} }
Some("renode-test") => { Some("renode-test") => {
builder builder
.target_renode() .target_renode()
.add_services(&base_pkgs.into_iter().map(String::from).collect()) .add_services(&base_pkgs)
.add_services(&get_cratespecs()); .add_services(&get_cratespecs());
} }
Some("libstd-test") => { Some("libstd-test") => {
builder builder
.target_renode() .target_renode()
.add_services(&base_pkgs.into_iter().map(String::from).collect()) .add_services(&base_pkgs)
.add_services(&get_cratespecs()); .add_services(&get_cratespecs());
builder.add_loader_feature("renode-bypass"); builder.add_loader_feature("renode-bypass");
} }
Some("libstd-net") => { Some("libstd-net") => {
builder builder
.target_renode() .target_renode()
.add_services(&base_pkgs.into_iter().map(String::from).collect()) .add_services(&base_pkgs)
.add_services(&get_cratespecs()); .add_services(&get_cratespecs());
builder.add_loader_feature("renode-bypass").add_loader_feature("renode-minimal"); builder.add_loader_feature("renode-bypass").add_loader_feature("renode-minimal");
builder builder
@ -215,13 +215,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("renode-aes-test") => { Some("renode-aes-test") => {
builder builder
.target_renode() .target_renode()
.add_services(&aes_test_pkgs.into_iter().map(String::from).collect()) .add_services(&aes_test_pkgs)
.add_services(&get_cratespecs()); .add_services(&get_cratespecs());
} }
Some("ffi-test") => { Some("ffi-test") => {
builder builder
.target_renode() .target_renode()
.add_services(&gfx_base_pkgs.into_iter().map(String::from).collect()) .add_services(&gfx_base_pkgs)
.add_services(&get_cratespecs()); .add_services(&get_cratespecs());
builder.add_service("ffi-test", false); builder.add_service("ffi-test", false);
builder.add_loader_feature("renode-bypass"); builder.add_loader_feature("renode-bypass");
@ -231,7 +231,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("run") => { Some("run") => {
builder builder
.target_hosted() .target_hosted()
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_feature("pddbtest") .add_feature("pddbtest")
.add_feature("ditherpunk") .add_feature("ditherpunk")
.add_feature("tracking-alloc") .add_feature("tracking-alloc")
@ -242,14 +242,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("pddb-ci") => { Some("pddb-ci") => {
builder builder
.target_hosted() .target_hosted()
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_feature("pddb/ci") .add_feature("pddb/ci")
.add_feature("pddb/deterministic"); .add_feature("pddb/deterministic");
} }
Some("pddb-btest") => { Some("pddb-btest") => {
builder builder
.target_hosted() .target_hosted()
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_feature("pddbtest") .add_feature("pddbtest")
.add_feature("autobasis") // this will make secret basis tracking synthetic and automated for stress testing .add_feature("autobasis") // this will make secret basis tracking synthetic and automated for stress testing
.add_feature("autobasis-ci") .add_feature("autobasis-ci")
@ -258,7 +258,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("hosted-debug") => { Some("hosted-debug") => {
builder builder
.target_hosted() .target_hosted()
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_feature("pddbtest") .add_feature("pddbtest")
.add_feature("ditherpunk") .add_feature("ditherpunk")
.add_feature("tracking-alloc") .add_feature("tracking-alloc")
@ -269,14 +269,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("gfx-dev") => { Some("gfx-dev") => {
builder builder
.target_hosted() .target_hosted()
.add_services(&gfx_base_pkgs.into_iter().map(String::from).collect()) .add_services(&gfx_base_pkgs)
.add_services(&get_cratespecs()) .add_services(&get_cratespecs())
.add_feature("graphics-server/gfx-testing"); .add_feature("graphics-server/gfx-testing");
} }
Some("hosted-ci") => { Some("hosted-ci") => {
builder builder
.target_hosted() .target_hosted()
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.hosted_build_only() .hosted_build_only()
.add_apps(&get_cratespecs()); .add_apps(&get_cratespecs());
} }
@ -285,14 +285,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("app-image") => { Some("app-image") => {
builder builder
.target_precursor(PRECURSOR_SOC_VERSION) .target_precursor(PRECURSOR_SOC_VERSION)
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_feature("mass-storage") // add this in by default to help with testing .add_feature("mass-storage") // add this in by default to help with testing
.add_apps(&get_cratespecs()); .add_apps(&get_cratespecs());
} }
Some("app-image-xip") => { Some("app-image-xip") => {
builder builder
.target_precursor(PRECURSOR_SOC_VERSION) .target_precursor(PRECURSOR_SOC_VERSION)
//.add_services(&user_pkgs.into_iter().map(String::from).collect()) //.add_services(&user_pkgs)
.add_feature("mass-storage"); // add this in by default to help with testing .add_feature("mass-storage"); // add this in by default to help with testing
for service in user_pkgs { for service in user_pkgs {
if (service != "shellchat") && (service != "ime-plugin-shell" && (service != "net")) { if (service != "shellchat") && (service != "ime-plugin-shell" && (service != "net")) {
@ -322,7 +322,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// by the usb_update script. // by the usb_update script.
builder builder
.target_precursor("c809403-perflib") .target_precursor("c809403-perflib")
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_apps(&get_cratespecs()) .add_apps(&get_cratespecs())
.add_feature("perfcounter") .add_feature("perfcounter")
.add_kernel_feature("v2p"); .add_kernel_feature("v2p");
@ -350,7 +350,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
pkgs.push("ime-plugin-tts"); pkgs.push("ime-plugin-tts");
pkgs.retain(|&pkg| pkg != "ime-plugin-shell"); pkgs.retain(|&pkg| pkg != "ime-plugin-shell");
builder.add_services(&pkgs.into_iter().map(String::from).collect()) builder.add_services(&pkgs)
.add_apps(&get_cratespecs()) .add_apps(&get_cratespecs())
.add_service("espeak-embedded#https://ci.betrusted.io/job/espeak-embedded/lastSuccessfulBuild/artifact/target/riscv32imac-unknown-xous-elf/release/espeak-embedded", false) .add_service("espeak-embedded#https://ci.betrusted.io/job/espeak-embedded/lastSuccessfulBuild/artifact/target/riscv32imac-unknown-xous-elf/release/espeak-embedded", false)
.override_locale("en-tts") .override_locale("en-tts")
@ -360,13 +360,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("tiny") => { Some("tiny") => {
builder builder
.target_precursor(PRECURSOR_SOC_VERSION) .target_precursor(PRECURSOR_SOC_VERSION)
.add_services(&base_pkgs.into_iter().map(String::from).collect()) .add_services(&base_pkgs)
.add_services(&get_cratespecs()); .add_services(&get_cratespecs());
} }
Some("usbdev") => { Some("usbdev") => {
builder builder
.target_precursor(PRECURSOR_SOC_VERSION) .target_precursor(PRECURSOR_SOC_VERSION)
.add_services(&base_pkgs.into_iter().map(String::from).collect()) .add_services(&base_pkgs)
.add_services(&get_cratespecs()); .add_services(&get_cratespecs());
//builder.add_service("usb-test"); //builder.add_service("usb-test");
builder.add_service("usb-device-xous", false); builder.add_service("usb-device-xous", false);
@ -374,31 +374,31 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("pddb-dev") => { Some("pddb-dev") => {
builder builder
.target_precursor(PRECURSOR_SOC_VERSION) .target_precursor(PRECURSOR_SOC_VERSION)
.add_services(&pddb_dev_pkgs.into_iter().map(String::from).collect()) .add_services(&pddb_dev_pkgs)
.add_services(&get_cratespecs()); .add_services(&get_cratespecs());
} }
Some("trng-test") => { Some("trng-test") => {
builder builder
.target_precursor(PRECURSOR_SOC_VERSION) .target_precursor(PRECURSOR_SOC_VERSION)
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_feature("urandomtest"); .add_feature("urandomtest");
} }
Some("ro-test") => { Some("ro-test") => {
builder builder
.target_precursor(PRECURSOR_SOC_VERSION) .target_precursor(PRECURSOR_SOC_VERSION)
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_feature("ringosctest"); .add_feature("ringosctest");
} }
Some("av-test") => { Some("av-test") => {
builder builder
.target_precursor(PRECURSOR_SOC_VERSION) .target_precursor(PRECURSOR_SOC_VERSION)
.add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_services(&user_pkgs)
.add_feature("avalanchetest"); .add_feature("avalanchetest");
} }
Some("compile-apps") => { Some("compile-apps") => {
builder builder
.target_precursor_no_image(PRECURSOR_SOC_VERSION) .target_precursor_no_image(PRECURSOR_SOC_VERSION)
.add_services(&gfx_base_pkgs.into_iter().map(String::from).collect()); .add_services(&gfx_base_pkgs);
} }
// ------ Cramium hardware image configs ------ // ------ Cramium hardware image configs ------
@ -423,11 +423,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("arm-tiny") => { Some("arm-tiny") => {
builder builder
.target_arm() .target_arm()
.add_services(&vec![ .add_services([
"xous-log".to_string(), "xous-log",
"xous-ticktimer".to_string(), "xous-ticktimer",
"xous-names".to_string(), "xous-names",
"ticktimer-test-client".to_string(), "ticktimer-test-client",
]) ])
.add_kernel_feature("v2p") // required to use LCD DMA with lcd-console .add_kernel_feature("v2p") // required to use LCD DMA with lcd-console
.add_feature("atsama5d27") .add_feature("atsama5d27")

View file

@ -145,7 +145,7 @@ pub(crate) fn ensure_kernel_compiler(target: &Option<&str>, force_install: bool)
let rustup_command = Command::new("rustup") let rustup_command = Command::new("rustup")
.stderr(Stdio::null()) .stderr(Stdio::null())
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.args(&["target", "add", target]) .args(["target", "add", target])
.spawn() .spawn()
.map_err(|e| format!("could not run rustup: {}", e))?; .map_err(|e| format!("could not run rustup: {}", e))?;
@ -377,7 +377,7 @@ pub(crate) fn wycheproof_import() -> Result<(), crate::DynError> {
let output_file = "services/shellchat/src/cmds/x25519_test.bin"; let output_file = "services/shellchat/src/cmds/x25519_test.bin";
let status = Command::new(cargo()) let status = Command::new(cargo())
.current_dir(project_root()) .current_dir(project_root())
.args(&["run", "--package", "wycheproof-import", "--", input_file, output_file]) .args(["run", "--package", "wycheproof-import", "--", input_file, output_file])
.status()?; .status()?;
if !status.success() { if !status.success() {
return Err("wycheproof-import failed. If any, the output will not be usable.".into()); return Err("wycheproof-import failed. If any, the output will not be usable.".into());