Move the remaining crates to separate workspaces

project-oak · Jun 9, 2020 · 14b65bd · 14b65bd
1 parent 19c442b
commit 14b65bd
Show file tree

Hide file tree

Showing 13 changed files with 2,545 additions and 178 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"

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

diff --git a/scripts/build_gh_pages b/scripts/build_gh_pages
@@ -33,11 +33,11 @@ fi
 readonly TARGET_ABS_PATH="$(realpath "${TARGET_DIR}")"
 
 # All the dirs that we want to generate docs for.
-declare -ar SOURCE_PATHS=("." "oak_abi" "oak_utils")
-declare -ar TARGET_SUBDIRS=("oak" "oak_abi" "oak_utils")
+declare -ar SOURCE_PATHS=("." "oak_abi" "oak_utils" "sdk/rust" "runner")
+declare -ar TARGET_SUBDIRS=("oak" "oak_abi" "oak_utils" "sdk" "runner")
 
 # Titles used in the top-level index.html files. 
-declare -ar PAGE_TITLES=("SDK" "ABI" "Utils")
+declare -ar PAGE_TITLES=("Runtime" "ABI" "Utils" "SDK" "Runner")
 
 readonly LEN=${#SOURCE_PATHS[@]}
 
@@ -78,10 +78,10 @@ cat <<-END > "${TARGET_ABS_PATH}/index.html"
   <!DOCTYPE html>
   <html>
     <head>
-      <meta http-equiv="Refresh" content="0; url=./oak/doc/oak/index.html" />
+      <meta http-equiv="Refresh" content="0; url=./sdk/doc/oak/index.html" />
     </head>
     <body>
-      <p><a href="./oak/doc/oak/index.html">Oak SDK main page</a></p>
+      <p><a href="./sdk/doc/oak/index.html">Oak SDK main page</a></p>
     </body>
   </html>
 END
diff --git a/scripts/common b/scripts/common
@@ -17,7 +17,7 @@ readonly SERVER_DOCKER_IMAGE_NAME='gcr.io/oak-ci/oak-server'
 readonly CACHE_DIR='bazel-cache'
 
 # List all workspaces, and standalone crates.
-declare -ar ALL_CRATES=("oak_utils" "oak_abi" "." "examples" "experimental")
+declare -ar ALL_CRATES=("oak_utils" "oak_abi" "." "sdk" "examples" "runner" "experimental")
 
 # To set up remote cache write credentials:
 # - navigate to https://pantheon.corp.google.com/iam-admin/serviceaccounts?project=oak-ci