[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-527-ge2d4b75

[Brad King]

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  e2d4b755f3119e0e5459532b10809a84a9813f6e (commit)
       via  25fb430e96ecd33d437ad833f58fce509de6dc48 (commit)
      from  dca36fada79b68ecc0eb9cb7d8b9fa269e92ff38 (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=e2d4b755f3119e0e5459532b10809a84a9813f6e
commit e2d4b755f3119e0e5459532b10809a84a9813f6e
Merge: dca36fa 25fb430
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 09:40:22 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 6 09:40:22 2014 -0500

    Merge topic 'fix-nightly-upload' into next
    
    25fb430e Utilities/Release: Fix nightly build upload


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25fb430e96ecd33d437ad833f58fce509de6dc48
commit 25fb430e96ecd33d437ad833f58fce509de6dc48
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 09:31:26 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 6 09:32:04 2014 -0500

    Utilities/Release: Fix nightly build upload
    
    Since commit 71b14dcb (Utilities/Release: Do not upload doc staging
    tarball, 2014-02-26) the prefix upload_release.cmake computes does not
    match any files when used with -DVERSION=master as has been done for the
    nightly binary builds.  Since the version is not actually 'master'
    anyway, change the nightly binary upload logic to explicitly pass the
    destination directory.  Do not pass any VERSION so the default is taken
    and matches the binaries.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 854b239..ea04911 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -575,7 +575,7 @@ if(BUILD_TESTING)
     file(WRITE "${_TEST_DIR}/nightly-cmake.sh"
       "cd ${_TEST_DIR}
 ${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
-${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake
+${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake
     ")
     add_test(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)
     if(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake
index 613d73d..5f4da8f 100644
--- a/Utilities/Release/upload_release.cmake
+++ b/Utilities/Release/upload_release.cmake
@@ -5,16 +5,15 @@ endif()
 if(NOT DEFINED PROJECT_PREFIX)
   set(PROJECT_PREFIX cmake-${VERSION})
 endif()
-set(dir "v${VERSION}")
-if("${VERSION}" MATCHES "master")
-  set(dir "dev")
+if(NOT DEFINED DIR)
+  set(DIR "v${VERSION}")
 endif()
 file(GLOB FILES ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_PREFIX}*")
 list(SORT FILES)
 list(REVERSE FILES)
 message("${FILES}")
 set(UPLOAD_LOC
-  "kitware at www.cmake.org:/projects/FTP/pub/cmake/${dir}")
+  "kitware at www.cmake.org:/projects/FTP/pub/cmake/${DIR}")
 set(count 0)
 foreach(file ${FILES})
   if(NOT IS_DIRECTORY ${file})

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

Summary of changes:
 Tests/CMakeLists.txt                   |    2 +-
 Utilities/Release/upload_release.cmake |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake