[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1745-g8f7cdf1

[Brad King]

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  8f7cdf1bf3e8ab4e0acc5e0224e99e5d9f36a5b2 (commit)
       via  b3d85113a63e360e7552ec5332ef7b6c3162abcc (commit)
      from  a60dc4b06237e671fd7a39e0ae7bf0ca8adeb6bf (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=8f7cdf1bf3e8ab4e0acc5e0224e99e5d9f36a5b2
commit 8f7cdf1bf3e8ab4e0acc5e0224e99e5d9f36a5b2
Merge: a60dc4b b3d8511
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 16:07:26 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 25 16:07:26 2014 -0500

    Merge topic 'release-doc-tarball' into next
    
    b3d85113 Utilities/Release: Copy pre-built docs tarball to unique name


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3d85113a63e360e7552ec5332ef7b6c3162abcc
commit b3d85113a63e360e7552ec5332ef7b6c3162abcc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 13:11:04 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 25 14:35:35 2014 -0500

    Utilities/Release: Copy pre-built docs tarball to unique name
    
    Name the pre-built docs tarball on the remote machine according to the
    release script name so that multiple tarballs going to a single remote
    machine do not clobber one another.

diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index 630f54f..a8772ee 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -67,14 +67,15 @@ macro(remote_command comment command)
 endmacro()
 
 if(CMAKE_DOC_TARBALL)
-  message("scp '${CMAKE_DOC_TARBALL}' '${HOST}:'")
+  get_filename_component(CMAKE_DOC_TARBALL_NAME "${CMAKE_DOC_TARBALL}" NAME)
+  string(REPLACE ".tar.gz" "-${SCRIPT_NAME}.tar.gz" CMAKE_DOC_TARBALL_STAGED "${CMAKE_DOC_TARBALL_NAME}")
+  message("scp '${CMAKE_DOC_TARBALL}' '${HOST}:${CMAKE_DOC_TARBALL_STAGED}'")
   execute_process(COMMAND
-    scp ${CMAKE_DOC_TARBALL} ${HOST}:
+    scp ${CMAKE_DOC_TARBALL} ${HOST}:${CMAKE_DOC_TARBALL_STAGED}
     RESULT_VARIABLE result)
   if(${result} GREATER 0)
-    message("error sending doc tarball with scp '${CMAKE_DOC_TARBALL}' '${HOST}:'")
+    message("error sending doc tarball with scp '${CMAKE_DOC_TARBALL}' '${HOST}:${CMAKE_DOC_TARBALL_STAGED}'")
   endif()
-  get_filename_component(CMAKE_DOC_TARBALL_NAME "${CMAKE_DOC_TARBALL}" NAME)
 endif()
 
 # set this so configure file will work from script mode
diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in
index f41bda8..1f57c28 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -18,7 +18,7 @@ check_exit_value()
 CMAKE_DOC_TARBALL=""
 if [ ! -z "@CMAKE_DOC_TARBALL_NAME@" ] ; then
     CMAKE_DOC_TARBALL=@CMAKE_RELEASE_DIRECTORY@/@CMAKE_DOC_TARBALL_NAME@
-    mv "$HOME/@CMAKE_DOC_TARBALL_NAME@" "$CMAKE_DOC_TARBALL"
+    mv "$HOME/@CMAKE_DOC_TARBALL_STAGED@" "$CMAKE_DOC_TARBALL"
     check_exit_value $? "mv doc tarball" || exit 1
 fi
 

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

Summary of changes:


hooks/post-receive
-- 
CMake