diff options
| -rw-r--r-- | Tests/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | Utilities/Release/README | 2 | ||||
| -rw-r--r-- | Utilities/Release/create-cmake-release.cmake | 6 | ||||
| -rw-r--r-- | Utilities/Release/upload_release.cmake | 11 |
4 files changed, 29 insertions, 5 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5a8f5d1..14f6515 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -50,6 +50,21 @@ IF(BUILD_TESTING) ADD_TEST_MACRO(Assembler HelloAsm) ADD_TEST_MACRO(SourceGroups SourceGroups) + IF(CMAKE_BUILD_NIGHTLY_WINDOWS_TEST) + FILE(MAKE_DIRECTORY "${CMake_BINARY_DIR}/Tests/CMake-CVS") + FILE(WRITE "${CMake_BINARY_DIR}/Tests/CMake-CVS/nightly-cmake.sh" +"cd ${CMake_BINARY_DIR}/Tests/CMake-CVS +${CMake_BINARY_DIR}/bin/cmake -DCMAKE_VERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Release/vogon_release.cmake +${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake +") + ADD_TEST(NightlyCMakeBuild + /bin/sh ${CMake_BINARY_DIR}/Tests/CMake-CVS/nightly-cmake.sh) + IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY) + SET_TESTS_PROPERTIES ( NightlyCMakeBuild PROPERTIES TIMEOUT 1800) + ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY) + ENDIF(CMAKE_BUILD_NIGHTLY_WINDOWS_TEST) + + # add tests with more complex invocations ADD_TEST(TargetName ${CMAKE_CTEST_COMMAND} --build-and-test diff --git a/Utilities/Release/README b/Utilities/Release/README index 51b2e08..9c664db 100644 --- a/Utilities/Release/README +++ b/Utilities/Release/README @@ -18,6 +18,8 @@ cmake -DCMAKE_VERSION=CMake-2-4-7 -P ../create-cmake-release.cmake create-cmake-release.cmake: script to run to create release sh script +To add or remove machines this file should be edited. + Cygwin -> directory that contains cpack cygwin package files used in CMakeCPack.cmake) diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index 574e662..a39f49f 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -6,13 +6,13 @@ set(RELEASE_SCRIPTS dashmacmini2_release.cmake # Mac Darwin universal dashsun1_release.cmake # SunOS destiny_release.cmake # HPUX - magrathea_release.cmake # Linux + magrathea_release.cmake # Linux dashsgi1_release.cmake # IRIX dashsgi1_release64.cmake # IRIX 64 vogon_release.cmake # Windows vogon_cygwin.cmake # Cygwin -# r36n11_aix_release.cmake # AIX 5.3 - r15n65_aix_release.cmake # AIX 5.2 + r36n11_aix_release.cmake # AIX 5.3 +# r15n65_aix_release.cmake # AIX 5.2 ) file(WRITE create-${CMAKE_VERSION}.sh "#!/bin/sh") diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake index 4b9917a..7424f82 100644 --- a/Utilities/Release/upload_release.cmake +++ b/Utilities/Release/upload_release.cmake @@ -1,17 +1,24 @@ set(PROJECT_PREFIX cmake-) -set(VERSION 2.4) +if(NOT VERSION) + set(VERSION 2.4) +endif(NOT VERSION) file(GLOB FILES ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_PREFIX}*") message("${FILES}") set(UPLOAD_LOC "kitware@www.cmake.org:/projects/FTP/pub/cmake/v${VERSION}") +set(count 0) foreach(file ${FILES}) if(NOT IS_DIRECTORY ${file}) - message("upload ${file}") + message("upload ${file} ${UPLOAD_LOC}") execute_process(COMMAND scp ${file} ${UPLOAD_LOC} RESULT_VARIABLE result) + math(EXPR count "${count} + 1") if("${result}" GREATER 0) message(FATAL_ERROR "failed to upload file to ${UPLOAD_LOC}") endif("${result}" GREATER 0) endif(NOT IS_DIRECTORY ${file}) endforeach(file) +if(${count} EQUAL 0) + message(FATAL_ERROR "Error no files uploaded.") +endif(${count} EQUAL 0) |