Просмотр исходного кода

Merge topic 'release-script-fixes'

214589b Add ability to run as a ctest -S script also
David Cole 13 лет назад
Родитель
Сommit
e856509093
1 измененных файлов с 13 добавлено и 3 удалено
  1. 13 3
      Utilities/Release/upload_release.cmake

+ 13 - 3
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)