From a1fee3dedfae485e143da47690aea4e66e63eb20 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 10 Mar 2020 12:46:33 +0800 Subject: [PATCH] cargo: add shell and rename tools Signed-off-by: Sean Cross --- Cargo.lock | 34 +++++++++++++++++++++------------- Cargo.toml | 2 ++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 745e2fd56..344fb5f80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -387,6 +387,14 @@ version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" +[[package]] +name = "shell" +version = "0.1.0" +dependencies = [ + "bitflags", + "xous", +] + [[package]] name = "strsim" version = "0.8.0" @@ -431,6 +439,19 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tools" +version = "0.1.0" +dependencies = [ + "bitflags", + "clap", + "crc", + "csv", + "env_logger", + "log", + "xmas-elf", +] + [[package]] name = "unicode-width" version = "0.1.7" @@ -514,19 +535,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "xous-tools" -version = "0.1.0" -dependencies = [ - "bitflags", - "clap", - "crc", - "csv", - "env_logger", - "log", - "xmas-elf", -] - [[package]] name = "zero" version = "0.1.2" diff --git a/Cargo.toml b/Cargo.toml index 32beea4d6..b4ddc9208 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,9 @@ members = [ "loader", "tools", "xous-rs", + "examples/shell", ] +default-members = ["kernel", "loader", "xous-rs", "examples/shell"] [profile.release] codegen-units = 1 # 1 better optimizations