summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-09-16 14:57:11 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-09-16 14:57:11 (GMT)
commitcd510bf3ac1599b183b14e954dc273eae874d6a3 (patch)
tree9a439887500b8be37cc7d347d13024817b5d6a6e
parentefeffc52ced901abdd8632462c46afe5f90029c9 (diff)
downloadCMake-cd510bf3ac1599b183b14e954dc273eae874d6a3.zip
CMake-cd510bf3ac1599b183b14e954dc273eae874d6a3.tar.gz
CMake-cd510bf3ac1599b183b14e954dc273eae874d6a3.tar.bz2
move off branch
-rw-r--r--Utilities/Release/MakeRelease.cmake.in18
-rw-r--r--Utilities/Release/README5
-rw-r--r--Utilities/Release/Release.cmake6
3 files changed, 24 insertions, 5 deletions
diff --git a/Utilities/Release/MakeRelease.cmake.in b/Utilities/Release/MakeRelease.cmake.in
index f45f6f9..fbfaef9 100644
--- a/Utilities/Release/MakeRelease.cmake.in
+++ b/Utilities/Release/MakeRelease.cmake.in
@@ -14,6 +14,23 @@ SET (SCPID "kitware@public.kitware.com")
SET (CVSROOT ":pserver:anoncvs@www.cmake.org:/cvsroot/CMake")
#########################################################################
+# commit the configured release.sh file
+#########################################################################
+IF (COMMIT_UNIX_SCRIPT)
+ # first copy the file
+ EXEC_PROGRAM(${CMAKE_COMMAND} "@PROJECT_SOURCE_DIR@"
+ ARGS -E copy
+ "@PROJECT_BINARY_DIR@/Utilities/Release/cmake_release.sh"
+ "@PROJECT_SOURCE_DIR@/Utilities/Release"
+ )
+ # then commit it
+ EXEC_PROGRAM(cvs "@PROJECT_SOURCE_DIR@"
+ ARGS commit -m \"ENH: update revision numbers\"
+ "@PROJECT_SOURCE_DIR@/Utilities/Release/cmake_release.sh"
+ )
+ENDIF (COMMIT_UNIX_SCRIPT)
+
+#########################################################################
# build the NSI if requested
#########################################################################
IF (BUILD_NSIW)
@@ -27,6 +44,7 @@ IF (BUILD_NSIW)
)
ENDIF (BUILD_NSIW)
+
#########################################################################
# tag the tree if requested
#########################################################################
diff --git a/Utilities/Release/README b/Utilities/Release/README
index d128cf3..ade4318 100644
--- a/Utilities/Release/README
+++ b/Utilities/Release/README
@@ -1,12 +1,9 @@
1. Update Version information
- change version in CMakeLists.txt
- - build on windows, and do a make; make install; make release
+ - build on windows, and do a make; make install; make release // this step tags
- this changes cmake_release.sh
* for major release edit Source/cmCPluginAPI.h
-2. tag the release
-cvs co -r CMake-2-0 # checkout current release branch
-cvs tag CMake-2-0-3 # tag with minor version number
NOTES from Brad:
diff --git a/Utilities/Release/Release.cmake b/Utilities/Release/Release.cmake
index 01203f4..2a2f136 100644
--- a/Utilities/Release/Release.cmake
+++ b/Utilities/Release/Release.cmake
@@ -64,7 +64,7 @@ CONFIGURE_FILE(
IF (NSIS_MAKENSIS AND WINZIP_WZZIP)
# build the NSI
ADD_CUSTOM_TARGET( release
- ${CMAKE_COMMAND} -DBUILD_NSIW=1 -DTAG_TREE=1 -DBUILD_WINZIP=1
+ ${CMAKE_COMMAND} -DBUILD_NSIW=1 -DCOMMIT_UNIX_SCRIPT=1 -DTAG_TREE=1 -DBUILD_WINZIP=1
-P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake
)
ADD_CUSTOM_TARGET( release_nsiw
@@ -77,6 +77,10 @@ IF (NSIS_MAKENSIS AND WINZIP_WZZIP)
)
ENDIF (NSIS_MAKENSIS AND WINZIP_WZZIP)
+ADD_CUSTOM_TARGET( release_commit_unix
+ ${CMAKE_COMMAND} -DCOMMIT_UNIX_SCRIPT=1
+ -P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake
+ )
ADD_CUSTOM_TARGET( release_tag
${CMAKE_COMMAND} -DTAG_TREE=1
-P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake