cleanup version comparison code

this should be "clean" and working. yowch, this is really strict...
i may need to loosen this checking to make development sustainable.
This commit is contained in:
bunnie 2022-10-05 18:53:09 +08:00
parent 969f93b001
commit 5c0154f730
4 changed files with 159 additions and 140 deletions

227
Cargo.lock generated
View file

@ -31,7 +31,7 @@ dependencies = [
"cipher 0.4.3", "cipher 0.4.3",
"hex-literal", "hex-literal",
"log", "log",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
] ]
@ -65,7 +65,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"hex-literal", "hex-literal",
"log", "log",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
] ]
@ -175,11 +175,11 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"trng", "trng",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -532,12 +532,12 @@ dependencies = [
"rkyv", "rkyv",
"trng", "trng",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -553,12 +553,12 @@ dependencies = [
"trng", "trng",
"typenum", "typenum",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver", "xous-semver",
] ]
@ -611,7 +611,7 @@ dependencies = [
"graphics-server", "graphics-server",
"log", "log",
"rkyv", "rkyv",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names", "xous-api-names",
] ]
@ -1046,11 +1046,11 @@ dependencies = [
"rkyv", "rkyv",
"trng", "trng",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1168,12 +1168,12 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1285,7 +1285,7 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
@ -1503,12 +1503,12 @@ dependencies = [
"trng", "trng",
"tts-frontend", "tts-frontend",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1545,9 +1545,9 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1", "wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-test", "wasm-bindgen-test",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names", "xous-api-names",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1567,12 +1567,12 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1657,10 +1657,10 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"tts-frontend", "tts-frontend",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1794,11 +1794,11 @@ dependencies = [
"rkyv", "rkyv",
"tts-frontend", "tts-frontend",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1810,9 +1810,9 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names", "xous-api-names",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1825,11 +1825,11 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1844,11 +1844,11 @@ dependencies = [
"rkyv", "rkyv",
"tts-frontend", "tts-frontend",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1928,12 +1928,12 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1948,7 +1948,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"log", "log",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-ticktimer", "xous-api-ticktimer",
] ]
@ -1964,12 +1964,12 @@ dependencies = [
"rkyv", "rkyv",
"spinor", "spinor",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2020,7 +2020,7 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
@ -2038,12 +2038,12 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver", "xous-semver",
] ]
@ -2203,11 +2203,11 @@ dependencies = [
"trng", "trng",
"tts-frontend", "tts-frontend",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2243,12 +2243,12 @@ dependencies = [
"smoltcp", "smoltcp",
"trng", "trng",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver", "xous-semver",
] ]
@ -2515,12 +2515,12 @@ dependencies = [
"trng", "trng",
"tts-frontend", "tts-frontend",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"zeroize", "zeroize",
"zeroize_derive", "zeroize_derive",
] ]
@ -2548,7 +2548,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"log", "log",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2990,11 +2990,11 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"trng", "trng",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3033,8 +3033,8 @@ dependencies = [
"untrusted", "untrusted",
"web-sys", "web-sys",
"winapi", "winapi",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-names", "xous-names",
] ]
@ -3115,12 +3115,12 @@ dependencies = [
"tts-frontend", "tts-frontend",
"usb-device-xous", "usb-device-xous",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver", "xous-semver",
"zeroize", "zeroize",
] ]
@ -3384,12 +3384,12 @@ dependencies = [
"rkyv", "rkyv",
"trng", "trng",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3466,12 +3466,12 @@ dependencies = [
"utralib", "utralib",
"webpki-roots", "webpki-roots",
"x25519-dalek", "x25519-dalek",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3522,7 +3522,7 @@ dependencies = [
name = "spawn" name = "spawn"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3565,12 +3565,12 @@ dependencies = [
"rkyv", "rkyv",
"trng", "trng",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3629,12 +3629,12 @@ dependencies = [
"trng", "trng",
"usb-device-xous", "usb-device-xous",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver", "xous-semver",
] ]
@ -3738,7 +3738,7 @@ dependencies = [
name = "test-spawn" name = "test-spawn"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3935,12 +3935,12 @@ dependencies = [
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3953,11 +3953,11 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-tts-backend", "xous-tts-backend",
] ]
@ -4104,12 +4104,12 @@ dependencies = [
"usbd-human-interface-device 0.2.1", "usbd-human-interface-device 0.2.1",
"utralib", "utralib",
"vcell", "vcell",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver", "xous-semver",
] ]
@ -4129,7 +4129,7 @@ dependencies = [
"usbd-human-interface-device 0.1.1", "usbd-human-interface-device 0.1.1",
"utralib", "utralib",
"vcell", "vcell",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
@ -4231,12 +4231,12 @@ dependencies = [
"tts-frontend", "tts-frontend",
"usb-device-xous", "usb-device-xous",
"usbd-human-interface-device 0.2.1", "usbd-human-interface-device 0.2.1",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -4680,7 +4680,7 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
[[package]] [[package]]
name = "xous" name = "xous"
version = "0.9.10" version = "0.9.11"
dependencies = [ dependencies = [
"compiler_builtins", "compiler_builtins",
"lazy_static", "lazy_static",
@ -4688,91 +4688,100 @@ dependencies = [
] ]
[[package]] [[package]]
name = "xous-api-log" name = "xous"
version = "0.1.4" version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1906673de0ac875f4a675d1c35c443245306a7e739d09259d4491eeeaf0720e5" checksum = "b6ca693d460c5ec5efe9b02cf56b96c22277abb52596ea67ac9af74c817ba330"
dependencies = [
"lazy_static",
]
[[package]]
name = "xous-api-log"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f026ca542beb623c1fefc256d390953aa9cf23a28837a9ca8fa30b26ca0c6c78"
dependencies = [ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "xous-api-names" name = "xous-api-names"
version = "0.9.4" version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e730e6ea1194c451de0e89d12cf2d7c29b61b62485ebd852a8c1c98f488505f" checksum = "ab5d683effbb4ece518914e12801461a47f2e2f895441fdd47483db9b41e1316"
dependencies = [ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "xous-api-susres" name = "xous-api-susres"
version = "0.9.2" version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "207270ed75391d8459f558640a3ac131b1fcebe90681604080f88102bf7b6a21" checksum = "add95052c4fbd39a56b03562b3ddd2ddde45b611886057b9c34e51474386b7f9"
dependencies = [ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "xous-api-ticktimer" name = "xous-api-ticktimer"
version = "0.9.2" version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "decb26915616bdae3e185fec9f746917fc5c64825440cb91157ec7d98866e115" checksum = "096b374b82cc0cd6bebf36a973ef94981cb5de4c9a6321eb3602c4b95cd41f7d"
dependencies = [ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver", "xous-semver",
] ]
[[package]] [[package]]
name = "xous-ipc" name = "xous-ipc"
version = "0.9.10" version = "0.9.11"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"rkyv", "rkyv",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "xous-ipc" name = "xous-ipc"
version = "0.9.10" version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e3a3508fca228959bb458483b93603f4d308e38a7568f9911a243a4d03143df" checksum = "a6a2f17ff90b48467bcc10a7a4d8ab97657d565f7938b66174a672df9cf12d48"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"rkyv", "rkyv",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "xous-kernel" name = "xous-kernel"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"crossbeam-channel", "crossbeam-channel",
@ -4782,36 +4791,36 @@ dependencies = [
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"stats_alloc", "stats_alloc",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-riscv", "xous-riscv",
] ]
[[package]] [[package]]
name = "xous-log" name = "xous-log"
version = "0.1.1" version = "0.1.2"
dependencies = [ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "xous-names" name = "xous-names"
version = "0.9.9" version = "0.9.10"
dependencies = [ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -4832,35 +4841,35 @@ checksum = "6ed3278bb4e7be4895c1c597434e5269f7357ffb800ebc644f0398bb008a15ad"
[[package]] [[package]]
name = "xous-susres" name = "xous-susres"
version = "0.1.3" version = "0.1.4"
dependencies = [ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "xous-ticktimer" name = "xous-ticktimer"
version = "0.1.3" version = "0.1.4"
dependencies = [ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib", "utralib",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log", "xous-api-log",
"xous-api-names", "xous-api-names",
"xous-api-susres", "xous-api-susres",
"xous-api-ticktimer", "xous-api-ticktimer",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver", "xous-semver",
] ]
@ -4874,9 +4883,9 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"xous", "xous 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names", "xous-api-names",
"xous-ipc 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]

View file

@ -14,5 +14,5 @@ pub(crate) fn get_version() -> crate::api::VersionString {
v v
} }
#[allow(dead_code)] #[allow(dead_code)]
pub const TIMESTAMP: &'static str = "Wed, 05 Oct 2022 18:25:35 +0800"; pub const TIMESTAMP: &'static str = "Wed, 05 Oct 2022 18:52:53 +0800";
pub const SEMVER: &'static str = "v0.9.9-441-g113d4c2d"; pub const SEMVER: &'static str = "v0.9.9-443-g969f93b0";

View file

@ -87,12 +87,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// packages located on crates.io. For testing non-local build configs that are less // 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. // concerned about software supply chain and more focused on developer convenience.
let base_pkgs_remote = [ let base_pkgs_remote = [
"xous-ticktimer@0.1.3", // "well known" service: thread scheduling "xous-ticktimer@0.1.4", // "well known" service: thread scheduling
"xous-log@0.1.1", // "well known" service: debug logging "xous-log@0.1.2", // "well known" service: debug logging
"xous-names@0.9.9", // "well known" service: manage inter-server connection lookup "xous-names@0.9.10", // "well known" service: manage inter-server connection lookup
"xous-susres@0.1.3", // ticktimer registers with susres to coordinate time continuity across sleeps "xous-susres@0.1.4", // ticktimer registers with susres to coordinate time continuity across sleeps
].to_vec(); ].to_vec();
let xous_kernel_remote = "xous-kernel@0.9.3"; let xous_kernel_remote = "xous-kernel@0.9.4";
// ---- extract position independent args ---- // ---- extract position independent args ----
let lkey = get_flag("--lkey")?; let lkey = get_flag("--lkey")?;

View file

@ -9,16 +9,17 @@ 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.4", "xous-api-names@0.9.5",
"xous-api-log@0.1.4", "xous-api-log@0.1.5",
"xous-api-susres@0.9.2", "xous-api-susres@0.9.3",
"xous-api-ticktimer@0.9.2", "xous-api-ticktimer@0.9.3",
"xous-ticktimer@0.1.3", "xous-ticktimer@0.1.4",
"xous-log@0.1.1", "xous-log@0.1.2",
"xous-names@0.9.9", "xous-names@0.9.10",
"xous-susres@0.1.3", "xous-susres@0.1.4",
"xous-ipc@0.9.10", "xous-ipc@0.9.11",
"xous@0.9.10", "xous@0.9.11",
"xous-kernel@0.9.4",
]; ];
for pkg in check_pkgs { for pkg in check_pkgs {
verify(pkg.into())?; verify(pkg.into())?;
@ -61,13 +62,15 @@ pub fn verify(spec: CrateSpec) -> Result<(), DynError> {
}; };
let subdir = format!("./{}/{}/", subdir, name); let subdir = format!("./{}/{}/", subdir, name);
// handle special cases of xous kernel and ipc crates // handle special cases of xous kernel and ipc crates
let src_path = if name != "xous" && name != "xous-ipc" { let src_path = if name != "xous" && name != "xous-ipc" && name != "xous-kernel" {
Path::new(&subdir) Path::new(&subdir)
} else { } else {
if name == "xous" { if name == "xous" {
Path::new("./xous-rs") Path::new("./xous-rs")
} else if name == "xous-ipc" { } else if name == "xous-ipc" {
Path::new("./xous-ipc") Path::new("./xous-ipc")
} else if name == "xous-kernel" {
Path::new("./kernel")
} else { } else {
panic!("Consistency error: special case handling did not find either xous or xous-ipc"); panic!("Consistency error: special case handling did not find either xous or xous-ipc");
} }
@ -175,19 +178,26 @@ fn compare_dirs(src: &Path, other: &Path) -> Result<bool, DynError> {
*/ */
// things matched, go to the next file // things matched, go to the next file
continue; continue;
} } else {
let mut other_file = other.to_path_buf(); let mut other_file = other.to_path_buf();
other_file.push(&fname); other_file.push(&fname);
let mut src_file = src.to_path_buf(); let mut src_file = src.to_path_buf();
src_file.push(&fname); src_file.push(&fname);
// println!("comparing {} <-> {}", src_file.as_os_str().to_str().unwrap(), other_file.as_os_str().to_str().unwrap()); // println!("comparing {} <-> {}", src_file.as_os_str().to_str().unwrap(), other_file.as_os_str().to_str().unwrap());
match compare_files(&src_file, &other_file) { if src_file.as_os_str().to_str().unwrap().contains("ticktimer")
Ok(true) => {}, && fname.as_os_str().to_str().unwrap() == "version.rs" {
Ok(false) => { // don't compare the version.rs, as it's supposed to be different due to the timestamp
println!("DIFF FAIL: {} <-> {}", src_file.as_os_str().to_str().unwrap(), other_file.as_os_str().to_str().unwrap()); // println!("skipping ticktimer version.rs");
return Ok(false) } else {
}, match compare_files(&src_file, &other_file) {
Err(_) => return Err("Access error comparing remote and local crates".into()) Ok(true) => {},
Ok(false) => {
println!("DIFF FAIL: {} <-> {}", src_file.as_os_str().to_str().unwrap(), other_file.as_os_str().to_str().unwrap());
return Ok(false)
},
Err(_) => return Err("Access error comparing remote and local crates".into())
}
}
} }
} else if entry.file_type()?.is_dir() { } else if entry.file_type()?.is_dir() {
let dname = entry.file_name(); let dname = entry.file_name();