From 0023eac56b928ff05b3bb8b4fd13724f9d16fb42 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Sat, 21 Jun 2014 18:25:10 -0700 Subject: [PATCH] Modify KoreBuild to not set a K_BUILD_VERSION if it is already set (CI scenarios) --- build/BuildEnv.shade | 11 +---------- build/_k-standard-goals.shade | 5 ++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/build/BuildEnv.shade b/build/BuildEnv.shade index fca448e8d0..ac53a85bd6 100644 --- a/build/BuildEnv.shade +++ b/build/BuildEnv.shade @@ -7,16 +7,7 @@ functions { get { - string buildNumber = Environment.GetEnvironmentVariable("BUILD_NUMBER"); - if (String.IsNullOrEmpty(buildNumber)) - { - return "t" + DateTime.UtcNow.ToString("yyMMddHHmmss"); - } - - buildNumber = "alpha2-" + buildNumber.PadLeft(4, (char)'0'); - - return buildNumber; - + return "t" + DateTime.UtcNow.ToString("yyMMddHHmmss"); } } } diff --git a/build/_k-standard-goals.shade b/build/_k-standard-goals.shade index ce16c61b8f..494eed99a4 100644 --- a/build/_k-standard-goals.shade +++ b/build/_k-standard-goals.shade @@ -12,7 +12,10 @@ default TEST_DIR='${Path.Combine(TARGET_DIR, "test")}' default Configuration='Release' @{ - E("K_BUILD_VERSION", BuildNumber); + if (string.IsNullOrEmpty(E("K_BUILD_VERSION"))) + { + E("K_BUILD_VERSION", BuildNumber); + } if (string.IsNullOrEmpty(E("K_AUTHOR"))) { E("K_AUTHOR", AUTHORS);