diff --git a/Utilities/Release/dashsun1_release.cmake b/Utilities/Release/dashsun1_release.cmake index ed435fbb9..f98795d9d 100644 --- a/Utilities/Release/dashsun1_release.cmake +++ b/Utilities/Release/dashsun1_release.cmake @@ -13,6 +13,6 @@ CMAKE_USER_MAKE_RULES_OVERRIDE:STRING=${USER_MAKE_RULE_FILE} CURSES_LIBRARY:FILEPATH=/usr/lib/libcurses.a FORM_LIBRARY:FILEPATH=/usr/lib/libform.a") set(USER_MAKE_RULE_FILE_CONTENTS - "SET(CMAKE_DL_LIBS \\\\\"-Bdynamic -ldl -Bstatic\\\\\")") + "SET(CMAKE_DL_LIBS \\\"-Bdynamic -ldl -Bstatic\\\")") 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 65791f98c..208094677 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -7,6 +7,9 @@ endif(DEFINED EXTRA_COPY) if(NOT DEFINED CMAKE_RELEASE_DIRECTORY) set(CMAKE_RELEASE_DIRECTORY "~/CMakeReleaseDirectory") endif(NOT DEFINED CMAKE_RELEASE_DIRECTORY) +if(NOT DEFINED FINAL_PATH ) + set(FINAL_PATH ${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build) +endif(NOT DEFINED FINAL_PATH ) if(NOT DEFINED SCRIPT_NAME) set(SCRIPT_NAME "${HOST}") endif(NOT DEFINED SCRIPT_NAME) @@ -75,12 +78,12 @@ remote_command("run release_cmake-${HOST}.sh on server" "${RUN_SHELL}" ${SCRIPT_FILE}) message("copy the .gz file back from the machine") -message("scp ${HOST}:${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build/*.gz .") -execute_process(COMMAND scp ${HOST}:${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build/*.gz . +message("scp ${HOST}:${FINAL_PATH}/*.gz .") +execute_process(COMMAND scp ${HOST}:${FINAL_PATH}/*.gz . RESULT_VARIABLE result) message("copy the ${INSTALLER_SUFFIX} file back from the machine") -message("scp ${HOST}:${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build/${INSTALLER_SUFFIX} .") -execute_process(COMMAND scp ${HOST}:${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build/${INSTALLER_SUFFIX} . +message("scp ${HOST}:${FINAL_PATH}/${INSTALLER_SUFFIX} .") +execute_process(COMMAND scp ${HOST}:${FINAL_PATH}/${INSTALLER_SUFFIX} . RESULT_VARIABLE result) diff --git a/Utilities/Release/v60n177_aix_release.cmake b/Utilities/Release/v60n177_aix_release.cmake index c876526ca..14f5a7c64 100644 --- a/Utilities/Release/v60n177_aix_release.cmake +++ b/Utilities/Release/v60n177_aix_release.cmake @@ -1,4 +1,5 @@ set(CMAKE_RELEASE_DIRECTORY "/bench1/noibm34/CMakeReleaseDirectory" ) +set(FINAL_PATH /u/noibm34) set(PROCESSORS 2) set(CVS_COMMAND /vol/local/bin/cvs) set(HOST "sshserv.centers.ihost.com" )