From 82c9915ad6ea1502a8befd9b379646ca82b8a2e1 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 17 Aug 2020 19:41:50 +0800 Subject: [PATCH] examples: append `-server` to server names This keeps server names such as "log" and "graphics" as unambiguous. Signed-off-by: Sean Cross --- Cargo.lock | 28 +++++++++++-------- Cargo.toml | 11 ++++++-- .../{graphics => graphics-server}/Cargo.toml | 2 +- .../src/backend/minifb.rs | 0 .../src/backend/mod.rs | 5 ++++ .../{graphics => graphics-server}/src/main.rs | 0 examples/log-server/.cargo/config | 13 +++++++++ .../{log => log-server}/.vscode/settings.json | 0 examples/{log => log-server}/Cargo.toml | 2 +- examples/{log => log-server}/README.md | 0 examples/{log => log-server}/build.rs | 0 examples/{log => log-server}/src/debug.rs | 0 .../{log => log-server}/src/log_string.rs | 0 examples/{log => log-server}/src/main.rs | 0 examples/{log => log-server}/src/start.rs | 0 examples/{log => log-server}/src/timer.rs | 0 examples/log/.cargo/config | 13 --------- 17 files changed, 44 insertions(+), 30 deletions(-) rename examples/{graphics => graphics-server}/Cargo.toml (91%) rename examples/{graphics => graphics-server}/src/backend/minifb.rs (100%) rename examples/{graphics => graphics-server}/src/backend/mod.rs (50%) rename examples/{graphics => graphics-server}/src/main.rs (100%) create mode 100644 examples/log-server/.cargo/config rename examples/{log => log-server}/.vscode/settings.json (100%) rename examples/{log => log-server}/Cargo.toml (92%) rename examples/{log => log-server}/README.md (100%) rename examples/{log => log-server}/build.rs (100%) rename examples/{log => log-server}/src/debug.rs (100%) rename examples/{log => log-server}/src/log_string.rs (100%) rename examples/{log => log-server}/src/main.rs (100%) rename examples/{log => log-server}/src/start.rs (100%) rename examples/{log => log-server}/src/timer.rs (100%) delete mode 100644 examples/log/.cargo/config diff --git a/Cargo.lock b/Cargo.lock index 983bc1bc3..3e972cfd3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -270,7 +270,7 @@ checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ "atty", "humantime", - "log 0.4.11", + "log", "regex", "termcolor", ] @@ -317,7 +317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" [[package]] -name = "graphics" +name = "graphics-server" version = "0.1.0" dependencies = [ "embedded-graphics", @@ -405,14 +405,6 @@ dependencies = [ "rand 0.7.3", ] -[[package]] -name = "log" -version = "0.1.0" -dependencies = [ - "pancurses", - "xous", -] - [[package]] name = "log" version = "0.4.11" @@ -422,6 +414,14 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "log-server" +version = "0.1.0" +dependencies = [ + "pancurses", + "xous", +] + [[package]] name = "maybe-uninit" version = "2.0.0" @@ -563,7 +563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3058bc37c433096b2ac7afef1c5cdfae49ede0a4ffec3dfc1df1df0959d0ff0" dependencies = [ "libc", - "log 0.4.11", + "log", "ncurses", "pdcurses-sys", "winreg", @@ -1014,7 +1014,7 @@ dependencies = [ "crc", "csv", "env_logger", - "log 0.4.11", + "log", "xmas-elf", ] @@ -1242,6 +1242,10 @@ dependencies = [ "syn", ] +[[package]] +name = "xtask" +version = "0.1.0" + [[package]] name = "zero" version = "0.1.2" diff --git a/Cargo.toml b/Cargo.toml index 502e7c371..b8260a089 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,10 +6,15 @@ members = [ "xous-rs", "macros", "examples/shell", - "examples/graphics", - "examples/log", + "examples/graphics-server", + "examples/log-server", + "xtask", +] +default-members = [ + "examples/shell", + "examples/log-server", + "examples/graphics-server", ] -default-members = ["examples/shell", "examples/log", "examples/graphics"] [profile.release] codegen-units = 1 # 1 better optimizations diff --git a/examples/graphics/Cargo.toml b/examples/graphics-server/Cargo.toml similarity index 91% rename from examples/graphics/Cargo.toml rename to examples/graphics-server/Cargo.toml index c49956da7..8a33fcbe8 100644 --- a/examples/graphics/Cargo.toml +++ b/examples/graphics-server/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "graphics" +name = "graphics-server" version = "0.1.0" authors = ["Sean Cross "] edition = "2018" diff --git a/examples/graphics/src/backend/minifb.rs b/examples/graphics-server/src/backend/minifb.rs similarity index 100% rename from examples/graphics/src/backend/minifb.rs rename to examples/graphics-server/src/backend/minifb.rs diff --git a/examples/graphics/src/backend/mod.rs b/examples/graphics-server/src/backend/mod.rs similarity index 50% rename from examples/graphics/src/backend/mod.rs rename to examples/graphics-server/src/backend/mod.rs index afb23a4d4..7b85ab2b8 100644 --- a/examples/graphics/src/backend/mod.rs +++ b/examples/graphics-server/src/backend/mod.rs @@ -2,3 +2,8 @@ mod minifb; #[cfg(not(target_os = "none"))] pub use crate::backend::minifb::*; + +#[cfg(target_os = "none")] +mod betrusted; +#[cfg(target_os = "none")] +pub use crate::backend::betrusted::*; diff --git a/examples/graphics/src/main.rs b/examples/graphics-server/src/main.rs similarity index 100% rename from examples/graphics/src/main.rs rename to examples/graphics-server/src/main.rs diff --git a/examples/log-server/.cargo/config b/examples/log-server/.cargo/config new file mode 100644 index 000000000..60f2c8c9b --- /dev/null +++ b/examples/log-server/.cargo/config @@ -0,0 +1,13 @@ +#[target.riscv32i-unknown-none-elf] +##runner = "riscv64-unknown-elf-gdb -x gdb_init" +#rustflags = [ +# "-C", "linker-plugin-lto", +#] +# +#[target.riscv32imac-unknown-none-elf] +#rustflags = [ +# "-C", "linker-plugin-lto", +#] + +[build] +target = "riscv32imac-unknown-none-elf" diff --git a/examples/log/.vscode/settings.json b/examples/log-server/.vscode/settings.json similarity index 100% rename from examples/log/.vscode/settings.json rename to examples/log-server/.vscode/settings.json diff --git a/examples/log/Cargo.toml b/examples/log-server/Cargo.toml similarity index 92% rename from examples/log/Cargo.toml rename to examples/log-server/Cargo.toml index 553e997ce..6f3541ad0 100644 --- a/examples/log/Cargo.toml +++ b/examples/log-server/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "log" +name = "log-server" version = "0.1.0" authors = ["Sean Cross "] edition = "2018" diff --git a/examples/log/README.md b/examples/log-server/README.md similarity index 100% rename from examples/log/README.md rename to examples/log-server/README.md diff --git a/examples/log/build.rs b/examples/log-server/build.rs similarity index 100% rename from examples/log/build.rs rename to examples/log-server/build.rs diff --git a/examples/log/src/debug.rs b/examples/log-server/src/debug.rs similarity index 100% rename from examples/log/src/debug.rs rename to examples/log-server/src/debug.rs diff --git a/examples/log/src/log_string.rs b/examples/log-server/src/log_string.rs similarity index 100% rename from examples/log/src/log_string.rs rename to examples/log-server/src/log_string.rs diff --git a/examples/log/src/main.rs b/examples/log-server/src/main.rs similarity index 100% rename from examples/log/src/main.rs rename to examples/log-server/src/main.rs diff --git a/examples/log/src/start.rs b/examples/log-server/src/start.rs similarity index 100% rename from examples/log/src/start.rs rename to examples/log-server/src/start.rs diff --git a/examples/log/src/timer.rs b/examples/log-server/src/timer.rs similarity index 100% rename from examples/log/src/timer.rs rename to examples/log-server/src/timer.rs diff --git a/examples/log/.cargo/config b/examples/log/.cargo/config deleted file mode 100644 index 478c166b7..000000000 --- a/examples/log/.cargo/config +++ /dev/null @@ -1,13 +0,0 @@ -[target.riscv32i-unknown-none-elf] -#runner = "riscv64-unknown-elf-gdb -x gdb_init" -rustflags = [ - "-C", "linker-plugin-lto", -] - -[target.riscv32imac-unknown-none-elf] -rustflags = [ - "-C", "linker-plugin-lto", -] - -[build] -target = "riscv32imac-unknown-none-elf"