[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1822-gffa09c3

[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  ffa09c3fc70a23dcde02dafbca1ceb44b691a60a (commit)
       via  f0f2b21d52a0c3f1799c7747f0e7f5b52410054f (commit)
      from  d2042f77d15d238d3a27d466a97b58fb76869b3f (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=ffa09c3fc70a23dcde02dafbca1ceb44b691a60a
commit ffa09c3fc70a23dcde02dafbca1ceb44b691a60a
Merge: d2042f7 f0f2b21
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 27 13:49:14 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 27 13:49:14 2014 -0500

    Merge topic 'release-aix-access' into next
    
    f0f2b21d Utilities/Release: Update IBM AIX build machine access


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0f2b21d52a0c3f1799c7747f0e7f5b52410054f
commit f0f2b21d52a0c3f1799c7747f0e7f5b52410054f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 27 13:03:29 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 27 13:03:29 2014 -0500

    Utilities/Release: Update IBM AIX build machine access

diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 95428b6..841aba5 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -10,7 +10,7 @@ set(RELEASE_SCRIPTS_BATCH_1
   dashmacmini2_release.cmake  # Mac Darwin universal ppc;i386
   dashmacmini5_release.cmake  # Mac Darwin64 universal x86_64;i386
   magrathea_release.cmake     # Linux
-  v20n250_aix_release.cmake   # AIX 5.3
+  ibm_aix_release.cmake       # AIX
   ferrari_sgi64_release.cmake # IRIX 64
   ferrari_sgi_release.cmake   # IRIX
 )
diff --git a/Utilities/Release/v20n250_aix_release.cmake b/Utilities/Release/ibm_aix_release.cmake
similarity index 62%
rename from Utilities/Release/v20n250_aix_release.cmake
rename to Utilities/Release/ibm_aix_release.cmake
index cc8cd05..5a6efe6 100644
--- a/Utilities/Release/v20n250_aix_release.cmake
+++ b/Utilities/Release/ibm_aix_release.cmake
@@ -1,8 +1,7 @@
 set(CMAKE_RELEASE_DIRECTORY "/bench1/noibm34/CMakeReleaseDirectory")
-set(FINAL_PATH /u/noibm34/cmake-release)
-set(PROCESSORS 2)
-set(HOST "sshserv.centers.ihost.com")
-set(EXTRA_HOP "rsh p90n03")
+set(PROCESSORS 64)
+set(HOST "ibm-backend")
+set(SCRIPT_NAME aix)
 set(MAKE_PROGRAM "make")
 set(CC "xlc_r")
 set(CXX "xlC_r")
@@ -12,11 +11,5 @@ set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 ")
-set(EXTRA_COPY "
-rm -rf ~/cmake-release
-mkdir ~/cmake-release
-mv *.sh ~/cmake-release
-mv *.Z ~/cmake-release
-mv *.gz ~/cmake-release")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index a8772ee..7a1652d 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -4,9 +4,6 @@ get_filename_component(SCRIPT_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH)
 if(NOT DEFINED CPACK_BINARY_GENERATORS)
   set(CPACK_BINARY_GENERATORS "STGZ TGZ TZ")
 endif()
-if(DEFINED EXTRA_COPY)
-  set(HAS_EXTRA_COPY 1)
-endif()
 if(NOT DEFINED CMAKE_RELEASE_DIRECTORY)
   set(CMAKE_RELEASE_DIRECTORY "~/CMakeReleaseDirectory")
 endif()
@@ -55,11 +52,11 @@ message("Creating CMake release ${CMAKE_CREATE_VERSION} on ${HOST} with parallel
 macro(remote_command comment command)
   message("${comment}")
   if(${ARGC} GREATER 2)
-    message("ssh ${HOST} ${EXTRA_HOP} ${command}")
-    execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command} RESULT_VARIABLE result INPUT_FILE ${ARGV2})
+    message("ssh ${HOST} ${command}")
+    execute_process(COMMAND ssh ${HOST} ${command} RESULT_VARIABLE result INPUT_FILE ${ARGV2})
   else()
-    message("ssh ${HOST} ${EXTRA_HOP} ${command}")
-    execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command} RESULT_VARIABLE result)
+    message("ssh ${HOST} ${command}")
+    execute_process(COMMAND ssh ${HOST} ${command} RESULT_VARIABLE result)
   endif()
   if(${result} GREATER 0)
     message(FATAL_ERROR "Error running command: ${command}, return value = ${result}")
diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in
index 1f57c28..76fdb3a 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -155,11 +155,6 @@ done
 
 
 
-# need to add an extra copy thing here
-if [ ! -z "@EXTRA_COPY@" ]; then
-    @EXTRA_COPY@
-    check_exit_value $? "Extra copy step @EXTRA_COPY@" || exit 1
-fi
 echo "End release"
 date
 echo ""

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

Summary of changes:
 Utilities/Release/create-cmake-release.cmake              |    2 +-
 .../{v20n250_aix_release.cmake => ibm_aix_release.cmake}  |   13 +++----------
 Utilities/Release/release_cmake.cmake                     |   11 ++++-------
 Utilities/Release/release_cmake.sh.in                     |    5 -----
 4 files changed, 8 insertions(+), 23 deletions(-)
 rename Utilities/Release/{v20n250_aix_release.cmake => ibm_aix_release.cmake} (62%)


hooks/post-receive
-- 
CMake