[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1790-g5745be7

Brad King brad.king at kitware.com
Wed Feb 26 13:20:08 EST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5745be7e2b813a81f0c4c36b2d6865dba26c8a56 (commit)
       via  71b14dcb0ad52a65331268bf72808841786bc1d2 (commit)
      from  d0bf34f9b275f621f0b7db537aebeebce00b9494 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5745be7e2b813a81f0c4c36b2d6865dba26c8a56
commit 5745be7e2b813a81f0c4c36b2d6865dba26c8a56
Merge: d0bf34f 71b14dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 26 13:20:08 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 26 13:20:08 2014 -0500

    Merge topic 'release-upload-files' into next
    
    71b14dcb Utilities/Release: Do not upload doc staging tarball


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71b14dcb0ad52a65331268bf72808841786bc1d2
commit 71b14dcb0ad52a65331268bf72808841786bc1d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 26 13:18:38 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 26 13:19:08 2014 -0500

    Utilities/Release: Do not upload doc staging tarball
    
    Restrict the release upload globbing pattern to match the CMake version
    so that "cmake-<v>*" files go but "cmake-<id>-docs.tar.gz" does not.

diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake
index 0d928ba..613d73d 100644
--- a/Utilities/Release/upload_release.cmake
+++ b/Utilities/Release/upload_release.cmake
@@ -1,10 +1,10 @@
 set(CTEST_RUN_CURRENT_SCRIPT 0)
-if(NOT DEFINED PROJECT_PREFIX)
-  set(PROJECT_PREFIX cmake-)
-endif()
 if(NOT VERSION)
  set(VERSION 3.0)
 endif()
+if(NOT DEFINED PROJECT_PREFIX)
+  set(PROJECT_PREFIX cmake-${VERSION})
+endif()
 set(dir "v${VERSION}")
 if("${VERSION}" MATCHES "master")
   set(dir "dev")

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/upload_release.cmake |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list