From 1ac598f53b74009bf161387894796199348747ce Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 5 Feb 2015 09:55:04 -0500 Subject: [PATCH 1/2] Help: Drop development topic notes to prepare release Release versions do not have the development topic section of the CMake Release Notes index page. --- Help/release/dev/0-sample-topic.rst | 7 ------- Help/release/index.rst | 2 -- 2 files changed, 9 deletions(-) delete mode 100644 Help/release/dev/0-sample-topic.rst diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst deleted file mode 100644 index e4cc01e23..000000000 --- a/Help/release/dev/0-sample-topic.rst +++ /dev/null @@ -1,7 +0,0 @@ -0-sample-topic --------------- - -* This is a sample release note for the change in a topic. - Developers should add similar notes for each topic branch - making a noteworthy change. Each document should be named - and titled to match the topic name to avoid merge conflicts. diff --git a/Help/release/index.rst b/Help/release/index.rst index 45d0a692d..a058bc17e 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -5,8 +5,6 @@ CMake Release Notes This file should include the adjacent "dev.txt" file in development versions but not in release versions. -.. include:: dev.txt - Releases ======== From cb01f1517051b577d571e8fd21d210ef303f56c9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 5 Feb 2015 09:55:27 -0500 Subject: [PATCH 2/2] CMake 3.2.0-rc1 version update --- Source/CMakeVersion.cmake | 6 +++--- Utilities/Release/upload_release.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a9b0511eb..8ffe8c4a4 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) -set(CMake_VERSION_MINOR 1) -set(CMake_VERSION_PATCH 20150205) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_MINOR 2) +set(CMake_VERSION_PATCH 0) +set(CMake_VERSION_RC 1) diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake index 841f2441e..98fe3c595 100644 --- a/Utilities/Release/upload_release.cmake +++ b/Utilities/Release/upload_release.cmake @@ -1,6 +1,6 @@ set(CTEST_RUN_CURRENT_SCRIPT 0) if(NOT VERSION) - set(VERSION 3.1) + set(VERSION 3.2) endif() if(NOT DEFINED PROJECT_PREFIX) set(PROJECT_PREFIX cmake-${VERSION})