diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-06 14:31:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-06 14:32:04 (GMT) |
| commit | 25fb430e96ecd33d437ad833f58fce509de6dc48 (patch) | |
| tree | 1155d97f3b0c90d0e91c8e1d5650eacd7ebe2014 | |
| parent | 4d67891a73bb523a021cc420f457b507c4dcb1d0 (diff) | |
| download | CMake-25fb430e96ecd33d437ad833f58fce509de6dc48.zip CMake-25fb430e96ecd33d437ad833f58fce509de6dc48.tar.gz CMake-25fb430e96ecd33d437ad833f58fce509de6dc48.tar.bz2 | |
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.
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/Release/upload_release.cmake | 7 |
2 files changed, 4 insertions, 5 deletions
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@www.cmake.org:/projects/FTP/pub/cmake/${dir}") + "kitware@www.cmake.org:/projects/FTP/pub/cmake/${DIR}") set(count 0) foreach(file ${FILES}) if(NOT IS_DIRECTORY ${file}) |