summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-08-13 13:26:39 -0400
committerCMake Topic Stage <kwrobot@kitware.com>2012-08-13 13:26:39 -0400
commite85650909332f6ca84917e1b003192e6207ef304 (patch)
treedee5f8af1777cf0523831b5a15a2c1240631fb4b
parentbed44c2cc1d308166a7c00d5f1b6506ad118cd99 (diff)
parent214589b1f068800721c582b6983d718d5a66c04b (diff)
downloadcmake-e85650909332f6ca84917e1b003192e6207ef304.tar.gz
Merge topic 'release-script-fixes'
214589b Add ability to run as a ctest -S script also
-rw-r--r--Utilities/Release/upload_release.cmake16
1 files changed, 13 insertions, 3 deletions
diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake
index dc6c78f38d..bd79296a1a 100644
--- a/Utilities/Release/upload_release.cmake
+++ b/Utilities/Release/upload_release.cmake
@@ -1,4 +1,7 @@
-set(PROJECT_PREFIX cmake-)
+set(CTEST_RUN_CURRENT_SCRIPT 0)
+if(NOT DEFINED PROJECT_PREFIX)
+ set(PROJECT_PREFIX cmake-)
+endif()
if(NOT VERSION)
set(VERSION 2.8)
endif()
@@ -18,11 +21,18 @@ foreach(file ${FILES})
message("upload ${file} ${UPLOAD_LOC}")
execute_process(COMMAND
scp ${file} ${UPLOAD_LOC}
- RESULT_VARIABLE result)
- math(EXPR count "${count} + 1")
+ RESULT_VARIABLE result)
if("${result}" GREATER 0)
message(FATAL_ERROR "failed to upload file to ${UPLOAD_LOC}")
endif()
+
+ # Pause to give each upload a distinct (to the nearest second)
+ # time stamp
+ if(COMMAND ctest_sleep)
+ ctest_sleep(2)
+ endif()
+
+ math(EXPR count "${count} + 1")
endif()
endforeach(file)
if(${count} EQUAL 0)