diff options
| -rw-r--r-- | Utilities/Release/release_cmake.cmake | 4 | ||||
| -rwxr-xr-x | Utilities/Release/release_cmake.sh.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index f5049ea..f458cd8 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -54,9 +54,13 @@ configure_file(${SCRIPT_PATH}/release_cmake.sh.in file(READ release_cmake-${HOST}.sh RELEASE_CMAKE_CONTENTS) remote_command("remove old release_cmake-${HOST}.sh from server" "rm -f release_cmake-${HOST}.sh") + +# copy the release script to the remote server via tr to remove any dos +# line feed stuff in case this was run on a windows box remote_command("Copy release_cmake-${HOST}.sh to sever" "tr -d '\\\\015' > release_cmake-${HOST}.sh" release_cmake-${HOST}.sh) +# now run the script on the remote machine remote_command("Run release script" "${RUN_SHELL} release_cmake-${HOST}.sh") message("copy the .gz file back from the machine") diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in index 7591149..b43df55 100755 --- a/Utilities/Release/release_cmake.sh.in +++ b/Utilities/Release/release_cmake.sh.in @@ -43,7 +43,7 @@ echo "Run cmake 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 |