[VERSION]: Improve versioning based on r70641.

svn path=/trunk/; revision=70651

diff --git a/reactos/include/reactos/version.cmake b/reactos/include/reactos/version.cmake
index be2feaa..2fb2016 100644 (file)
--- a/reactos/include/reactos/version.cmake
+++ b/reactos/include/reactos/version.cmake
@@ -28,23 +28,25 @@ set(KERNEL_VERSION_BUILD_TYPE "SVN")
 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}")
+endif()
 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()
-    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()
+    set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}")
+elseif(NOT KERNEL_VERSION_RELEASE_TYPE STREQUAL "")
+    set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_RELEASE_TYPE}")
 endif()
 
 math(EXPR REACTOS_DLL_VERSION_MAJOR "${KERNEL_VERSION_MAJOR}+42")
-set(DLL_VERSION_STR "${REACTOS_DLL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}-${KERNEL_VERSION_BUILD_TYPE}")
+set(DLL_VERSION_STR "${REACTOS_DLL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")
+if(KERNEL_VERSION_PATCH_LEVEL)
+    set(DLL_VERSION_STR "${DLL_VERSION_STR}.${KERNEL_VERSION_PATCH_LEVEL}")
+endif()
+if(KERNEL_VERSION_BUILD_TYPE STREQUAL "SVN")
+    set(DLL_VERSION_STR "${DLL_VERSION_STR}-${KERNEL_VERSION_BUILD_TYPE}")
+elseif(NOT KERNEL_VERSION_RELEASE_TYPE STREQUAL "")
+    set(DLL_VERSION_STR "${DLL_VERSION_STR}-${KERNEL_VERSION_RELEASE_TYPE}")
+endif()
 
 # get svn revision number
 set(REVISION "rUNKNOWN")

diff --git a/reactos/include/reactos/version.h.cmake b/reactos/include/reactos/version.h.cmake
index 07581a9..8ae7c2b 100644 (file)
--- a/reactos/include/reactos/version.h.cmake
+++ b/reactos/include/reactos/version.h.cmake
@@ -22,8 +22,10 @@
 
 #define COPYRIGHT_YEAR "@COPYRIGHT_YEAR@"
 
-/* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */
+/* KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) */
 #define KERNEL_VERSION_BUILD_TYPE "@KERNEL_VERSION_BUILD_TYPE@"
+/* KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) */
+#define KERNEL_VERSION_RELEASE_TYPE "@KERNEL_VERSION_RELEASE_TYPE@"
 
 #endif