langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor tidyup in protobuf build script

Browse Source
This commit is contained in:
Damien Elmes 2021-07-12 16:15:38 +10:00
parent eec6885c76
commit f649f6c92a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rslib/build/protobuf.rs
View File

@ -71,17 +71,14 @@ fn service_generator() -> Box<dyn prost_build::ServiceGenerator> {
} }
pub fn write_backend_proto_rs() { pub fn write_backend_proto_rs() {
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
let proto_dir = if let Ok(proto) = env::var("PROTO_TOP") { let proto_dir = if let Ok(proto) = env::var("PROTO_TOP") {
let backend_proto = PathBuf::from(proto); PathBuf::from(proto).parent().unwrap().to_owned()
backend_proto.parent().unwrap().to_owned()
} else { } else {
PathBuf::from("../proto") PathBuf::from("../proto")
}; };
let subfolders = &["anki"]; let subfolders = &["anki"];
let mut paths = vec![]; let mut paths = vec![];
for subfolder in subfolders { for subfolder in subfolders {
for entry in proto_dir.join(subfolder).read_dir().unwrap() { for entry in proto_dir.join(subfolder).read_dir().unwrap() {
let entry = entry.unwrap(); let entry = entry.unwrap();
@ -99,6 +96,7 @@ pub fn write_backend_proto_rs() {
} }
} }
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
let mut config = prost_build::Config::new(); let mut config = prost_build::Config::new();
config config
.out_dir(&out_dir) .out_dir(&out_dir)
@ -107,6 +105,6 @@ pub fn write_backend_proto_rs() {
"Deck.Filtered.SearchTerm.Order", "Deck.Filtered.SearchTerm.Order",
"#[derive(strum::EnumIter)]", "#[derive(strum::EnumIter)]",
) )
.compile_protos(paths.as_slice(), &[proto_dir, out_dir]) .compile_protos(paths.as_slice(), &[proto_dir])
.unwrap(); .unwrap();
} }