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.

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

Include package props with corresponding env vars into target metadata #3857

Merged
merged 1 commit into from
Mar 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/cargo/ops/cargo_rustc/compilation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ impl<'cfg> Compilation<'cfg> {
let cargo_exe = self.config.cargo_exe()?;
cmd.env(::CARGO_ENV, cargo_exe);

// When adding new environment variables depending on
// crate properties which might require rebuild upon change
// consider adding the corresponding properties to the hash
// in Context::target_metadata()
cmd.env("CARGO_MANIFEST_DIR", pkg.root())
.env("CARGO_PKG_VERSION_MAJOR", &pkg.version().major.to_string())
.env("CARGO_PKG_VERSION_MINOR", &pkg.version().minor.to_string())
Expand Down
7 changes: 7 additions & 0 deletions src/cargo/ops/cargo_rustc/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,13 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
// to pull crates from anywhere w/o worrying about conflicts
unit.pkg.package_id().hash(&mut hasher);

// Add package properties which map to environment variables
// exposed by Cargo
let manifest_metadata = unit.pkg.manifest().metadata();
manifest_metadata.authors.hash(&mut hasher);
manifest_metadata.description.hash(&mut hasher);
manifest_metadata.homepage.hash(&mut hasher);

// Also mix in enabled features to our metadata. This'll ensure that
// when changing feature sets each lib is separately cached.
self.resolve.features_sorted(unit.pkg.package_id()).hash(&mut hasher);
Expand Down
41 changes: 41 additions & 0 deletions tests/freshness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -680,3 +680,44 @@ fn rebuild_if_build_artifacts_move_forward_in_time() {
[FINISHED] [..]
"));
}

#[test]
fn rebuild_if_environment_changes() {
let p = project("env_change")
.file("Cargo.toml", r#"
[package]
name = "env_change"
description = "old desc"
version = "0.0.1"
authors = []
"#)
.file("src/main.rs", r#"
fn main() {
println!("{}", env!("CARGO_PKG_DESCRIPTION"));
}
"#);

assert_that(p.cargo_process("run"),
execs().with_status(0)
.with_stdout("old desc").with_stderr(&format!("\
[COMPILING] env_change v0.0.1 ({dir})
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target[/]debug[/]env_change[EXE]`
", dir = p.url())));

File::create(&p.root().join("Cargo.toml")).unwrap().write_all(br#"
[package]
name = "env_change"
description = "new desc"
version = "0.0.1"
authors = []
"#).unwrap();

assert_that(p.cargo("run"),
execs().with_status(0)
.with_stdout("new desc").with_stderr(&format!("\
[COMPILING] env_change v0.0.1 ({dir})
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] `target[/]debug[/]env_change[EXE]`
", dir = p.url())));
}