Commit eb5ea5a5 authored by Brad King's avatar Brad King
Browse files

CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1

Revert the change from commit 7b354baa (CMakeVersion: Set
CMake_VERSION_RC to 0 even in non-rc versions, 2019-07-25) and instead
define a `0` value in `CMake_VERSION_RC` to mean `-rc0`.  This
distinguishes release branch versions prior to the first release
candidate from the first release candidate itself.  It also makes room
for a dedicated "CMake $major.$minor.0-rc1" release commit for `-rc1` as
we have for later release candidates and final releases.
parent d9156c38
......@@ -178,7 +178,7 @@ Commit with a message such as::
the CMake Release Notes index page.
Update ``Source/CMakeVersion.cmake`` to set the version to
``$major.$minor.0-rc1``:
``$major.$minor.0-rc0``:
.. code-block:: cmake
......@@ -186,7 +186,7 @@ Update ``Source/CMakeVersion.cmake`` to set the version to
set(CMake_VERSION_MAJOR $major)
set(CMake_VERSION_MINOR $minor)
set(CMake_VERSION_PATCH 0)
set(CMake_VERSION_RC 1)
set(CMake_VERSION_RC 0)
Update uses of ``DEVEL_CMAKE_VERSION`` in the source tree to mention the
actual version number:
......@@ -197,7 +197,7 @@ actual version number:
Commit with a message such as::
CMake $major.$minor.0-rc1 version update
Begin $ver release versioning
Merge the ``release-$ver`` branch to ``master``:
......@@ -217,7 +217,7 @@ note infrastructure and the version date from ``origin/master``:
sed -i $'/^Releases/ i\\\n.. include:: dev.txt\\\n' Help/release/index.rst
Update ``Source/CMakeVersion.cmake`` to set the version to
``$major.$minor.$date`` (and RC ``0`` to disable the suffix):
``$major.$minor.$date``:
.. code-block:: cmake
......@@ -225,7 +225,7 @@ Update ``Source/CMakeVersion.cmake`` to set the version to
set(CMake_VERSION_MAJOR $major)
set(CMake_VERSION_MINOR $minor)
set(CMake_VERSION_PATCH $date)
set(CMake_VERSION_RC 0)
#set(CMake_VERSION_RC 0)
Commit with a message such as::
......
......@@ -2,4 +2,4 @@
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 15)
set(CMake_VERSION_PATCH 20190726)
set(CMake_VERSION_RC 0)
#set(CMake_VERSION_RC 0)
......@@ -16,7 +16,7 @@ endif()
set(CMake_VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH})
if(CMake_VERSION_SOURCE)
set(CMake_VERSION_SUFFIX "${CMake_VERSION_SOURCE}")
elseif(CMake_VERSION_RC)
elseif(DEFINED CMake_VERSION_RC)
set(CMake_VERSION_SUFFIX "rc${CMake_VERSION_RC}")
else()
set(CMake_VERSION_SUFFIX "")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment