[Cmake-commits] CMake branch, next, updated. v2.8.3-1256-g2c0f00c

[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  2c0f00cf382008ab04fd95feddb4974cef2c70d0 (commit)
       via  faf1c1e49f46fda171541d9f08efaf225457edc5 (commit)
      from  91ff6bcf1da227154d8c6c54f06553808c61d3da (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=2c0f00cf382008ab04fd95feddb4974cef2c70d0
commit 2c0f00cf382008ab04fd95feddb4974cef2c70d0
Merge: 91ff6bc faf1c1e
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jan 7 13:53:20 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 7 13:53:20 2011 -0500

    Merge topic 'build_nightly_from_nightly_branch' into next
    
    faf1c1e Change the nightly tests to build from the nightly branch and not next.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faf1c1e49f46fda171541d9f08efaf225457edc5
commit faf1c1e49f46fda171541d9f08efaf225457edc5
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jan 7 13:50:36 2011 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Jan 7 13:50:36 2011 -0500

    Change the nightly tests to build from the nightly branch and not next.
    
    This will make sure that the nightly test matches the dashboard nightly section.
    When it was next, it used next from when the test was run.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index faaa177..404bacf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -321,7 +321,7 @@ IF(BUILD_TESTING)
     FILE(MAKE_DIRECTORY "${_TEST_DIR}")
     FILE(WRITE "${_TEST_DIR}/nightly-cmake.sh"
       "cd ${_TEST_DIR}
-${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=next -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
+${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script}
 ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake
     ")
     ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index 3a35ec3..939d9dc 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -34,7 +34,7 @@ if(NOT DEFINED CVS_COMMAND)
   set(CVS_COMMAND cvs)
 endif(NOT DEFINED CVS_COMMAND)
 
-if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next)$")
+if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next|nightly)$")
   set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION})
 else()
   set(GIT_BRANCH ${CMAKE_CREATE_VERSION})

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

Summary of changes:
 Tests/CMakeLists.txt                  |    2 +-
 Utilities/Release/release_cmake.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake