Use proto-build builder API (#132)

* Use proto-build builder API

Signed-off-by: Nick Cameron <[email protected]>

* Remove blank line

Signed-off-by: Nick Cameron <[email protected]>

Cargo.toml

@@ -19,4 +19,4 @@ bytes = { version = "0.4", optional = true }
 lazy_static = { version = "1.3", optional = true }
 
 [build-dependencies]
-protobuf-build = { version = "0.8", default-features = false }
+protobuf-build = { version = "0.9.1", default-features = false }

build.rs

@@ -1,61 +1,10 @@
 // Copyright 2019 PingCAP, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
-use std::fs::{self, File};
-use std::io::prelude::*;
-use std::io::BufReader;
-use std::path::Path;
-
-const BLACK_LIST: &[&str] = &["protobuf", "google", "gogoproto"];
+use protobuf_build::Builder;
 
 fn main() {
-    let out_dir = format!("{}/protos", std::env::var("OUT_DIR").unwrap());
-    let mods: Vec<_> = fs::read_dir("proto")
-        .expect("Couldn't read directory")
-        .filter_map(|e| {
-            let file_name = e.expect("Couldn't list file").file_name();
-            let file_name = file_name.to_string_lossy();
-            if !file_name.ends_with(".proto") {
-                return None;
-            }
-            Some(format!("proto/{}", file_name))
-        })
-        .collect();
-    protobuf_build::generate_files(&["include".to_owned(), "proto".to_owned()], &mods, &out_dir);
-    let mod_file_path = Path::new(&out_dir).join("mod.rs");
-    let mod_file = File::open(&mod_file_path).unwrap();
-    let reader = BufReader::new(mod_file);
-    let mut content = Vec::new();
-    let mut lines = reader.lines();
-    while let Some(l) = lines.next() {
-        let l = l.unwrap();
-        if BLACK_LIST.iter().any(|i| l.contains(i)) {
-            let mut level = 1;
-            while level > 0 {
-                let l = lines.next().unwrap().unwrap();
-                if l.contains('{') {
-                    level += 1;
-                }
-                if l.contains('}') {
-                    level -= 1;
-                }
-            }
-        } else {
-            content.push(l);
-        }
-    }
-    let mut mod_file = File::create(&mod_file_path).unwrap();
-    for l in content {
-        writeln!(mod_file, "{}", l).unwrap();
-    }
+    Builder::new()
+        .search_dir_for_protos("proto")
+        .package_name("tipb")
+        .generate()
 }

src/lib.rs

@@ -7,4 +7,4 @@ mod protos {
     include!(concat!(env!("OUT_DIR"), "/protos/mod.rs"));
 }
 
-pub use crate::protos::*;
+pub use crate::protos::tipb::*;