[Cmake-commits] [cmake-commits] king committed CTest.cmake 1.15 1.16

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv7609/Modules

Modified Files:
	CTest.cmake 
Log Message:
ENH: Teach CTest to handle Bazaar repositories

This creates cmCTestBZR to drive CTest Update handling on bzr-based work
trees.  Currently we always update to the head of the remote tracking
branch (bzr pull), so the nightly start time is ignored for Nightly
builds.  A later change will address this.  Patch from Tom Vercauteren.
See issue #6857.


Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** CTest.cmake	10 May 2009 10:01:59 -0000	1.15
--- CTest.cmake	14 May 2009 20:13:50 -0000	1.16
***************
*** 105,108 ****
--- 105,109 ----
      "Options passed to the cvs update command.")
    FIND_PROGRAM(SVNCOMMAND svn)
+   FIND_PROGRAM(BZRCOMMAND bzr)
  
    IF(NOT UPDATE_TYPE)
***************
*** 112,115 ****
--- 113,120 ----
        IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
          SET(UPDATE_TYPE svn)
+       ELSE(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
+         IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
+           SET(UPDATE_TYPE bzr)
+         ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
        ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
      ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS")
***************
*** 131,134 ****
--- 136,144 ----
        SET(UPDATE_COMMAND "${SVNCOMMAND}")
        SET(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}")
+     ELSE("${_update_type}" STREQUAL "svn")
+       IF("${_update_type}" STREQUAL "bzr")
+         SET(UPDATE_COMMAND "${BZRCOMMAND}")
+         SET(UPDATE_OPTIONS "${BZR_UPDATE_OPTIONS}")
+       ENDIF("${_update_type}" STREQUAL "bzr")
      ENDIF("${_update_type}" STREQUAL "svn")
    ENDIF("${_update_type}" STREQUAL "cvs")
***************
*** 208,213 ****
--- 218,225 ----
      CVSCOMMAND
      SVNCOMMAND
+     BZRCOMMAND
      CVS_UPDATE_OPTIONS
      SVN_UPDATE_OPTIONS
+     BZR_UPDATE_OPTIONS
      MAKECOMMAND 
      MEMORYCHECK_COMMAND