diff options
| -rw-r--r-- | Utilities/Release/destiny_release.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Release/release_cmake.cmake | 18 | ||||
| -rwxr-xr-x | Utilities/Release/release_cmake.sh.in | 17 |
3 files changed, 24 insertions, 13 deletions
diff --git a/Utilities/Release/destiny_release.cmake b/Utilities/Release/destiny_release.cmake index 8a5ff64..a9f08ad 100644 --- a/Utilities/Release/destiny_release.cmake +++ b/Utilities/Release/destiny_release.cmake @@ -1,4 +1,6 @@ set(PROCESSORS 1) +set(RUN_SHELL "/usr/local/bin/zsh -l") +set(CVS_COMMAND "/usr/local/bin/cvs") set(HOST destiny) set(MAKE "gmake") set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index 66fff95..9882935 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -1,6 +1,9 @@ set(CVSROOT ":pserver:anonymous@www.cmake.org:/cvsroot/CMake") get_filename_component(SCRIPT_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH) +if(NOT DEFINED RUN_SHELL) + set(RUN_SHELL "/bin/sh") +endif(NOT DEFINED RUN_SHELL) if(NOT DEFINED INSTALLER_SUFFIX) set(INSTALLER_SUFFIX "*.sh") endif(NOT DEFINED INSTALLER_SUFFIX) @@ -33,19 +36,26 @@ message("Creating CMake release ${CMAKE_VERSION} on ${HOST} with parallel = ${PR # define a macro to run a remote command macro(remote_command comment command) message("${comment}") - execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command} RESULT_VARIABLE result) + if(${ARGC} GREATER 2) + message("ssh ${HOST} ${EXTRA_HOP} ${command}") + execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command} RESULT_VARIABLE result INPUT_FILE ${ARGV2}) + else(${ARGC} GREATER 2) + message("ssh ${HOST} ${EXTRA_HOP} ${command}") + execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command} RESULT_VARIABLE result) + endif(${ARGC} GREATER 2) if(${result} GREATER 0) message(FATAL_ERROR "Error running command: ${command}, return value = ${result}") endif(${result} GREATER 0) endmacro(remote_command) set(CMAKE_BACKWARDS_COMPATIBILITY 2.4) -configure_file(${SCRIPT_PATH}/release_cmake.sh.in release_cmake-${HOST}.sh) +configure_file(${SCRIPT_PATH}/release_cmake.sh.in + release_cmake-${HOST}.sh @ONLY) file(READ release_cmake-${HOST}.sh RELEASE_CMAKE_CONTENTS) remote_command("Copy release_cmake-${HOST}.sh to sever" - "echo '${RELEASE_CMAKE_CONTENTS}' > release_cmake-${HOST}.sh") + "tr -d '\\\\015' > release_cmake-${HOST}.sh" release_cmake-${HOST}.sh) -remote_command("Run release script" "sh release_cmake-${HOST}.sh") +remote_command("Run release script" "${RUN_SHELL} release_cmake-${HOST}.sh") message("copy the .gz file back from the machine") execute_process(COMMAND scp ${HOST}:CMakeReleaseDirectory/${CMAKE_VERSION}-build/*.gz . diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in index 3b55bb7..bf8d0c8 100755 --- a/Utilities/Release/release_cmake.sh.in +++ b/Utilities/Release/release_cmake.sh.in @@ -2,17 +2,16 @@ echo "remove and create working directory ~/CMakeReleaseDirectory" rm -rf ~/CMakeReleaseDirectory mkdir ~/CMakeReleaseDirectory - check_exit_value() { VALUE="$1" - if [ "$VALUE" != "0" ]\; then + if [ "$VALUE" != "0" ]; then echo "error in $2" exit 1 fi } -if [ ! -z "@USER_MAKE_RULE_FILE_CONTENTS@" ]\; then +if [ ! -z "@USER_MAKE_RULE_FILE_CONTENTS@" ]; then echo "@USER_MAKE_RULE_FILE_CONTENTS@" > "@USER_MAKE_RULE_FILE@" check_exit_value $? "Create User Rule file" || exit 1 fi @@ -22,29 +21,29 @@ check_exit_value $? "Remove build tree" || exit 1 mkdir ~/CMakeReleaseDirectory/@CMAKE_VERSION@-build check_exit_value $? "Create build directory" || exit 1 # make sure directory was created -if [ ! -d ~/CMakeReleaseDirectory/@CMAKE_VERSION@-build ]\; then +if [ ! -d ~/CMakeReleaseDirectory/@CMAKE_VERSION@-build ]; then echo "Could not create ~/CMakeReleaseDirectory/@CMAKE_VERSION@-build" exit -1 fi echo "Create initial cache" -echo "@INITIAL_CACHE@" > ~/CMakeReleaseDirectory/${CMAKE_VERSION}-build/CMakeCache.txt +echo "@INITIAL_CACHE@" > ~/CMakeReleaseDirectory/@CMAKE_VERSION@-build/CMakeCache.txt check_exit_value $? "Create initial cache" || exit 1 #echo "Login into cvs." -#echo "cmake" | @CVS_COMMAND@ -d ${CVSROOT} login +#echo "cmake" | @CVS_COMMAND@ -d @CVSROOT@ login echo "Checkout the source for @CMAKE_VERSION@" cd ~/CMakeReleaseDirectory -@CMAKE_CHECKOUT@ -d ${CMAKE_VERSION} CMake +@CMAKE_CHECKOUT@ -d @CMAKE_VERSION@ CMake check_exit_value $? "Checkout cmake source" || exit 1 cd ~/CMakeReleaseDirectory/@CMAKE_VERSION@-build echo "Run cmake bootstrap --parallel=@PROCESSORS@" -../${CMAKE_VERSION}/bootstrap --parallel=@PROCESSORS@ +../@CMAKE_VERSION@/bootstrap --parallel=@PROCESSORS@ check_exit_value $? "Bootstrap cmake" || exit 1 -echo "Build cmake with ${MAKE}" +echo "Build cmake with @MAKE@ @MAKE@ check_exit_value $? "Build cmake" || exit 1 |