[ros-diffs] [akhaldi] 70641: [VERSION] Improve the way we define ReactOS version, to allow us to mark it as SVN or as a release, and for the latter, allow us to mark it as a candidate or as the final one.

Author: akhaldi
Date: Mon Jan 25 18:37:20 2016
New Revision: 70641

URL: http://svn.reactos.org/svn/reactos?rev=70641&view=rev
Log:
[VERSION] Improve the way we define ReactOS version, to allow us to mark it as SVN or as a
release, and for the latter, allow us to mark it as a candidate or as the final one.

Modified:
    trunk/reactos/include/reactos/version.cmake

Modified: trunk/reactos/include/reactos/version.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm…
==============================================================================
--- trunk/reactos/include/reactos/version.cmake	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/version.cmake	[iso-8859-1] Mon Jan 25 18:37:20 2016
@@ -20,15 +20,27 @@
 set(KERNEL_VERSION_MINOR "4")
 set(KERNEL_VERSION_PATCH_LEVEL "0")
 set(COPYRIGHT_YEAR "2016")
-# KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or
"" (for the release)
+
+# KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release)
 set(KERNEL_VERSION_BUILD_TYPE "SVN")
 
+# KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for
the final one)
+set(KERNEL_VERSION_RELEASE_TYPE "")
 
 set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")
-if(KERNEL_VERSION_PATCH_LEVEL)
-    set(KERNEL_VERSION
"${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_BUILD_TYPE}")
+
+if(KERNEL_VERSION_BUILD_TYPE STREQUAL "SVN")
+    if(KERNEL_VERSION_PATCH_LEVEL)
+        set(KERNEL_VERSION
"${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_BUILD_TYPE}")
+    else()
+        set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}")
+    endif()
 else()
-    set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}")
+    if(KERNEL_VERSION_RELEASE_TYPE STREQUAL "")
+        set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}")
+    else()
+        set(KERNEL_VERSION
"${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_RELEASE_TYPE}")
+    endif()
 endif()
 
 math(EXPR REACTOS_DLL_VERSION_MAJOR "${KERNEL_VERSION_MAJOR}+42")