From 0a037822454c1027538075da1d6b5db35a9bc4a4 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 3 Oct 2022 03:37:50 +0800 Subject: [PATCH] bump remote targets in xtask --- Cargo.lock | 79 +++++++++++++++++++++++++++++------------------ Cargo.toml | 1 + xtask/src/main.rs | 2 +- 3 files changed, 51 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d205396c..27704851e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,8 +178,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -536,8 +536,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -557,9 +557,9 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-ticktimer", ] [[package]] @@ -1049,8 +1049,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -1172,8 +1172,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -1289,7 +1289,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", + "xous-api-ticktimer", ] [[package]] @@ -1507,8 +1507,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -1571,8 +1571,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -1797,8 +1797,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -1828,8 +1828,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -1847,8 +1847,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -1932,8 +1932,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -1950,7 +1950,7 @@ dependencies = [ "utralib", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ticktimer", + "xous-api-ticktimer", ] [[package]] @@ -1968,8 +1968,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -2023,7 +2023,7 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ticktimer", + "xous-api-ticktimer", ] [[package]] @@ -2042,9 +2042,9 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-ticktimer", ] [[package]] @@ -2206,8 +2206,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -2247,9 +2247,9 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-ticktimer", ] [[package]] @@ -2519,8 +2519,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", "zeroize", "zeroize_derive", ] @@ -2993,8 +2993,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -3119,9 +3119,9 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-ticktimer", "zeroize", ] @@ -3388,8 +3388,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -3470,8 +3470,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -3569,8 +3569,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -3633,9 +3633,9 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-ticktimer", ] [[package]] @@ -3939,8 +3939,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -3956,8 +3956,8 @@ dependencies = [ "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", "xous-tts-backend", ] @@ -4108,9 +4108,9 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-ticktimer", ] [[package]] @@ -4133,7 +4133,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", + "xous-api-ticktimer", ] [[package]] @@ -4235,8 +4235,8 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ticktimer", ] [[package]] @@ -4755,6 +4755,24 @@ dependencies = [ "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "xous-api-ticktimer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b30bc5d7f401a931ab1d08ec9973247d5c8f736f50d66d0f720c69f51eefa22" +dependencies = [ + "log", + "num-derive", + "num-traits", + "rkyv", + "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-log", + "xous-api-names", + "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-semver", +] + [[package]] name = "xous-ipc" version = "0.9.9" @@ -4864,6 +4882,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-ticktimer", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] diff --git a/Cargo.toml b/Cargo.toml index a2eee0093..64f0179ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,6 +100,7 @@ exclude = [ "api/log-server", "api/xous-names", "api/susres", + "api/ticktimer", ] [profile.release] diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 61f7fd0a4..4ce1ee26d 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -88,7 +88,7 @@ fn main() -> Result<(), Box> { // packages located on crates.io. For testing non-local build configs that are less // concerned about software supply chain and more focused on developer convenience. let base_pkgs_remote = [ - "xous-ticktimer", // "well known" service: thread scheduling + "xous-ticktimer@0.1.0", // "well known" service: thread scheduling "xous-log@0.1.0", // "well known" service: debug logging "xous-names@0.9.8", // "well known" service: manage inter-server connection lookup "xous-susres@0.1.0", // ticktimer registers with susres to coordinate time continuity across sleeps