mirror of
https://github.com/EFForg/rayhunter.git
synced 2026-05-30 09:59:27 -07:00
Do not recompile installer if files are missing
Currently the installer is recompiled everytime a file is missing, even if the file has been missing before and after the last compilation. That is because rerun-if-changed on a nonexistent filepath constantly busts the cache.
This commit is contained in:
committed by
Cooper Quintin
parent
3e53aef145
commit
4526203af8
@@ -28,7 +28,10 @@ fn set_binary_var(include_dir: &Path, var: &str, file: &str) {
|
||||
return;
|
||||
}
|
||||
let binary = include_dir.join(file);
|
||||
println!("cargo::rerun-if-changed={}", binary.display());
|
||||
// We need to rerun the build script if the file starts appearing or disappearing, to emit the
|
||||
// right warnings and change the envvar's value. We don't really need to rerun the build script
|
||||
// if the file changes contents.
|
||||
watch_file(&binary);
|
||||
if binary.exists() {
|
||||
println!("cargo::rustc-env={var}={}", binary.display());
|
||||
} else {
|
||||
@@ -40,3 +43,18 @@ fn set_binary_var(include_dir: &Path, var: &str, file: &str) {
|
||||
println!("cargo::rustc-env={var}=");
|
||||
}
|
||||
}
|
||||
|
||||
/// Rerun the build script if the file changes or it appears, or disappears.
|
||||
///
|
||||
/// Simply emitting rerun-if-changed for a nonexistent filepath (such as wpa_supplicant) will make
|
||||
/// cargo recompile everything all the time. Therefore, if the file does not exist we need to watch
|
||||
/// the first parent directory that does.
|
||||
fn watch_file(mut file: &Path) {
|
||||
while !file.exists()
|
||||
&& let Some(parent) = file.parent()
|
||||
{
|
||||
file = parent;
|
||||
}
|
||||
|
||||
println!("cargo::rerun-if-changed={}", file.display());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user