diff options
Diffstat (limited to 'Utilities/Release')
| -rw-r--r-- | Utilities/Release/Cygwin/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | Utilities/Release/Cygwin/cygwin-package.sh.in | 12 | ||||
| -rw-r--r-- | Utilities/Release/release_cmake.cmake | 14 | ||||
| -rwxr-xr-x | Utilities/Release/release_cmake.sh.in | 14 | ||||
| -rw-r--r-- | Utilities/Release/upload_release.cmake | 2 |
5 files changed, 22 insertions, 22 deletions
diff --git a/Utilities/Release/Cygwin/CMakeLists.txt b/Utilities/Release/Cygwin/CMakeLists.txt index 2420c97..565c9a4 100644 --- a/Utilities/Release/Cygwin/CMakeLists.txt +++ b/Utilities/Release/Cygwin/CMakeLists.txt @@ -4,7 +4,7 @@ FOREACH(f ${INSTALLED_CURSES}) IF(NOT "${f}" MATCHES "\\+") STRING(REGEX REPLACE ".*-([0-9]*).dll" "\\1" NUMBER "${f}") IF(NUMBER GREATER MAX) - SET(MAX ${NUMBER}) + SET(MAX ${NUMBER}) ENDIF(NUMBER GREATER MAX) ENDIF(NOT "${f}" MATCHES "\\+") ENDFOREACH(f) diff --git a/Utilities/Release/Cygwin/cygwin-package.sh.in b/Utilities/Release/Cygwin/cygwin-package.sh.in index 9730b33..dff27f1 100755 --- a/Utilities/Release/Cygwin/cygwin-package.sh.in +++ b/Utilities/Release/Cygwin/cygwin-package.sh.in @@ -4,11 +4,11 @@ TOP_DIR=`cd \`echo "$0" | sed -n '/\//{s/\/[^\/]*$//;p;}'\`;pwd` mkdirs() { ( - mkdir -p "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" + mkdir -p "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" ) } -# cd into +# cd into # untar source tree and apply patch prep() { @@ -23,7 +23,7 @@ prep() conf() { ( - cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" && + cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" && ../bootstrap --parallel=2 ) } @@ -49,8 +49,8 @@ pkg() { ( cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" && - ./bin/cpack && - mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.tar.bz2 "$TOP_DIR" + ./bin/cpack && + mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.tar.bz2 "$TOP_DIR" ) } @@ -59,7 +59,7 @@ spkg() ( cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" && ./bin/cpack --config CPackSourceConfig.cmake && - mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@-src.tar.bz2 "$TOP_DIR" + mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@-src.tar.bz2 "$TOP_DIR" ) } diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index 0c9b3f9..b5b86af 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -48,7 +48,7 @@ endif(NOT HOST) if(NOT DEFINED MAKE) message(FATAL_ERROR "MAKE must be specified with -DMAKE=\"make -j2\"") endif(NOT DEFINED MAKE) - + message("Creating CMake release ${CMAKE_CREATE_VERSION} on ${HOST} with parallel = ${PROCESSORS}") # define a macro to run a remote command @@ -58,8 +58,8 @@ macro(remote_command comment command) 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) + 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}") @@ -80,7 +80,7 @@ ELSE(RUN_LOCAL) "${RUN_SHELL}" ${SCRIPT_FILE}) ENDIF(RUN_LOCAL) -# now figure out which types of packages were created +# now figure out which types of packages were created set(generators ${CPACK_BINARY_GENERATORS} ${CPACK_SOURCE_GENERATORS}) separate_arguments(generators) foreach(gen ${generators}) @@ -114,9 +114,9 @@ endforeach(gen) set(PROJECT_PREFIX cmake-) foreach(suffix ${SUFFIXES}) message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .") - execute_process(COMMAND + execute_process(COMMAND scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} . - RESULT_VARIABLE result) + RESULT_VARIABLE result) if(${result} GREATER 0) message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .") endif(${result} GREATER 0) @@ -126,7 +126,7 @@ endforeach(suffix) if(extra_files) foreach(f ${extra_files}) message("scp ${HOST}:${FINAL_PATH}/${f} .") - execute_process(COMMAND + execute_process(COMMAND scp ${HOST}:${FINAL_PATH}/${f} . RESULT_VARIABLE result) if(${result} GREATER 0) diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in index b5ff6dd..82c039b 100755 --- a/Utilities/Release/release_cmake.sh.in +++ b/Utilities/Release/release_cmake.sh.in @@ -3,7 +3,7 @@ echo "Start release" date echo "" echo "remove and create working directory @CMAKE_RELEASE_DIRECTORY@" -rm -rf @CMAKE_RELEASE_DIRECTORY@ +rm -rf @CMAKE_RELEASE_DIRECTORY@ mkdir @CMAKE_RELEASE_DIRECTORY@ check_exit_value() @@ -12,7 +12,7 @@ check_exit_value() if [ "$VALUE" != "0" ]; then echo "error in $2" exit 1 - fi + fi } if [ ! -z "@CC@" ]; then @@ -77,7 +77,7 @@ if [ ! -z "@USER_OVERRIDE@" ]; then fi echo "Checkout the source for @CMAKE_CREATE_VERSION@" -cd @CMAKE_RELEASE_DIRECTORY@ +cd @CMAKE_RELEASE_DIRECTORY@ if [ ! -z "@GIT_COMMAND@" ]; then # clone the repo without creating any source files in the directory # matching the branch being built (i.e. master CMake-2-8, etc) @@ -97,9 +97,9 @@ else exit 1 fi -cd @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build +cd @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build -if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then +if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then echo "Run cmake to configure cmake" @CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@ check_exit_value $? "Configure cmake" || exit 1 @@ -125,7 +125,7 @@ if [ -z "@SKIP_TESTS@" ]; then check_exit_value $? "Test cmake" || exit 1 fi -# loop over binary generators +# loop over binary generators generators="@CPACK_BINARY_GENERATORS@" for GEN in $generators; do echo "Create $GEN package" @@ -133,7 +133,7 @@ for GEN in $generators; do check_exit_value $? "Create $GEN package" || exit 1 done -# loop over source generators +# loop over source generators generators="@CPACK_SOURCE_GENERATORS@" for GEN in $generators; do echo "Create $GEN package" diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake index bd79296..827e683 100644 --- a/Utilities/Release/upload_release.cmake +++ b/Utilities/Release/upload_release.cmake @@ -19,7 +19,7 @@ set(count 0) foreach(file ${FILES}) if(NOT IS_DIRECTORY ${file}) message("upload ${file} ${UPLOAD_LOC}") - execute_process(COMMAND + execute_process(COMMAND scp ${file} ${UPLOAD_LOC} RESULT_VARIABLE result) if("${result}" GREATER 0) |