[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.19 1.20 svnrepo.tgz 1.1 1.2

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Jun 26 13:00:41 EDT 2009


Update of /cvsroot/CMake/CMake/Tests/ExternalProject
In directory public:/mounts/ram/cvs-serv17092

Modified Files:
	CMakeLists.txt svnrepo.tgz 
Log Message:
BUG: Downgrade svn repository to be created with an svn 1.2 installation (rather than 1.4) so that it works (hopefully) with more svn clients in the wild. Change time stamps of test projects in CMakeLists.txt to reflect times available in newly created repository. Add UPDATE_COMMAND "" for checkouts that are tag-based or date-stamp-based to avoid unnecessary update steps.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** CMakeLists.txt	26 Jun 2009 15:32:04 -0000	1.19
--- CMakeLists.txt	26 Jun 2009 17:00:39 -0000	1.20
***************
*** 136,147 ****
    # CVS by date stamp:
    #
!   set(proj TutorialStep1-CVS-20090625)
    ep_add(${proj}
      CVS_REPOSITORY "${local_cvs_repo}"
      CVS_MODULE "TutorialStep1"
!     CVS_TAG "-D2009-06-25 16:00:00 UTC"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-     UPDATE_COMMAND ""
      INSTALL_COMMAND ""
      DEPENDS "SetupLocalCVSRepository"
--- 136,147 ----
    # CVS by date stamp:
    #
!   set(proj TutorialStep1-CVS-20090626)
    ep_add(${proj}
      CVS_REPOSITORY "${local_cvs_repo}"
      CVS_MODULE "TutorialStep1"
!     CVS_TAG "-D2009-06-26 16:50:00 UTC"
!     UPDATE_COMMAND ""
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
      INSTALL_COMMAND ""
      DEPENDS "SetupLocalCVSRepository"
***************
*** 155,161 ****
      CVS_MODULE "TutorialStep1"
      CVS_TAG -rtesttag1
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-     UPDATE_COMMAND ""
      INSTALL_COMMAND ""
      DEPENDS "SetupLocalCVSRepository"
--- 155,161 ----
      CVS_MODULE "TutorialStep1"
      CVS_TAG -rtesttag1
+     UPDATE_COMMAND ""
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
      INSTALL_COMMAND ""
      DEPENDS "SetupLocalCVSRepository"
***************
*** 177,181 ****
      DEPENDS "TutorialStep1-LocalTGZ"
      DEPENDS "TutorialStep1-LocalNoDirTGZ"
!     DEPENDS "TutorialStep1-CVS-20090625"
      DEPENDS "TutorialStep1-CVS-testtag1"
    )
--- 177,181 ----
      DEPENDS "TutorialStep1-LocalTGZ"
      DEPENDS "TutorialStep1-LocalNoDirTGZ"
!     DEPENDS "TutorialStep1-CVS-20090626"
      DEPENDS "TutorialStep1-CVS-testtag1"
    )
***************
*** 200,207 ****
    # SVN by date stamp:
    #
!   set(proj TutorialStep1-SVN-20090625)
    ep_add(${proj}
      SVN_REPOSITORY "${local_svn_repo_url}"
!     SVN_TAG "-r{2009-06-25 16:00:00 +0000}"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
--- 200,208 ----
    # SVN by date stamp:
    #
!   set(proj TutorialStep1-SVN-20090626)
    ep_add(${proj}
      SVN_REPOSITORY "${local_svn_repo_url}"
!     SVN_TAG "-r{2009-06-26 16:50:00 +0000}"
!     UPDATE_COMMAND ""
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
***************
*** 216,219 ****
--- 217,221 ----
      SVN_REPOSITORY "${local_svn_repo_url}"
      SVN_TAG "-r2"
+     UPDATE_COMMAND ""
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
***************
*** 263,268 ****
  
  if(CVS_EXECUTABLE)
!   add_test(TutorialStep1-CVS-20090625-BuildTreeTest
!     "${binary_base}/TutorialStep1-CVS-20090625/Tutorial" 4)
  
    add_test(TutorialStep1-CVS-testtag1-BuildTreeTest
--- 265,270 ----
  
  if(CVS_EXECUTABLE)
!   add_test(TutorialStep1-CVS-20090626-BuildTreeTest
!     "${binary_base}/TutorialStep1-CVS-20090626/Tutorial" 4)
  
    add_test(TutorialStep1-CVS-testtag1-BuildTreeTest
***************
*** 274,279 ****
  
  if(Subversion_SVN_EXECUTABLE)
!   add_test(TutorialStep1-SVN-20090625-BuildTreeTest
!     "${binary_base}/TutorialStep1-SVN-20090625/Tutorial" 100)
  
    add_test(TutorialStep1-SVN-r2-BuildTreeTest
--- 276,281 ----
  
  if(Subversion_SVN_EXECUTABLE)
!   add_test(TutorialStep1-SVN-20090626-BuildTreeTest
!     "${binary_base}/TutorialStep1-SVN-20090626/Tutorial" 100)
  
    add_test(TutorialStep1-SVN-r2-BuildTreeTest

Index: svnrepo.tgz
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/svnrepo.tgz,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
Binary files /tmp/cvslJ8Nkj and /tmp/cvsdGScK1 differ



More information about the Cmake-commits mailing list