Make oak_abi a standalone crate

project-oak · May 27, 2020 · a872772 · a872772
1 parent 333681d
commit a872772
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 21 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,6 @@ members = [
   "experimental/split_grpc/client",
   "experimental/split_grpc/proxy",
   "experimental/split_grpc/server",
-  "oak/server/rust/oak_abi",
   "oak/server/rust/oak_glue",
   "oak/server/rust/oak_loader",
   "oak/server/rust/oak_runtime",
@@ -37,7 +36,6 @@ members = [
 [patch.crates-io]
 # Oak.
 oak = { path = "sdk/rust/oak" }
-oak_abi = { path = "oak/server/rust/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" }

diff --git a/examples/abitest/module_0/rust/Cargo.toml b/examples/abitest/module_0/rust/Cargo.toml
@@ -16,7 +16,7 @@ expect = { path = "../../../../third_party/expect" }
 hex = "*"
 log = "*"
 oak = "=0.1.0"
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../../oak_abi" }
 prost = "*"
 rand_core = "*"
 rand = "*"

diff --git a/examples/abitest/tests/Cargo.toml b/examples/abitest/tests/Cargo.toml
@@ -13,7 +13,7 @@ abitest_0_frontend = { path = "../module_0/rust" }
 abitest_1_backend = { path = "../module_1/rust" }
 log = "*"
 oak = "=0.1.0"
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../oak_abi" }
 prost = "*"
 tonic = { version = "*", features = ["tls"] }
 

diff --git a/examples/aggregator/module/rust/Cargo.toml b/examples/aggregator/module/rust/Cargo.toml
@@ -13,12 +13,11 @@ aggregator_common = { path = "../../common" }
 itertools = "*"
 log = "*"
 oak = "=0.1.0"
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../../oak_abi" }
 prost = "*"
 
 [dev-dependencies]
 assert_matches = "*"
-oak_abi = "=0.1.0"
 oak_runtime = "=0.1.0"
 oak_tests = "=0.1.0"
 maplit = "*"

diff --git a/examples/chat/module/rust/Cargo.toml b/examples/chat/module/rust/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 bincode = "*"
 log = "*"
 oak = "=0.1.0"
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../../oak_abi" }
 prost = "*"
 rand_core = "*"
 rand = "*"

diff --git a/examples/running_average/module/rust/Cargo.toml b/examples/running_average/module/rust/Cargo.toml
@@ -15,7 +15,7 @@ prost = "*"
 
 [dev-dependencies]
 assert_matches = "*"
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../../oak_abi" }
 oak_runtime = "=0.1.0"
 oak_tests = "=0.1.0"
 simple_logger = "*"

diff --git a/oak/server/rust/oak_glue/Cargo.toml b/oak/server/rust/oak_glue/Cargo.toml
@@ -12,7 +12,7 @@ name = "oak_glue"
 byteorder = "*"
 lazy_static = "*"
 log = { version = "*", features = ["std"] }
-oak_abi = { version = "=0.1.0" }
+oak_abi = { path = "../../../../oak_abi" }
 oak_runtime = { version = "=0.1.0" }
 prost = "*"
 simple_logger = "*"
diff --git a/oak/server/rust/oak_loader/Cargo.toml b/oak/server/rust/oak_loader/Cargo.toml
@@ -16,7 +16,7 @@ default = ["oak_debug"]
 anyhow = "*"
 log = "*"
 oak_runtime = "=0.1.0"
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../../oak_abi" }
 prost = "*"
 rustls = "*"
 signal-hook = "*"

diff --git a/oak/server/rust/oak_runtime/Cargo.toml b/oak/server/rust/oak_runtime/Cargo.toml
@@ -23,7 +23,7 @@ itertools = "*"
 jsonwebtoken = "*"
 lazy_static = "*"
 log = { version = "*" }
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../../oak_abi" }
 prometheus = { version = "0.8", features = [
   "nightly"
 ], default-features = false }

diff --git a/oak/server/rust/oak_abi/Cargo.toml → oak_abi/Cargo.toml b/oak/server/rust/oak_abi/Cargo.toml → oak_abi/Cargo.toml
diff --git a/oak/server/rust/oak_abi/build.rs → oak_abi/build.rs b/oak/server/rust/oak_abi/build.rs → oak_abi/build.rs
@@ -17,14 +17,14 @@
 fn main() {
     oak_utils::compile_protos(
         &[
-            "../../../../oak/proto/application.proto",
-            "../../../../oak/proto/grpc_encap.proto",
-            "../../../../oak/proto/label.proto",
-            "../../../../oak/proto/log.proto",
-            "../../../../oak/proto/oak_abi.proto",
-            "../../../../third_party/google/rpc/code.proto",
-            "../../../../third_party/google/rpc/status.proto",
+            "../oak/proto/application.proto",
+            "../oak/proto/grpc_encap.proto",
+            "../oak/proto/label.proto",
+            "../oak/proto/log.proto",
+            "../oak/proto/oak_abi.proto",
+            "../third_party/google/rpc/code.proto",
+            "../third_party/google/rpc/status.proto",
         ],
-        &["../../../.."],
+        &[".."],
     );
 }
diff --git a/oak/server/rust/oak_abi/src/grpc/mod.rs → oak_abi/src/grpc/mod.rs b/oak/server/rust/oak_abi/src/grpc/mod.rs → oak_abi/src/grpc/mod.rs
diff --git a/oak/server/rust/oak_abi/src/label/mod.rs → oak_abi/src/label/mod.rs b/oak/server/rust/oak_abi/src/label/mod.rs → oak_abi/src/label/mod.rs
diff --git a/oak/server/rust/oak_abi/src/label/tests.rs → oak_abi/src/label/tests.rs b/oak/server/rust/oak_abi/src/label/tests.rs → oak_abi/src/label/tests.rs
diff --git a/oak/server/rust/oak_abi/src/lib.rs → oak_abi/src/lib.rs b/oak/server/rust/oak_abi/src/lib.rs → oak_abi/src/lib.rs
diff --git a/oak/server/rust/oak_abi/src/proto/mod.rs → oak_abi/src/proto/mod.rs b/oak/server/rust/oak_abi/src/proto/mod.rs → oak_abi/src/proto/mod.rs
diff --git a/sdk/rust/oak/Cargo.toml b/sdk/rust/oak/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0"
 
 [dependencies]
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../oak_abi" }
 prost = "*"
 prost-types = "*"
 fmt = "*"

diff --git a/sdk/rust/oak_tests/Cargo.toml b/sdk/rust/oak_tests/Cargo.toml
@@ -11,7 +11,7 @@ cargo_metadata = "*"
 lazy_static = "*"
 log = { version = "*", features = ["std"] }
 oak = "=0.1.0"
-oak_abi = "=0.1.0"
+oak_abi = { path = "../../../oak_abi" }
 oak_runtime = { version = "=0.1.0", features = ["test_build"] }
 prost = "*"
 rand = { version = "*" }