mii/merkle.rs
1
0
Fork 0
mirror of https://github.com/mii443/merkle.rs.git synced 2025-08-23 00:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Romain Ruetschi
2018-11-20 18:49:44 +01:00
parent 66567189e0
commit 3b374e5a43
7 changed files with 57 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.rs
View File

@ -15,7 +15,8 @@ fn has_right_protoc_version(version: &str) -> bool {
let version_output = protoc.wait_with_output().unwrap();
assert!(version_output.status.success());
String::from_utf8(version_output.stdout).unwrap().trim() == version.trim()
let full_version = String::from_utf8(version_output.stdout).unwrap();
full_version.trim() == format!("libprotoc {}", version.trim())
}
#[cfg(feature = "serialization-protobuf")]
@ -26,7 +27,8 @@ fn build_protobuf(out_dir: &str, input: &[&str], includes: &[&str]) {
input,
includes,
customize: Default::default(),
}).expect("protoc");
})
.expect("protoc");
}
#[cfg(feature = "serialization-protobuf")]
@ -36,13 +38,14 @@ fn build_protobuf_schemata() {
let mut version_string = String::new();
let mut version_pin =
File::open("PROTOC_VERSION").expect("protoc version pin `PROTOC_VERSION` file is missing");
version_pin
.read_to_string(&mut version_string)
.expect("cannot read protoc pin file");
if !has_right_protoc_version(&version_string) {
eprintln!(
"Build failed because merkle.rs could not find: {}",
"Build failed because merkle.rs could not find protobuf version {}",
version_string
);