Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(prost-build): emit rerun commands #1140

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(prost-build): emit rerun commands #1140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions prost-build/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,7 @@ impl Config {
) -> Result<FileDescriptorSet> {
let tmp;
let file_descriptor_set_path = if let Some(path) = &self.file_descriptor_set_path {
println!("cargo:rerun-if-changed={}", path.display());
path.clone()
} else {
if self.skip_protoc_run {
Expand All @@ -909,6 +910,7 @@ impl Config {
.arg(&file_descriptor_set_path);

for include in includes {
println!("cargo:rerun-if-changed={}", include.as_ref().display());
if include.as_ref().exists() {
cmd.arg("-I").arg(include.as_ref());
} else {
Expand All @@ -930,6 +932,7 @@ impl Config {
}

for proto in protos {
println!("cargo:rerun-if-changed={}", proto.as_ref().display());
cmd.arg(proto.as_ref());
}

Expand Down Expand Up @@ -1000,12 +1003,6 @@ impl Config {
protos: &[impl AsRef<Path>],
includes: &[impl AsRef<Path>],
) -> Result<()> {
// TODO: This should probably emit 'rerun-if-changed=PATH' directives for cargo, however
// according to [1] if any are output then those paths replace the default crate root,
// which is undesirable. Figure out how to do it in an additive way; perhaps gcc-rs has
// this figured out.
// [1]: http://doc.crates.io/build-script.html#outputs-of-the-build-script

let file_descriptor_set = self.load_fds(protos, includes)?;

self.compile_fds(file_descriptor_set)
Expand Down Expand Up @@ -1224,13 +1221,15 @@ pub fn error_message_protoc_not_found() -> String {

/// Returns the path to the `protoc` binary.
pub fn protoc_from_env() -> PathBuf {
println!("cargo:rerun-if-env-changed=PROTOC");
env::var_os("PROTOC")
.map(PathBuf::from)
.unwrap_or(PathBuf::from("protoc"))
}

/// Returns the path to the Protobuf include directory.
pub fn protoc_include_from_env() -> Option<PathBuf> {
println!("cargo:rerun-if-env-changed=PROTOC_INCLUDE");
let protoc_include: PathBuf = env::var_os("PROTOC_INCLUDE")?.into();

if !protoc_include.exists() {
Expand Down