chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'protoc-env' into workspace-add

This commit is contained in:
Zack Fu Zi Xiang 2024-01-25 10:40:24 +08:00
parent 0f4fe7bd7b 66b6d773c8
commit 03847be020
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -12,4 +12,5 @@ node_modules
**/libs/AppFlowy-Collab/ **/libs/AppFlowy-Collab/
data/ data/
.env .env
.logs .logs
shell.nix

11
libs/realtime-entity/build.rs
View File

@ -1,11 +1,14 @@
use std::process::Command; use std::process::Command;
fn main() -> Result<(), Box<dyn std::error::Error>> { fn main() -> Result<(), Box<dyn std::error::Error>> {
let protoc_path = protoc_bin_vendored::protoc_bin_path().expect("protoc bin path"); // If the `PROTOC` environment variable is set, don't use vendored `protoc`
let protoc_path_str = protoc_path.to_str().expect("protoc path to str"); std::env::var("PROTOC").map(|_| ()).unwrap_or_else(|_| {
let protoc_path = protoc_bin_vendored::protoc_bin_path().expect("protoc bin path");
let protoc_path_str = protoc_path.to_str().expect("protoc path to str");
// Set the `PROTOC` environment variable to the path of the `protoc` binary. // Set the `PROTOC` environment variable to the path of the `protoc` binary.
std::env::set_var("PROTOC", protoc_path_str); std::env::set_var("PROTOC", protoc_path_str);
});
prost_build::Config::new() prost_build::Config::new()
.out_dir("src/") .out_dir("src/")