Support glob patterns in copy-to-archive (#2432)

...and ship all of the Cosmo sequencer register JSON files, just for fun

Author: mkeeter

Cargo.lock

@@ -82,6 +82,7 @@ fletcher = { version = "0.3", default-features = false }
 fnv = { version = "1.0.7", default-features = false }
 getrandom = { version = "0.2", default-features = false }
 goblin = { version = "0.4.3", default-features = true } # goblin::Object doesn't work without everything enabled
+glob = { version = "0.3.3", default-features = false }
 heapless = { version = "0.7.17", default-features = false }
 heck = { version = "0.5.0", default-features = false }
 hkdf = { version = "0.12", default-features = false }

Cargo.toml

@@ -202,16 +202,14 @@ max-sizes = {flash = 131072, ram = 16384 }
 stacksize = 2600
 start = true
 task-slots = ["sys", {spi = "spi2_driver"}, "auxflash"]
+copy-to-archive = ["register_defs"]
 
 [tasks.spartan7_loader.config]
 program_l = "sys_api::Port::B.pin(1)"
 init_l = "sys_api::Port::B.pin(6)"
 config_done = "sys_api::Port::B.pin(4)"
 user_reset_l = "sys_api::Port::A.pin(6)"
-
-[tasks.cosmo_seq.config]
-fpga_image = "cosmo-a.bin"
-register_defs = "cosmo-regs-a.json"
+register_defs = "cosmo-seq/*.json"
 
 [tasks.hash_driver]
 name = "drv-stm32h7-hash-server"

app/cosmo/base.toml

@@ -23,6 +23,7 @@ directories = { workspace = true }
 dunce = { workspace = true }
 filetime = { workspace = true }
 fnv = { workspace = true }
+glob = { workspace = true }
 goblin = { workspace = true }
 hex = "0.4"
 hubtools = { workspace = true }

build/xtask/Cargo.toml

@@ -955,14 +955,20 @@ fn build_archive(
                         let dir = pkg.manifest_path.parent().unwrap();
 
                         let f = dir.join(s);
-                        let task_dir = PathBuf::from("task").join(name).join(s);
-                        archive.copy(f, task_dir).with_context(|| {
-                            format!(
-                                "task {name}: failed to copy \"{s}\" in {} \
-                                into the archive",
-                                dir.display()
-                            )
-                        })?;
+                        let task_dir = PathBuf::from("task").join(name);
+                        for f in glob::glob(f.to_str().unwrap())? {
+                            let f = f?;
+                            let task_file = f.strip_prefix(dir)?;
+                            archive
+                                .copy(&f, task_dir.join(task_file))
+                                .with_context(|| {
+                                    format!(
+                                    "task {name}: failed to copy \"{s}\" in {} \
+                                    into the archive",
+                                    dir.display()
+                                )
+                                })?;
+                        }
                     }
                     Some(_) => {
                         bail!(