From 2de93288c0bf6e0f221fd0877d24a344f24ddbab Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 25 Jan 2016 18:37:20 +0000 Subject: [PATCH] [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. svn path=/trunk/; revision=70641 --- reactos/include/reactos/version.cmake | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/reactos/include/reactos/version.cmake b/reactos/include/reactos/version.cmake index bf823ffdcaf..be2feaa69f1 100644 --- a/reactos/include/reactos/version.cmake +++ b/reactos/include/reactos/version.cmake @@ -20,15 +20,27 @@ set(KERNEL_VERSION_MAJOR "0") 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")