9 files changed, 28 insertions, 20 deletions
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 682ab1d..66753ce 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -8,7 +8,7 @@ set(RELEASE_SCRIPTS
   destiny_release.cmake       # HPUX
   magrathea_release.cmake     # Linux
   dash2win64_release.cmake    # Windows
-  dash2win64_cygwin.cmake     # Cygwin
+#  dash2win64_cygwin.cmake     # Cygwin
 #  blight_cygwin.cmake     # Cygwin
   v20n250_aix_release.cmake    # AIX 5.3
 #  vogon_cygwin.cmake          # Cygwin
diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake
index b71f53d..d866896 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/dash2win64_cygwin.cmake
@@ -12,5 +12,6 @@ CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE
 ")
 set(CXX g++)
 set(CC  gcc)
+set(SCRIPT_NAME dash2win64cygwin)
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index b1fd388..5bec13a 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -15,4 +15,6 @@ BUILD_QtDialog:BOOL:=TRUE
 QT_QMAKE_EXECUTABLE:FILEPATH=c:/Dashboards/Support/qt-4.5.3-static/bin/qmake.exe
 ")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(GIT_COMMAND git)
+set(GIT_EXTRA "git config core.autocrlf true")
 include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/destiny_release.cmake b/Utilities/Release/destiny_release.cmake
index 06cc601..886909f 100644
--- a/Utilities/Release/destiny_release.cmake
+++ b/Utilities/Release/destiny_release.cmake
@@ -1,5 +1,4 @@
 set(PROCESSORS 1)
-set(CVSROOT ":pserver:anonymous@www.cmake.org:/cvsroot/CMake")
 set(RUN_SHELL "/usr/local/bin/zsh -l -c /bin/sh")
 set(CVS_COMMAND "/usr/local/bin/cvs")
 set(HOST destiny)
diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/magrathea_release.cmake
index 14a4935..549460e 100644
--- a/Utilities/Release/magrathea_release.cmake
+++ b/Utilities/Release/magrathea_release.cmake
@@ -1,5 +1,4 @@
 set(PROCESSORS 1)
-set(CVSROOT ":pserver:anonymous@www.cmake.org:/cvsroot/CMake")
 set(HOST magrathea)
 set(MAKE_PROGRAM "make")
 set(CC gcc332s)
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index 91e2501..6fd1372 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -1,6 +1,4 @@
-if(NOT DEFINED CVSROOT)
-  set(CVSROOT ":pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake")
-endif()
+set(CVSROOT ":pserver:anonymous@cmake.org:/cmake.git")
 
 get_filename_component(SCRIPT_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
@@ -36,12 +34,9 @@ if(NOT DEFINED CVS_COMMAND)
   set(CVS_COMMAND cvs)
 endif(NOT DEFINED CVS_COMMAND)
 
-if("${CMAKE_CREATE_VERSION}" STREQUAL "CVS")
-  set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -z3 -d ${CVSROOT} export -D now ")
-  set( CMAKE_CREATE_VERSION "CurrentCVS")
-else("${CMAKE_CREATE_VERSION}" STREQUAL "CVS")
-  set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -z3 -d ${CVSROOT} export -r ${CMAKE_CREATE_VERSION} ")
-endif("${CMAKE_CREATE_VERSION}" STREQUAL "CVS")
+set(GIT_BRANCH ${CMAKE_CREATE_VERSION})
+set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -d ${CVSROOT} co -d ${CMAKE_CREATE_VERSION} ${CMAKE_CREATE_VERSION}")
+
 
 if(NOT DEFINED FINAL_PATH )
   set(FINAL_PATH ${CMAKE_RELEASE_DIRECTORY}/${CMAKE_CREATE_VERSION}-build)
@@ -72,7 +67,6 @@ macro(remote_command comment command)
 endmacro(remote_command)
 
 # set this so configure file will work from script mode
-set(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
 # create the script specific for the given host
 set(SCRIPT_FILE release_cmake-${SCRIPT_NAME}.sh)
 configure_file(${SCRIPT_PATH}/release_cmake.sh.in ${SCRIPT_FILE} @ONLY)
diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in
index 1e8b30d..e4c466c 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -69,13 +69,28 @@ echo "Create initial cache"
 echo "@INITIAL_CACHE@" > @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build/CMakeCache.txt
 check_exit_value $? "Create initial cache" || exit 1
 
-#echo "Login into cvs."
-#echo "cmake" | @CVS_COMMAND@ -d @CVSROOT@ login
-
 echo "Checkout the source for @CMAKE_CREATE_VERSION@"
 cd @CMAKE_RELEASE_DIRECTORY@ 
-@CMAKE_CHECKOUT@ -d @CMAKE_CREATE_VERSION@ CMake
-check_exit_value $? "Checkout cmake source" || exit 1
+if [ ! -z "@GIT_COMMAND@" ]; then
+   # clone the repo without creating any source files in the directory
+   # matching the branch being built (i.e. master CMake-2-8, etc)
+   @GIT_COMMAND@ clone -n git://cmake.org/cmake-tmp.git @CMAKE_CREATE_VERSION@
+   check_exit_value $? "Checkout git cmake source" || exit 1
+   # go into the git directory
+   cd @CMAKE_CREATE_VERSION@
+   # run any extra commands if they exist
+   @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@
+   check_exit_value $? "git checkout" || exit 1
+   cd ..
+else
+   # for CVS just run the CMAKE_CHECKOUT command as set
+   # in release_cmake.cmake
+   @CMAKE_CHECKOUT@
+   check_exit_value $? "CVS Checkout cmake source" || exit 1
+fi
 
 cd @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build 
 
diff --git a/Utilities/Release/v20n17_aix_release.cmake b/Utilities/Release/v20n17_aix_release.cmake
index a169817..b7494bb 100644
--- a/Utilities/Release/v20n17_aix_release.cmake
+++ b/Utilities/Release/v20n17_aix_release.cmake
@@ -1,5 +1,4 @@
 set(CMAKE_RELEASE_DIRECTORY "/bench1/noibm34/CMakeReleaseDirectory" )
-set(CVSROOT ":pserver:anonymous@www.cmake.org:/cvsroot/CMake")
 set(FINAL_PATH /u/noibm34/cmake-release)
 set(PROCESSORS 2)
 set(CVS_COMMAND /vol/local/bin/cvs)
diff --git a/Utilities/Release/v20n250_aix_release.cmake b/Utilities/Release/v20n250_aix_release.cmake
index 8fbf19f..876c84d 100644
--- a/Utilities/Release/v20n250_aix_release.cmake
+++ b/Utilities/Release/v20n250_aix_release.cmake
@@ -1,5 +1,4 @@
 set(CMAKE_RELEASE_DIRECTORY "/bench1/noibm34/CMakeReleaseDirectory" )
-set(CVSROOT ":pserver:anonymous@www.cmake.org:/cvsroot/CMake")
 set(FINAL_PATH /u/noibm34/cmake-release)
 set(PROCESSORS 2)
 set(CVS_COMMAND /vol/local/bin/cvs)