Make tools/ a cargo workspace.

The root cargo workspace was created in PR tock#1714. tock#1714's description asked the question "Should `tools/` also be part of the workspace? Have their own workspace?", which doesn't appear to have been answered. The PR ultimately excluded `tools/` from the root workspace. I think `tools/` would benefit from being in a cargo workspace. Because the root workspace specifies compilation profiles that are tuned for embedded code, I decided to make a second workspace for `tools/`. I am open to making `tools/` part of the root workspace if that's what you would prefer.
jrvanwhy · Dec 1, 2022 · 1eefd32 · 1eefd32
1 parent ae539b6
commit 1eefd32
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -81,18 +81,7 @@ members = [
     "libraries/tock-register-interface",
     "libraries/tickv",
 ]
-exclude = [
-    "tools/alert_codes",
-    "tools/board-runner",
-    "tools/qemu",
-    "tools/litex-ci-runner",
-    "tools/qemu-runner",
-    "tools/sha256sum",
-    "tools/usb/bulk-echo",
-    "tools/usb/bulk-echo-fast",
-    "tools/usb/bulk-test",
-    "tools/usb/control-test",
-]
+exclude = ["tools/"]
 
 [workspace.package]
 version = "0.1.0"

diff --git a/tools/Cargo.toml b/tools/Cargo.toml
@@ -0,0 +1,15 @@
+[workspace]
+members = [
+    "alert_codes",
+    "board-runner",
+    "litex-ci-runner",
+    "qemu-runner",
+    "sha256sum",
+    "usb/bulk-echo",
+    "usb/bulk-test",
+    "usb/control-test",
+]
+
+[workspace.package]
+authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
+edition = "2021"
diff --git a/tools/alert_codes/Cargo.toml b/tools/alert_codes/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "alert_codes"
 version = "0.1.0"
-authors = ["jrvanwhy <jrvanwhy@google.com>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
diff --git a/tools/board-runner/Cargo.toml b/tools/board-runner/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "board-runner"
 version = "0.1.0"
-authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 rexpect = "0.4"

diff --git a/tools/litex-ci-runner/Cargo.toml b/tools/litex-ci-runner/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "litex-ci-runner"
 version = "0.1.0"
-authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
+authors.workspace = true
 edition = "2018"
 
 [dependencies]

diff --git a/tools/qemu-runner/Cargo.toml b/tools/qemu-runner/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "qemu-runner"
 version = "0.1.0"
-authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 
 [dependencies]
 rexpect = "0.4.0"
diff --git a/tools/usb/bulk-echo/Cargo.toml b/tools/usb/bulk-echo/Cargo.toml
@@ -2,6 +2,7 @@
 name = "bulk-echo"
 version = "0.1.0"
 authors = ["Daniel B Giffin <daniel@beech-grove.net>"]
+edition.workspace = true
 
 [dependencies]
 libusb = { git ="https://github.com/tock/libusb-rs" }
diff --git a/tools/usb/bulk-test/Cargo.toml b/tools/usb/bulk-test/Cargo.toml
@@ -2,6 +2,7 @@
 name = "bulk-test"
 version = "0.1.0"
 authors = ["Daniel B. Giffin <dbg@scs.stanford.edu>"]
+edition.workspace = true
 
 [dependencies]
 libusb = { git ="https://github.com/tock/libusb-rs" }
diff --git a/tools/usb/control-test/Cargo.toml b/tools/usb/control-test/Cargo.toml
@@ -2,6 +2,7 @@
 name = "control-test"
 version = "0.1.0"
 authors = ["Daniel B. Giffin <dbg@scs.stanford.edu>"]
+edition.workspace = true
 
 [dependencies]
 libusb = { git ="https://github.com/tock/libusb-rs" }