From fd64763088f6068e332f80ff53538a40ae28d459 Mon Sep 17 00:00:00 2001 From: ChJR Date: Sun, 22 Sep 2019 17:23:29 +0900 Subject: [PATCH] Add git_tag() --- vm/build.rs | 5 +++++ vm/src/version.rs | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/vm/build.rs b/vm/build.rs index 6d00ac1c29..5490781579 100644 --- a/vm/build.rs +++ b/vm/build.rs @@ -6,6 +6,7 @@ fn main() { "cargo:rustc-env=RUSTPYTHON_GIT_TIMESTAMP={}", git_timestamp() ); + println!("cargo:rustc-env=RUSTPYTHON_GIT_TAG={}", git_tag()); println!("cargo:rustc-env=RUSTPYTHON_GIT_BRANCH={}", git_branch()); } @@ -17,6 +18,10 @@ fn git_timestamp() -> String { git(&["log", "-1", "--format=%cd"]) } +fn git_tag() -> String { + git(&["describe", "--all", "--always", "--dirty"]) +} + fn git_branch() -> String { git(&["rev-parse", "--abbrev-ref", "HEAD"]) } diff --git a/vm/src/version.rs b/vm/src/version.rs index 9bb0c40083..da3a147d91 100644 --- a/vm/src/version.rs +++ b/vm/src/version.rs @@ -38,6 +38,10 @@ pub fn get_git_revision() -> String { option_env!("RUSTPYTHON_GIT_HASH").unwrap_or("").to_string() } +pub fn get_git_tag() -> String { + option_env!("RUSTPYTHON_GIT_TAG").unwrap_or("").to_string() +} + pub fn get_git_branch() -> String { option_env!("RUSTPYTHON_GIT_BRANCH") .unwrap_or("")