chore(leanpkg/lean_version): recognize nightlies as releases separate…

… from master
leodemoura · Mar 20, 2018 · 0c0646f · 0c0646f
1 parent e247355
commit 0c0646f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/leanpkg/leanpkg/lean_version.lean b/leanpkg/leanpkg/lean_version.lean
@@ -12,12 +12,16 @@ sformat!("{major}.{minor}.{patch}")
 def lean_version_string :=
 if lean.is_release then
     lean_version_string_core
+else if lean.special_version_desc ≠ "" then
+    lean.special_version_desc
 else
     "master"
 
 def ui_lean_version_string :=
 if lean.is_release then
     lean_version_string_core
+else if lean.special_version_desc ≠ "" then
+    lean.special_version_desc
 else
     "master (" ++ lean_version_string_core ++ ")"
 

diff --git a/library/init/version.lean.in b/library/init/version.lean.in
@@ -9,3 +9,7 @@ def lean.githash : string :=
 
 def lean.is_release : bool :=
 @LEAN_VERSION_IS_RELEASE@ ≠ 0
+
+/-- Additional version description like "nightly-2018-03-11" -/
+def lean.special_version_desc : string :=
+"@LEAN_SPECIAL_VERSION_DESC@"
diff --git a/script/setup_nightly.sh b/script/setup_nightly.sh
@@ -25,4 +25,4 @@ else
 fi
 
 LEAN_VERSION_STRING="nightly-$(date -uI)"
-OPTIONS+="-DLEAN_VERSION_STRING=$LEAN_VERSION_STRING"
+OPTIONS+="-DLEAN_SPECIAL_VERSION_DESC=$LEAN_VERSION_STRING"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -7,7 +7,11 @@ set(LEAN_VERSION_MAJOR 3)
 set(LEAN_VERSION_MINOR 3)
 set(LEAN_VERSION_PATCH 1)
 set(LEAN_VERSION_IS_RELEASE 0)  # This number is 1 in the release revision, and 0 otherwise.
-set(LEAN_VERSION_STRING "${LEAN_VERSION_MAJOR}.${LEAN_VERSION_MINOR}.${LEAN_VERSION_PATCH}" CACHE STRING "Lean version string")
+set(LEAN_SPECIAL_VERSION_DESC "" CACHE STRING "Additional version description like 'nightly-2018-03-11'")
+set(LEAN_VERSION_STRING "${LEAN_VERSION_MAJOR}.${LEAN_VERSION_MINOR}.${LEAN_VERSION_PATCH}")
+if (LEAN_SPECIAL_VERSION_DESC)
+  set(LEAN_VERSION_STRING "${LEAN_VERSION_STRING}-${LEAN_SPECIAL_VERSION_DESC}")
+endif()
 
 set(LEAN_EXTRA_LINKER_FLAGS "" CACHE STRING "Additional flags used by the linker")
 set(LEAN_EXTRA_CXX_FLAGS "" CACHE STRING "Additional flags used by the C++ compiler")

diff --git a/src/library/util.cpp b/src/library/util.cpp
@@ -1131,7 +1131,9 @@ void initialize_library_util() {
 
     out << LEAN_VERSION_MAJOR << "."
         << LEAN_VERSION_MINOR << "." << LEAN_VERSION_PATCH;
-    if (std::strcmp(LEAN_GITHASH, "GITDIR-NOTFOUND") == 0) {
+    if (std::strlen(LEAN_SPECIAL_VERSION_DESC) > 0) {
+        out << ", " << LEAN_SPECIAL_VERSION_DESC;
+    } else if (std::strcmp(LEAN_GITHASH, "GITDIR-NOTFOUND") == 0) {
         if (std::strcmp(LEAN_PACKAGE_VERSION, "NOT-FOUND") != 0) {
             out << ", package " << LEAN_PACKAGE_VERSION;
         }

diff --git a/src/version.h.in b/src/version.h.in
@@ -2,6 +2,9 @@
 #define LEAN_VERSION_MINOR @LEAN_VERSION_MINOR@
 #define LEAN_VERSION_PATCH @LEAN_VERSION_PATCH@
 
+// Additional version description like "nightly-2018-03-11"
+#define LEAN_SPECIAL_VERSION_DESC "@LEAN_SPECIAL_VERSION_DESC@"
+
 // When git_sha1 is not avilable, lean reads bin/version file and
 // assign its contents to LEAN_PACKAGE_VERSION
 #define LEAN_PACKAGE_VERSION "@LEAN_PACKAGE_VERSION@"