bendns' repos / helix
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-loader/build.rs')
-rw-r--r--helix-loader/build.rs33
1 files changed, 7 insertions, 26 deletions
diff --git a/helix-loader/build.rs b/helix-loader/build.rs
index 22f2fa8f..63548a0c 100644
--- a/helix-loader/build.rs
+++ b/helix-loader/build.rs
@@ -2,9 +2,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 +10,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(),
+ Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
+ None => VERSION.into(),
};
println!(
@@ -36,6 +22,7 @@ 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() {
@@ -53,10 +40,7 @@ fn main() {
.ok()
.filter(|output| output.status.success())
.and_then(|x| String::from_utf8(x.stdout).ok())
- .map(|x| x.trim().to_string())
- else {
- return;
- };
+ else{ return; };
// If heads starts pointing at something else (different branch)
// we need to return
let head = Path::new(&git_dir).join("HEAD");
@@ -71,10 +55,7 @@ fn main() {
.ok()
.filter(|output| output.status.success())
.and_then(|x| String::from_utf8(x.stdout).ok())
- .map(|x| x.trim().to_string())
- else {
- return;
- };
+ else{ return; };
let head_ref = Path::new(&git_dir).join(head_ref);
if head_ref.exists() {
println!("cargo:rerun-if-changed={}", head_ref.display());