[Cmake-commits] CMake branch, next, updated. v2.8.8-3313-g51a0558

[David Cole]

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  51a05582f842f0b436381017219395ee899dedd9 (commit)
       via  214589b1f068800721c582b6983d718d5a66c04b (commit)
      from  31b9aaf60da6eee0610b4a0347e58cbf7e68077e (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=51a05582f842f0b436381017219395ee899dedd9
commit 51a05582f842f0b436381017219395ee899dedd9
Merge: 31b9aaf 214589b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jun 22 14:34:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 22 14:34:03 2012 -0400

    Merge topic 'release-script-fixes' into next
    
    214589b Add ability to run as a ctest -S script also


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=214589b1f068800721c582b6983d718d5a66c04b
commit 214589b1f068800721c582b6983d718d5a66c04b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jun 22 14:32:29 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jun 22 14:32:29 2012 -0400

    Add ability to run as a ctest -S script also
    
    Then, use ctest_sleep to separate uploads by at least one
    second each, so that the files on the web server all get
    distinct time stamps.
    
    Then, when viewed on the web server, sorted by time, they
    are also sorted alphabetically.

diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake
index dc6c78f..bd79296 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)

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

Summary of changes:
 Utilities/Release/upload_release.cmake |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake