Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-loader/build.rs')
| -rw-r--r-- | helix-loader/build.rs | 68 |
1 files changed, 6 insertions, 62 deletions
diff --git a/helix-loader/build.rs b/helix-loader/build.rs index 22f2fa8f..c4b89e6b 100644 --- a/helix-loader/build.rs +++ b/helix-loader/build.rs @@ -1,10 +1,7 @@ use std::borrow::Cow; -use std::path::Path; use std::process::Command; -const MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR"); -const MINOR: &str = env!("CARGO_PKG_VERSION_MINOR"); -const PATCH: &str = env!("CARGO_PKG_VERSION_PATCH"); +const VERSION: &str = include_str!("../VERSION"); fn main() { let git_hash = Command::new("git") @@ -12,23 +9,11 @@ fn main() { .output() .ok() .filter(|output| output.status.success()) - .and_then(|x| String::from_utf8(x.stdout).ok()) - .or_else(|| option_env!("HELIX_NIX_BUILD_REV").map(|s| s.to_string())); + .and_then(|x| String::from_utf8(x.stdout).ok()); - let minor = if MINOR.len() == 1 { - // Print single-digit months in '0M' format - format!("0{MINOR}") - } else { - MINOR.to_string() - }; - let calver = if PATCH == "0" { - format!("{MAJOR}.{minor}") - } else { - format!("{MAJOR}.{minor}.{PATCH}") - }; - let version: Cow<_> = match &git_hash { - Some(git_hash) => format!("{} ({})", calver, &git_hash[..8]).into(), - None => calver.into(), + let version: Cow<_> = match git_hash { + Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(), + None => VERSION.into(), }; println!( @@ -36,47 +21,6 @@ fn main() { std::env::var("TARGET").unwrap() ); + println!("cargo:rerun-if-changed=../VERSION"); println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version); - - if git_hash.is_none() { - return; - } - - // we need to revparse because the git dir could be anywhere if you are - // using detached worktrees but there is no good way to obtain an OsString - // from command output so for now we can't accept non-utf8 paths here - // probably rare enouch where it doesn't matter tough we could use gitoxide - // here but that would be make it a hard dependency and slow compile times - let Some(git_dir): Option<String> = Command::new("git") - .args(["rev-parse", "--git-dir"]) - .output() - .ok() - .filter(|output| output.status.success()) - .and_then(|x| String::from_utf8(x.stdout).ok()) - .map(|x| x.trim().to_string()) - else { - return; - }; - // If heads starts pointing at something else (different branch) - // we need to return - let head = Path::new(&git_dir).join("HEAD"); - if head.exists() { - println!("cargo:rerun-if-changed={}", head.display()); - } - // if the thing head points to (branch) itself changes - // we need to return - let Some(head_ref): Option<String> = Command::new("git") - .args(["symbolic-ref", "HEAD"]) - .output() - .ok() - .filter(|output| output.status.success()) - .and_then(|x| String::from_utf8(x.stdout).ok()) - .map(|x| x.trim().to_string()) - else { - return; - }; - let head_ref = Path::new(&git_dir).join(head_ref); - if head_ref.exists() { - println!("cargo:rerun-if-changed={}", head_ref.display()); - } } |