Author: hbelusca Date: Fri Jan 29 00:57:17 2016 New Revision: 70652
URL: http://svn.reactos.org/svn/reactos?rev=70652&view=rev Log: [VERSION]: Sync versioning modifications from r70651.
Modified: branches/ReactOS-0.4.0-FOSDEM2016/ (props changed) branches/ReactOS-0.4.0-FOSDEM2016/reactos/ (props changed) branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.cmake branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.h.cmake branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake
Propchange: branches/ReactOS-0.4.0-FOSDEM2016/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 29 00:57:17 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651
Propchange: branches/ReactOS-0.4.0-FOSDEM2016/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 29 00:57:17 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651
Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reactos... ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.cmake [iso-8859-1] Fri Jan 29 00:57:17 2016 @@ -25,26 +25,28 @@ set(KERNEL_VERSION_BUILD_TYPE "")
# KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "") +set(KERNEL_VERSION_RELEASE_TYPE "RC2-FOSDEM2016")
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")
Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.h.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reactos... ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.h.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.h.cmake [iso-8859-1] Fri Jan 29 00:57:17 2016 @@ -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
Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 29 00:57:17 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651
Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 29 00:57:17 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651
Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/include... ============================================================================== --- branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] Fri Jan 29 00:57:17 2016 @@ -28,23 +28,25 @@ 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")
Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/include... ============================================================================== --- branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/include/reactos/version.h.cmake [iso-8859-1] Fri Jan 29 00:57:17 2016 @@ -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
-
hbelusca＠svn.reactos.org