diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2010-09-10 19:41:27 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2010-09-10 19:41:27 (GMT) |
| commit | 187976b1f35ee9cca95d67c87f0868f60201dc2b (patch) | |
| tree | 1a305e69e8af04b8e081806746aa179935a66d44 /Utilities/Release | |
| parent | f2b4a466779f5481c79d711ee2601d60ce41a6ad (diff) | |
| download | CMake-187976b1f35ee9cca95d67c87f0868f60201dc2b.zip CMake-187976b1f35ee9cca95d67c87f0868f60201dc2b.tar.gz CMake-187976b1f35ee9cca95d67c87f0868f60201dc2b.tar.bz2 | |
Fix release scripts to be able to build releases from tags.
Diffstat (limited to 'Utilities/Release')
| -rw-r--r-- | Utilities/Release/dash2win64_cygwin.cmake | 3 | ||||
| -rw-r--r-- | Utilities/Release/release_cmake.cmake | 6 | ||||
| -rwxr-xr-x | Utilities/Release/release_cmake.sh.in | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake index d866896..64099a9 100644 --- a/Utilities/Release/dash2win64_cygwin.cmake +++ b/Utilities/Release/dash2win64_cygwin.cmake @@ -6,12 +6,13 @@ set(HOST dash2win64) set(CPACK_BINARY_GENERATORS "CygwinBinary") set(CPACK_SOURCE_GENERATORS "CygwinSource") set(MAKE_PROGRAM "make") -set(CVS_COMMAND /usr/bin/cvs) set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE ") set(CXX g++) set(CC gcc) set(SCRIPT_NAME dash2win64cygwin) +set(GIT_COMMAND git) +set(GIT_EXTRA "git config core.autocrlf true") 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 6fd1372..9a2ede7 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -34,7 +34,11 @@ if(NOT DEFINED CVS_COMMAND) set(CVS_COMMAND cvs) endif(NOT DEFINED CVS_COMMAND) -set(GIT_BRANCH ${CMAKE_CREATE_VERSION}) +if(${GIT_CREATE_VERSION} MATCHES "^(release|maint)$") + set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION}) +else() + set(GIT_BRANCH ${CMAKE_CREATE_VERSION}) +endif() set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -d ${CVSROOT} co -d ${CMAKE_CREATE_VERSION} ${CMAKE_CREATE_VERSION}") diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in index 4189728..8455e92 100755 --- a/Utilities/Release/release_cmake.sh.in +++ b/Utilities/Release/release_cmake.sh.in @@ -89,7 +89,7 @@ if [ ! -z "@GIT_COMMAND@" ]; then @GIT_EXTRA@ check_exit_value $? "git extra cmake source" || exit 1 # now checkout a copy on the local branch working - @GIT_COMMAND@ checkout -b working origin/@GIT_BRANCH@ + @GIT_COMMAND@ checkout -b working @GIT_BRANCH@ check_exit_value $? "git checkout" || exit 1 cd .. else |