Commit f0f2b21d authored by Brad King's avatar Brad King
Browse files

Utilities/Release: Update IBM AIX build machine access

parent 71b14dcb
......@@ -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
)
......
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)
......@@ -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}")
......
......@@ -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 ""
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment