[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1738-g63a0ac2

[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  63a0ac2d64e965b39588732fefdfc99508af0e20 (commit)
       via  0e6ef06f08711aa0643edae6a4ad0a1fdee24fdd (commit)
      from  4bfac53124aa6d64163d63110cc817c9d9d9d51e (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=63a0ac2d64e965b39588732fefdfc99508af0e20
commit 63a0ac2d64e965b39588732fefdfc99508af0e20
Merge: 4bfac53 0e6ef06
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 13:19:51 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 25 13:19:51 2014 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e6ef06f08711aa0643edae6a4ad0a1fdee24fdd
commit 0e6ef06f08711aa0643edae6a4ad0a1fdee24fdd
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 13:11:33 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..b865fb6 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_NAME "${CMAKE_DOC_TARBALL_NAME}")
+  message("scp '${CMAKE_DOC_TARBALL}' '${HOST}:${CMAKE_DOC_TARBALL_NAME}'")
   execute_process(COMMAND
-    scp ${CMAKE_DOC_TARBALL} ${HOST}:
+    scp ${CMAKE_DOC_TARBALL} ${HOST}:${CMAKE_DOC_TARBALL_NAME}
     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_NAME}'")
   endif()
-  get_filename_component(CMAKE_DOC_TARBALL_NAME "${CMAKE_DOC_TARBALL}" NAME)
 endif()
 
 # set this so configure file will work from script mode

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

Summary of changes:
 Utilities/Release/release_cmake.cmake |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake