From 4c2993df63ec7b5b5a85a4633a67496f742dd361 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 1 Jun 2016 10:55:45 -0400 Subject: 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 e4cc01e..0000000 --- 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 e93b880..92c3b63 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 ======== -- cgit v0.12 From 91f6e7904aa89ae8249680a53c5971c4173a9bed Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 1 Jun 2016 10:57:43 -0400 Subject: CMake 3.6.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 6c81449..6de2243 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 5) -set(CMake_VERSION_PATCH 20160601) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_MINOR 6) +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 f5e325e..04a0cac 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.5) + set(VERSION 3.6) endif() if(NOT DEFINED PROJECT_PREFIX) set(PROJECT_PREFIX cmake-${VERSION}) -- cgit v0.12