mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-09-02 09:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: remove redundant protoc arg

Browse Source
This commit is contained in:
Luna Yao
2026-04-06 11:55:25 +02:00
parent d5c68e356a
commit 1562092afe
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/build.rs
+5 -6
View File
@@ -171,13 +171,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
println!("cargo:rerun-if-changed={proto_file}"); println!("cargo:rerun-if-changed={proto_file}");
} }
let out = PathBuf::from(env::var("OUT_DIR")?);
let descriptor_file = out.join("descriptors.bin");
let mut config = prost_build::Config::new(); let mut config = prost_build::Config::new();
config config
.protoc_arg("--experimental_allow_proto3_optional")
.file_descriptor_set_path(&descriptor_file)
.extern_path(".google.protobuf.Any", "::prost_wkt_types::Any") .extern_path(".google.protobuf.Any", "::prost_wkt_types::Any")
.extern_path(".google.protobuf.Timestamp", "::prost_wkt_types::Timestamp") .extern_path(".google.protobuf.Timestamp", "::prost_wkt_types::Timestamp")
.extern_path(".google.protobuf.Value", "::prost_wkt_types::Value"); .extern_path(".google.protobuf.Value", "::prost_wkt_types::Value");
@@ -198,10 +193,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
config.skip_debug([".common.Ipv4Addr", ".common.Ipv6Addr", ".common.UUID"]); config.skip_debug([".common.Ipv4Addr", ".common.Ipv6Addr", ".common.UUID"]);
let out = PathBuf::from(env::var("OUT_DIR")?);
let descriptor_file = out.join("descriptors.bin");
config config
.btree_map(["."]) .btree_map(["."])
.service_generator(Box::new(easytier_rpc_build::ServiceGenerator::default())) .service_generator(Box::new(easytier_rpc_build::ServiceGenerator::default()))
.protoc_arg("--experimental_allow_proto3_optional") .protoc_arg("--experimental_allow_proto3_optional")
.file_descriptor_set_path(&descriptor_file)
.compile_protos(&proto_files, &["src/proto/"])?; .compile_protos(&proto_files, &["src/proto/"])?;
prost_reflect_build::Builder::new() prost_reflect_build::Builder::new()
@@ -209,7 +208,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.compile_protos_with_config(config, &proto_files_reflect, &["src/proto/"])?; .compile_protos_with_config(config, &proto_files_reflect, &["src/proto/"])?;
let descriptor_bytes = std::fs::read(descriptor_file)?; let descriptor_bytes = std::fs::read(descriptor_file)?;
let descriptor = FileDescriptorSet::decode(&descriptor_bytes[..]).unwrap(); let descriptor = FileDescriptorSet::decode(&descriptor_bytes[..])?;
prost_wkt_build::add_serde(out, descriptor); prost_wkt_build::add_serde(out, descriptor);
check_locale(); check_locale();