kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix release scripts to be able to build releases from tags.

This commit is contained in:
Bill Hoffman 2010-09-10 15:41:27 -04:00
parent f2b4a46677
commit 187976b1f3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Utilities/Release/dash2win64_cygwin.cmake
View File

@ -6,12 +6,13 @@ set(HOST dash2win64)
set(CPACK_BINARY_GENERATORS "CygwinBinary") set(CPACK_BINARY_GENERATORS "CygwinBinary")
set(CPACK_SOURCE_GENERATORS "CygwinSource") set(CPACK_SOURCE_GENERATORS "CygwinSource")
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(CVS_COMMAND /usr/bin/cvs)
set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE
") ")
set(CXX g++) set(CXX g++)
set(CC gcc) set(CC gcc)
set(SCRIPT_NAME dash2win64cygwin) 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) get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake) include(${path}/release_cmake.cmake)

6
Utilities/Release/release_cmake.cmake
View File

@ -34,7 +34,11 @@ if(NOT DEFINED CVS_COMMAND)
set(CVS_COMMAND cvs) set(CVS_COMMAND cvs)
endif(NOT DEFINED CVS_COMMAND) 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}") set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -d ${CVSROOT} co -d ${CMAKE_CREATE_VERSION} ${CMAKE_CREATE_VERSION}")

2
Utilities/Release/release_cmake.sh.in
View File

@ -89,7 +89,7 @@ if [ ! -z "@GIT_COMMAND@" ]; then
@GIT_EXTRA@ @GIT_EXTRA@
check_exit_value $? "git extra cmake source" || exit 1 check_exit_value $? "git extra cmake source" || exit 1
# now checkout a copy on the local branch working # 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 check_exit_value $? "git checkout" || exit 1
cd .. cd ..
else else