activate flags for timestamping; re-order dependencies for easier maintenance

This commit is contained in:
bunnie 2022-10-14 16:23:57 +08:00
parent d4e3f81756
commit e0a85ac1cd
2 changed files with 15 additions and 7 deletions

View file

@ -50,7 +50,11 @@ const TARGET_TRIPLE: &str = "riscv32imac-unknown-xous-elf";
fn main() -> Result<(), Box<dyn std::error::Error>> { fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut builder = Builder::new(); let mut builder = Builder::new();
// encodes a timestamp into the build, unless '--no-timestamp' is passed // 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 // A base set of packages. This is all you need for a normal
// operating system that can run libstd // operating system that can run libstd
@ -115,7 +119,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let base_pkgs_remote = [ let base_pkgs_remote = [
"xous-ticktimer@0.1.8", // "well known" service: thread scheduling "xous-ticktimer@0.1.8", // "well known" service: thread scheduling
"xous-log@0.1.6", // "well known" service: debug logging "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 "xous-susres@0.1.9", // ticktimer registers with susres to coordinate time continuity across sleeps
].to_vec(); ].to_vec();
let xous_kernel_remote = "xous-kernel@0.9.8"; let xous_kernel_remote = "xous-kernel@0.9.8";

View file

@ -9,17 +9,21 @@ use crate::DynError;
pub fn check_project_consistency() -> Result<(), DynError> { pub fn check_project_consistency() -> Result<(), DynError> {
let check_pkgs = [ 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-log@0.1.9",
"xous-api-names@0.9.10",
"xous-api-susres@0.9.7", "xous-api-susres@0.9.7",
"xous-api-ticktimer@0.9.7", "xous-api-ticktimer@0.9.7",
"xous-ticktimer@0.1.8",
"xous-log@0.1.6", "xous-log@0.1.6",
"xous-names@0.9.14", "xous-names@0.9.14",
"xous-susres@0.1.9", "xous-susres@0.1.9",
"xous-ipc@0.9.15", "xous-ticktimer@0.1.8",
"xous@0.9.15", // this set is only updated if the utralib changes
"xous-kernel@0.9.8", "utralib@0.1.3",
"svd2utra@0.1.1",
]; ];
for pkg in check_pkgs { for pkg in check_pkgs {
verify(pkg.into())?; verify(pkg.into())?;