yetangitu/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-10-03 09:49:31 +02:00
Code Issues Releases Wiki Activity

Bump protobuf v2.8.1 -> v~2.14.0 and fix build issues (#485)

Browse source
This commit is contained in:
Ash 2020-07-22 12:47:25 +02:00 • committed by GitHub
parent 9f3a02ee8f
commit 72437bff66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 764 additions and 1561 deletions
Download patch file Download diff file Expand all files Collapse all files

13
protocol/build.rs
View file

@ -29,20 +29,21 @@ fn main() {
}
// Build the paths to relevant files.
let src = &format!("proto/{}.proto", name);
let dest = &format!("src/{}.rs", name);
let src_fname = &format!("proto/{}.proto", name);
let dest_fname = &format!("src/{}.rs", name);
let src = Path::new(src_fname);
let dest = Path::new(dest_fname);
// Get the contents of the existing generated file.
let mut existing = "".to_string();
if Path::new(dest).exists() {
if dest.exists() {
// Removing CRLF line endings if present.
existing = read_to_string(dest).unwrap().replace("\r\n", "\n");
}
println!("Regenerating {} from {}", dest, src);
println!("Regenerating {} from {}", dest.display(), src.display());
// Parse the proto files as the protobuf-codegen-pure crate does.
let p = parse_and_typecheck(&["proto"], &[src]).expect("protoc");
let p = parse_and_typecheck(&[&Path::new("proto")], &[src]).expect("protoc");
// But generate them with the protobuf-codegen crate directly.
// Then we can keep the result in-memory.
let result = protobuf_codegen::gen(&p.file_descriptors, &p.relative_paths, &customizations);