Merge pull request #203 from eliheuer/fontspector-issue-431

Remove `protoc` non-Rust system dependency from build script

Author: simoncozens

Cargo.lock

@@ -25,6 +25,7 @@ prost-build = "0.13"
 protobuf-support = "3.7.1"
 protobuf = "3.7.1"
 protobuf-parse = "3.7.1"
+protox = "0.8"
 glob = "0"
 prettyplease = "0.2"
 quote = "1.0"

Cargo.toml

@@ -18,8 +18,12 @@ fn main() {
     let descriptor = protobuf::reflect::FileDescriptor::new_dynamic(protofile.clone(), &[])
         .expect("Could not create descriptor");
 
-    // Now we use the prost crate to compile them, so that we can
-    // generate Rust structs.
+    // Now we use protox + prost-build for pure Rust compilation (no protoc needed)
+    let file_descriptors = protox::compile(
+        ["Lib/axisregistry/axes.proto"],
+        ["Lib/axisregistry"]
+    ).expect("Could not compile axes.proto with protox");
+
     let mut config = prost_build::Config::new();
     // config.boxed(".google.axes.LanguageProto.sample_text");
     // config.boxed(".google.axes.LanguageProto.exemplar_chars");
@@ -34,8 +38,8 @@ fn main() {
     }
     // Let's make our structs; this produces google.axes.rs
     config
-        .compile_protos(&["Lib/axisregistry/axes.proto"], &["Lib/axisregistry/"])
-        .expect("Could not compile axes.proto");
+        .compile_fds(file_descriptors)
+        .expect("Could not compile proto file_descriptors");
 
     let path = Path::new(&env::var("OUT_DIR").unwrap()).join("data.rs");
     let mut file = BufWriter::new(File::create(path).unwrap());