summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-07-26 12:04:58 (GMT)
committerBrad King <brad.king@kitware.com>2019-07-26 12:08:30 (GMT)
commiteb5ea5a505378e02df4d7e142d174b8917a3ef14 (patch)
tree5d21f18657e473080bd6b10ecc5a2dae37ff473e /Help
parentd9156c387c60bc15523a27bba83809ec9fa2a8bf (diff)
downloadCMake-eb5ea5a505378e02df4d7e142d174b8917a3ef14.zip
CMake-eb5ea5a505378e02df4d7e142d174b8917a3ef14.tar.gz
CMake-eb5ea5a505378e02df4d7e142d174b8917a3ef14.tar.bz2
CMakeVersion: Use '-rc0' version suffix on release branches prior to rc1
Revert the change from commit 7b354baad5 (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.
Diffstat (limited to 'Help')
-rw-r--r--Help/dev/maint.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index a1732c8..75a1d68 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -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::