From 187976b1f35ee9cca95d67c87f0868f60201dc2b Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Fri, 10 Sep 2010 15:41:27 -0400
Subject: Fix release scripts to be able to build releases from tags.

---
 Utilities/Release/dash2win64_cygwin.cmake | 3 ++-
 Utilities/Release/release_cmake.cmake     | 6 +++++-
 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
-- 
cgit v0.12