From 3676ce8d6dc30a5439beec4a705a416597124435 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 12 Nov 2022 23:23:14 +0000 Subject: feat(tvix/store): use tonic-build for protos While prost-build already exposes protobuf message types as structs, we actually need tonic-build too, to be able to get traits for all the RPC services defined in the proto files. Change-Id: I7f4c08454bf0d280d577975c7cdae13ccc2d933b Reviewed-on: https://cl.tvl.fyi/c/depot/+/7320 Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/store/build.rs | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'tvix/store/build.rs') diff --git a/tvix/store/build.rs b/tvix/store/build.rs index 4d3dc513f672..335e87b6c1d8 100644 --- a/tvix/store/build.rs +++ b/tvix/store/build.rs @@ -1,21 +1,24 @@ use std::io::Result; fn main() -> Result<()> { - prost_build::compile_protos( - &[ - "tvix/store/protos/castore.proto", - "tvix/store/protos/pathinfo.proto", - "tvix/store/protos/rpc_blobstore.proto", - "tvix/store/protos/rpc_directory.proto", - "tvix/store/protos/rpc_pathinfo.proto", - ], - // If we are in running `cargo build` manually, using `../..` works fine, - // but in case we run inside a nix build, we need to instead point PROTO_ROOT - // to a sparseTree containing that structure. - &[match std::env::var_os(&"PROTO_ROOT") { - Some(proto_root) => proto_root.to_str().unwrap().to_owned(), - None => "../..".to_string(), - }], - )?; + tonic_build::configure() + .build_server(true) + .build_client(true) + .compile( + &[ + "tvix/store/protos/castore.proto", + "tvix/store/protos/pathinfo.proto", + "tvix/store/protos/rpc_blobstore.proto", + "tvix/store/protos/rpc_directory.proto", + "tvix/store/protos/rpc_pathinfo.proto", + ], + // If we are in running `cargo build` manually, using `../..` works fine, + // but in case we run inside a nix build, we need to instead point PROTO_ROOT + // to a sparseTree containing that structure. + &[match std::env::var_os(&"PROTO_ROOT") { + Some(proto_root) => proto_root.to_str().unwrap().to_owned(), + None => "../..".to_string(), + }], + )?; Ok(()) } -- cgit 1.4.1