GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix compilation of rslib outside Bazel

Browse source 
fixes code completion
This commit is contained in:
Damien Elmes 2020-11-24 18:51:19 +10:00
parent c9b3ed1eae
commit d7cded4ae1
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rslib/build/protobuf.rs
View file

@ -79,10 +79,15 @@ fn service_generator() -> Box<dyn prost_build::ServiceGenerator> {
pub fn write_backend_proto_rs() {
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
let backend_proto = PathBuf::from(
env::var("BACKEND_PROTO").unwrap_or_else(|_| "../proto/backend.proto".to_string()),
);
let proto_dir = backend_proto.parent().unwrap().to_owned();
let backend_proto;
let proto_dir;
if let Ok(proto) = env::var("BACKEND_PROTO") {
backend_proto = PathBuf::from(proto);
proto_dir = backend_proto.parent().unwrap().to_owned();
} else {
backend_proto = PathBuf::from("backend.proto");
proto_dir = PathBuf::from(".");
}
let fluent_proto = out_dir.join("fluent.proto");
let mut config = prost_build::Config::new();

2
rslib/src/version.rs
View file

@ -5,7 +5,7 @@ use lazy_static::lazy_static;
use std::env;
fn buildinfo(key: &str) -> &'static str {
let buildinfo = include_str!(concat!(env!("OUT_DIR"), "/../../buildinfo.txt"));
let buildinfo = include_str!(concat!(env!("OUT_DIR"), "/buildinfo.txt"));
for line in buildinfo.split('\n') {
let mut it = line.split(' ');
if it.next().unwrap() == key {