diff --git a/Utilities/Release/MakeRelease.cmake.in b/Utilities/Release/MakeRelease.cmake.in index 4718ac901..18b766f74 100644 --- a/Utilities/Release/MakeRelease.cmake.in +++ b/Utilities/Release/MakeRelease.cmake.in @@ -13,30 +13,39 @@ SET (SCPID "kitware@public.kitware.com") # CVSROOT setting used to check out CMake. SET (CVSROOT ":pserver:anoncvs@www.cmake.org:/cvsroot/CMake") -# build the NSI -EXEC_PROGRAM("@NSIS_MAKENSIS@" - ARGS "@PROJECT_BINARY_DIR@/Utilities/Release/@PROJECT_NAME@.nsi" -) +######################################################################### +# build the NSI if requested +######################################################################### +IF (BUILD_NSIW) + EXEC_PROGRAM("@NSIS_MAKENSIS@" + ARGS "@PROJECT_BINARY_DIR@/Utilities/Release/@PROJECT_NAME@.nsi" + ) + # copy the NSI to the FTP site + EXEC_PROGRAM(scp + ARGS cmake-${VERSION}-win32.exe + ${SCPID}:/projects/FTP/pub/cmake/v@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@ + ) +ENDIF (BUILD_NSIW) -# copy the NSI to the FTP site -EXEC_PROGRAM(scp - ARGS cmake-${VERSION}-win32.exe - ${SCPID}:/projects/FTP/pub/cmake/v@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@ - ) - -# tag the tree -EXEC_PROGRAM(cvs "@PROJECT_SOURCE_DIR@" - ARGS tag -F ${TAG}) +######################################################################### +# tag the tree if requested +######################################################################### +IF (TAG_TREE) + EXEC_PROGRAM(cvs "@PROJECT_SOURCE_DIR@" + ARGS tag -F ${TAG}) +ENDIF (TAG_TREE) +######################################################################### # build the winzip src file and copy it over -EXEC_PROGRAM(rm C:/ - ARGS -rf @PROJECT_NAME@ -) -EXEC_PROGRAM(cvs C:/ - ARGS -d ${CVSROOT} export -r ${TAG} @PROJECT_NAME@) -EXEC_PROGRAM("@WINZIP_WZZIP@" "C:/@PROJECT_NAME@" - ARGS -r -P cmake-${VERSION}.zip) -EXEC_PROGRAM(scp "C:/@PROJECT_NAME@" - ARGS cmake-${VERSION}.zip - ${SCPID}:/projects/FTP/pub/cmake/v@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@ - ) +######################################################################### +IF (BUILD_WINZIP) + EXEC_PROGRAM(rm C:/ ARGS -rf @PROJECT_NAME@ ) + EXEC_PROGRAM(cvs C:/ + ARGS -d ${CVSROOT} export -r ${TAG} @PROJECT_NAME@) + EXEC_PROGRAM("@WINZIP_WZZIP@" "C:/@PROJECT_NAME@" + ARGS -r -P cmake-${VERSION}.zip) + EXEC_PROGRAM(scp "C:/@PROJECT_NAME@" + ARGS cmake-${VERSION}.zip + ${SCPID}:/projects/FTP/pub/cmake/v@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@ + ) +ENDIF (BUILD_WINZIP) diff --git a/Utilities/Release/Release.cmake b/Utilities/Release/Release.cmake index dadec4563..943cb6d39 100644 --- a/Utilities/Release/Release.cmake +++ b/Utilities/Release/Release.cmake @@ -63,7 +63,15 @@ ENDIF(WIN32) IF (NSIS_MAKENSIS AND WINZIP_WZZIP) # build the NSI ADD_CUSTOM_TARGET( release - ${CMAKE_COMMAND} -P - ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake + ${CMAKE_COMMAND} -DBUILD_NSIW=1 -DTAG_TREE=1 -DBUILD_WINZIP=1 + -P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake + ) + ADD_CUSTOM_TARGET( release_nsiw + ${CMAKE_COMMAND} -DBUILD_NSIW=1 + -P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake + ) + ADD_CUSTOM_TARGET( release_winzip + ${CMAKE_COMMAND} -DBUILD_WINZIP=1 + -P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake ) ENDIF (NSIS_MAKENSIS AND WINZIP_WZZIP)