fix: prost compile faild.

merge from remote branch.
ref: #173

Co-authored-by: Xuewei Niu <niuxuewei.nxw@antgroup.com>
Signed-off-by: jokemanfire <hu.dingyang@zte.com.cn>

Author: jokemanfire

.github/workflows/bvt.yml

@@ -10,6 +10,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Install Protoc
+        run: |
+          ./install_protoc.sh
       - name: Check
         run: |
           make deps
@@ -27,6 +30,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Install Protoc
+        run: |
+          ./install_protoc.sh
       - name: Build
         run: |
           make

Cargo.toml

@@ -13,7 +13,7 @@ rust-version = "1.70"
 
 [dependencies]
 prost = { version = "0.11", optional = true }
-protobuf = "3.1.0"
+protobuf = {version = "3.1.0", optional = true}
 libc = { version = "0.2.59", features = [ "extra_traits" ] }
 nix = "0.26.2"
 log = "0.4"
@@ -38,10 +38,11 @@ protobuf-codegen = "3.1.0"
 prost-build = { version = "0.11", optional = true }
 
 [features]
-default = ["sync"]
+default = ["sync","rustprotobuf"]
 async = ["dep:async-trait", "dep:tokio", "dep:futures", "dep:tokio-vsock"]
 sync = []
 prost = ["dep:prost", "dep:prost-build"]
+rustprotobuf = ["dep:protobuf"]
 
 [package.metadata.docs.rs]
 all-features = true

Makefile

@@ -1,4 +1,4 @@
-export PROTOC=${HOME}/protoc/bin/protoc
+PROTOC ?= $(shell which protoc 2>/dev/null || echo $(HOME)/protoc/bin/protoc)
 
 all: debug test
 
@@ -23,14 +23,20 @@ build: debug
 
 .PHONY: test
 test:
-	cargo test --features sync,async --verbose
-	cargo test --features sync,async,prost --verbose
-
+ifeq ($OS,Windows_NT)
+	# async isn't enabled for windows, don't test that feature
+	cargo test --verbose
+else
+	# cargo test --all-features --verbose
+	cargo test --features sync,async,rustprotobuf
+	cargo test --no-default-features --features sync,async,prost
+endif
+	
 .PHONY: check
 check:
 	cargo fmt --all -- --check
 	cargo clippy --all-targets --features sync,async -- -D warnings
-	cargo clippy --all-targets --features sync,async,prost -- -D warnings
+	cargo clippy --all-targets --no-default-features --features sync,async,prost -- -D warnings
 
 .PHONY: deps
 deps:

compiler/Makefile

@@ -1 +1,8 @@
-include ../Makefile
+.PHONY: check
+check:
+	cargo fmt --all -- --check
+	cargo clippy --all-targets -- -D warnings
+
+.PHONY: test
+test:
+	cargo test --verbose

example/Cargo.toml

@@ -18,7 +18,7 @@ byteorder = "1.3.2"
 log = "0.4.6"
 simple-logging = "2.0.2"
 nix = "0.23.0"
-ttrpc = { path = "../", features = ["async"] }
+ttrpc = { path = "../", features = ["async","rustprotobuf"] }
 ctrlc = { version = "3.0", features = ["termination"] }
 tokio = { version = "1.0.1", features = ["signal", "time"] }
 async-trait = "0.1.42"

example2/Cargo.toml

@@ -21,7 +21,7 @@ byteorder = "1.3.2"
 log = "0.4.6"
 simple-logging = "2.0.2"
 nix = "0.23.0"
-ttrpc = { path = "../", features = ["sync", "async", "prost"] }
+ttrpc = { path = "../", features = ["sync", "async", "prost"], default-features = false }
 ctrlc = { version = "3.0", features = ["termination"] }
 tokio = { version = "1.0.1", features = ["signal", "time"] }
 async-trait = "0.1.42"

example2/protocols/asynchronous/_include.rs

@@ -0,0 +1,20 @@
+pub mod agent {
+    include!("agent.rs");
+}
+pub mod google {
+    pub mod protobuf {
+        include!("google.protobuf.rs");
+    }
+}
+pub mod health {
+    include!("health.rs");
+}
+pub mod oci {
+    include!("oci.rs");
+}
+pub mod streaming {
+    include!("streaming.rs");
+}
+pub mod types {
+    include!("types.rs");
+}