Skip to content

Commit 2de9328

Browse files
committed
[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
1 parent c8bc427 commit 2de9328

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

reactos/include/reactos/version.cmake

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,27 @@ set(KERNEL_VERSION_MAJOR "0")
2020
set(KERNEL_VERSION_MINOR "4")
2121
set(KERNEL_VERSION_PATCH_LEVEL "0")
2222
set(COPYRIGHT_YEAR "2016")
23-
# KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release)
23+
24+
# KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release)
2425
set(KERNEL_VERSION_BUILD_TYPE "SVN")
2526

27+
# KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one)
28+
set(KERNEL_VERSION_RELEASE_TYPE "")
2629

2730
set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")
28-
if(KERNEL_VERSION_PATCH_LEVEL)
29-
set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_BUILD_TYPE}")
31+
32+
if(KERNEL_VERSION_BUILD_TYPE STREQUAL "SVN")
33+
if(KERNEL_VERSION_PATCH_LEVEL)
34+
set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_BUILD_TYPE}")
35+
else()
36+
set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}")
37+
endif()
3038
else()
31-
set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}")
39+
if(KERNEL_VERSION_RELEASE_TYPE STREQUAL "")
40+
set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}")
41+
else()
42+
set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_RELEASE_TYPE}")
43+
endif()
3244
endif()
3345

3446
math(EXPR REACTOS_DLL_VERSION_MAJOR "${KERNEL_VERSION_MAJOR}+42")

0 commit comments

Comments
 (0)