[Cmake-commits] CMake branch, next, updated. v2.8.2-747-g561f2eb

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  561f2eb4beb12587018bca4bff99b8acfc9f561f (commit)
       via  187976b1f35ee9cca95d67c87f0868f60201dc2b (commit)
      from  dbf7899e504f00efbc5fb0e65ebceba48d86845e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=561f2eb4beb12587018bca4bff99b8acfc9f561f
commit 561f2eb4beb12587018bca4bff99b8acfc9f561f
Merge: dbf7899 187976b
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Sep 10 15:48:56 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 10 15:48:56 2010 -0400

    Merge topic 'fix_release_tags' into next
    
    187976b Fix release scripts to be able to build releases from tags.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=187976b1f35ee9cca95d67c87f0868f60201dc2b
commit 187976b1f35ee9cca95d67c87f0868f60201dc2b
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Sep 10 15:41:27 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Sep 10 15:41:27 2010 -0400

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

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

-----------------------------------------------------------------------

Summary of changes:
 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(-)


hooks/post-receive
-- 
CMake