[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1743-ga60dc4b

[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  a60dc4b06237e671fd7a39e0ae7bf0ca8adeb6bf (commit)
       via  ab1eb29e34e15e75429d135c9dacf7dea2934abb (commit)
      from  237a3983b08ca19de72a56652632cdafaa6f7413 (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=a60dc4b06237e671fd7a39e0ae7bf0ca8adeb6bf
commit a60dc4b06237e671fd7a39e0ae7bf0ca8adeb6bf
Merge: 237a398 ab1eb29
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 14:34:50 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 25 14:34:50 2014 -0500

    Merge topic 'release-doc-tarball' into next
    
    ab1eb29e Utilities/Release: Use unique docs tarball name only for staging


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

    Utilities/Release: Use unique docs tarball name only for staging
    
    The documentation install rules expect the tarball to extract to a
    directory with its own name.

diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index b865fb6..a8772ee 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -68,13 +68,13 @@ endmacro()
 
 if(CMAKE_DOC_TARBALL)
   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}'")
+  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}:${CMAKE_DOC_TARBALL_NAME}
+    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}:${CMAKE_DOC_TARBALL_NAME}'")
+    message("error sending doc tarball with scp '${CMAKE_DOC_TARBALL}' '${HOST}:${CMAKE_DOC_TARBALL_STAGED}'")
   endif()
 endif()
 
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:
 Utilities/Release/release_cmake.cmake |    8 ++++----
 Utilities/Release/release_cmake.sh.in |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake