浏览代码

move off branch

Bill Hoffman 20 年之前
父节点
当前提交
cd510bf3ac
共有 3 个文件被更改,包括 24 次插入5 次删除
  1. 18 0
      Utilities/Release/MakeRelease.cmake.in
  2. 1 4
      Utilities/Release/README
  3. 5 1
      Utilities/Release/Release.cmake

+ 18 - 0
Utilities/Release/MakeRelease.cmake.in

@@ -13,6 +13,23 @@ SET (SCPID "[email protected]")
 # CVSROOT setting used to check out CMake.
 # CVSROOT setting used to check out CMake.
 SET (CVSROOT ":pserver:[email protected]:/cvsroot/CMake")
 SET (CVSROOT ":pserver:[email protected]:/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
 # build the NSI if requested
 #########################################################################
 #########################################################################
@@ -27,6 +44,7 @@ IF (BUILD_NSIW)
     )
     )
 ENDIF (BUILD_NSIW)
 ENDIF (BUILD_NSIW)
 
 
+
 #########################################################################
 #########################################################################
 # tag the tree if requested
 # tag the tree if requested
 #########################################################################
 #########################################################################

+ 1 - 4
Utilities/Release/README

@@ -1,12 +1,9 @@
 1. Update Version information
 1. Update Version information
   - change version in CMakeLists.txt
   - 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
     - this changes cmake_release.sh
   * for major release edit   Source/cmCPluginAPI.h 
   * 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:
 NOTES from Brad:
 
 

+ 5 - 1
Utilities/Release/Release.cmake

@@ -64,7 +64,7 @@ CONFIGURE_FILE(
 IF (NSIS_MAKENSIS AND WINZIP_WZZIP)
 IF (NSIS_MAKENSIS AND WINZIP_WZZIP)
   # build the NSI
   # build the NSI
   ADD_CUSTOM_TARGET( release
   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
     -P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake
     )
     )
   ADD_CUSTOM_TARGET( release_nsiw
   ADD_CUSTOM_TARGET( release_nsiw
@@ -77,6 +77,10 @@ IF (NSIS_MAKENSIS AND WINZIP_WZZIP)
     )
     )
 ENDIF (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
 ADD_CUSTOM_TARGET( release_tag
   ${CMAKE_COMMAND} -DTAG_TREE=1 
   ${CMAKE_COMMAND} -DTAG_TREE=1 
   -P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake
   -P ${PROJECT_BINARY_DIR}/Utilities/Release/MakeRelease.cmake