From bc57339473b797bd485353264e5402eb1249ac45 Mon Sep 17 00:00:00 2001 From: Ajeet D'Souza <98ajeet@gmail.com> Date: Wed, 18 Aug 2021 21:55:25 +0530 Subject: [PATCH] Avoid git version on release builds (#253) --- build.rs | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/build.rs b/build.rs index 8f01dd8..720daac 100644 --- a/build.rs +++ b/build.rs @@ -2,9 +2,27 @@ use std::env; use std::io; use std::process::Command; +fn main() { + let pkg_version = env::var("CARGO_PKG_VERSION").unwrap(); + let version = match env::var_os("PROFILE") { + Some(profile) if profile == "release" => format!("v{}", pkg_version), + _ => git_version().unwrap_or_else(|| format!("v{}-unknown", pkg_version)), + }; + println!("cargo:rustc-env=ZOXIDE_VERSION={}", version); + + // Since we are generating completions in the package directory, we need to + // set this so that Cargo doesn't rebuild every time. + println!("cargo:rerun-if-changed=src"); + println!("cargo:rerun-if-changed=templates"); + println!("cargo:rerun-if-changed=tests"); + + generate_completions().unwrap(); +} + fn git_version() -> Option { + let dir = env::var("CARGO_MANIFEST_DIR").ok()?; let mut git = Command::new("git"); - git.args(&["describe", "--tags", "--broken"]); + git.args(&["-C", &dir, "describe", "--tags", "--broken"]); let output = git.output().ok()?; if !output.status.success() || output.stdout.is_empty() || !output.stderr.is_empty() { @@ -13,11 +31,6 @@ fn git_version() -> Option { String::from_utf8(output.stdout).ok() } -fn crate_version() -> String { - // unwrap is safe here, since Cargo will always supply this variable. - format!("v{}", env::var("CARGO_PKG_VERSION").unwrap()) -} - fn generate_completions() -> io::Result<()> { #[path = "src/app/_app.rs"] mod app; @@ -39,20 +52,3 @@ fn generate_completions() -> io::Result<()> { Ok(()) } - -fn main() { - // Packaged releases of zoxide almost always use the source tarball - // provided by GitHub, which does not include the `.git` folder. Since this - // feature is only useful for development, we can silently fall back to - // using the crate version. - let version = git_version().unwrap_or_else(crate_version); - println!("cargo:rustc-env=ZOXIDE_VERSION={}", version); - - // Since we are generating completions in the package directory, we need to - // set this so that Cargo doesn't rebuild every time. - println!("cargo:rerun-if-changed=src"); - println!("cargo:rerun-if-changed=templates"); - println!("cargo:rerun-if-changed=tests"); - - generate_completions().unwrap(); -}