From e0a85ac1cdce3079087c6d05d9befe421a440c2a Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 14 Oct 2022 16:23:57 +0800 Subject: [PATCH] activate flags for timestamping; re-order dependencies for easier maintenance --- xtask/src/main.rs | 8 ++++++-- xtask/src/verifier.rs | 14 +++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index e3aaaeff0..55b87b3f3 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -50,7 +50,11 @@ const TARGET_TRIPLE: &str = "riscv32imac-unknown-xous-elf"; fn main() -> Result<(), Box> { let mut builder = Builder::new(); // encodes a timestamp into the build, unless '--no-timestamp' is passed - generate_version(env::args().filter(|x| x == "--no-timestamp").count() == 0); + let do_version = env::args().filter(|x| x == "--no-timestamp").count() == 0; + generate_version(do_version); + if do_version { + builder.add_feature("timestamp"); + }; // A base set of packages. This is all you need for a normal // operating system that can run libstd @@ -115,7 +119,7 @@ fn main() -> Result<(), Box> { let base_pkgs_remote = [ "xous-ticktimer@0.1.8", // "well known" service: thread scheduling "xous-log@0.1.6", // "well known" service: debug logging - "xous-names@0.9.14", // "well known" service: manage inter-server connection lookup + "xous-names@0.9.14", // "well known" service: manage inter-server connection lookup "xous-susres@0.1.9", // ticktimer registers with susres to coordinate time continuity across sleeps ].to_vec(); let xous_kernel_remote = "xous-kernel@0.9.8"; diff --git a/xtask/src/verifier.rs b/xtask/src/verifier.rs index 45d24ba21..15ad2fccd 100644 --- a/xtask/src/verifier.rs +++ b/xtask/src/verifier.rs @@ -9,17 +9,21 @@ use crate::DynError; pub fn check_project_consistency() -> Result<(), DynError> { let check_pkgs = [ - "xous-api-names@0.9.10", + // this set updates with kernel API changes + "xous@0.9.15", + "xous-kernel@0.9.8", + "xous-ipc@0.9.15", "xous-api-log@0.1.9", + "xous-api-names@0.9.10", "xous-api-susres@0.9.7", "xous-api-ticktimer@0.9.7", - "xous-ticktimer@0.1.8", "xous-log@0.1.6", "xous-names@0.9.14", "xous-susres@0.1.9", - "xous-ipc@0.9.15", - "xous@0.9.15", - "xous-kernel@0.9.8", + "xous-ticktimer@0.1.8", + // this set is only updated if the utralib changes + "utralib@0.1.3", + "svd2utra@0.1.1", ]; for pkg in check_pkgs { verify(pkg.into())?;