Move the remaining crates to separate workspaces (#1122)

* Moved `sdk`, and `runner` to separate workspaces * Updated scripts so that the checks run for the new workspaces too
project-oak · Jun 11, 2020 · 0d4bd45 · 0d4bd45
1 parent b21506d
commit 0d4bd45
Show file tree

Hide file tree

Showing 13 changed files with 3,113 additions and 573 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,6 @@
 [workspace]
-members = [
-  "oak/server/rust/oak_loader",
-  "oak/server/rust/oak_runtime",
-  "runner",
-  "sdk/rust/oak",
-  "sdk/rust/oak_tests",
-  "third_party/roughenough",
-]
-exclude = ["oak_abi", "oak_utils"]
+members = ["oak/server/rust/oak_loader", "oak/server/rust/oak_runtime"]
+exclude = ["third_party/expect", "third_party/roughenough"]
 
 # Patch dependencies on oak crates so that they refer to the versions within this same repository.
 #
@@ -16,12 +9,9 @@ exclude = ["oak_abi", "oak_utils"]
 # > explicit about the dependency relationships between the crates.
 [patch.crates-io]
 # Oak.
-oak = { path = "sdk/rust/oak" }
 oak_abi = { path = "oak_abi" }
 oak_loader = { path = "oak/server/rust/oak_loader" }
 oak_runtime = { path = "oak/server/rust/oak_runtime" }
-oak_tests = { path = "sdk/rust/oak_tests" }
 oak_utils = { path = "oak_utils" }
-runner = { path = "runner" }
 # Third party.
 roughenough = { path = "third_party/roughenough" }
diff --git a/oak_abi/Cargo.toml b/oak_abi/Cargo.toml
@@ -1,3 +1,5 @@
+[workspace]
+
 [package]
 name = "oak_abi"
 version = "0.1.0"

diff --git a/oak_utils/Cargo.toml b/oak_utils/Cargo.toml
@@ -1,3 +1,5 @@
+[workspace]
+
 [package]
 name = "oak_utils"
 version = "0.1.0"