[Cmake-commits] CMake branch, dashboard, updated. a4ea3465dbeb9e7435cb6c072c7c93035dd677f7
Brad King
brad.king at kitware.com
Tue Sep 18 08:15:09 EDT 2012
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, dashboard has been updated
via a4ea3465dbeb9e7435cb6c072c7c93035dd677f7 (commit)
via dc9816acd185b45e11ea0ae85a3447a0be9d2607 (commit)
from 849820219e84e251ad99121f738456f3743ba4fa (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=a4ea3465dbeb9e7435cb6c072c7c93035dd677f7
commit a4ea3465dbeb9e7435cb6c072c7c93035dd677f7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 14 08:41:12 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 14 08:45:33 2012 -0400
cmake_common: Initialize summary output string
diff --git a/cmake_common.cmake b/cmake_common.cmake
index 3e638f1..3b47fea 100644
--- a/cmake_common.cmake
+++ b/cmake_common.cmake
@@ -268,6 +268,7 @@ foreach(req
endforeach(req)
# Print summary information.
+set(vars "")
foreach(v
CTEST_SITE
CTEST_BUILD_NAME
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc9816acd185b45e11ea0ae85a3447a0be9d2607
commit dc9816acd185b45e11ea0ae85a3447a0be9d2607
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 13 10:45:50 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 14 08:45:01 2012 -0400
cmake_common: Require CTest 2.8.2 and always use Git
Remove remnants of dual CVS/Git support. Remove information duplicated
from CTestConfig.cmake that was needed to work around CTest delayed
initialization problems fixed as of 2.8.2.
diff --git a/cmake_common.cmake b/cmake_common.cmake
index 2d7091a..3e638f1 100644
--- a/cmake_common.cmake
+++ b/cmake_common.cmake
@@ -40,8 +40,7 @@
# CTEST_TEST_ARGS = ctest_test args (ex: PARALLEL_LEVEL 4)
# CMAKE_MAKE_PROGRAM = Path to "make" tool to use
#
-# Options to configure builds from experimental git repository:
-# dashboard_use_git_repo = Whether to use experimental git repository
+# Options to configure Git:
# dashboard_git_url = Custom git clone url
# dashboard_git_branch = Custom remote branch to track
# dashboard_git_crlf = Value of core.autocrlf for repository
@@ -87,7 +86,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-cmake_minimum_required(VERSION 2.6.3 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
set(CTEST_PROJECT_NAME CMake)
set(dashboard_user_home "$ENV{HOME}")
@@ -133,41 +132,34 @@ if(NOT CTEST_TEST_TIMEOUT)
set(CTEST_TEST_TIMEOUT 1500)
endif()
-set(dashboard_use_git_repo 1)
-if(dashboard_use_git_repo)
- # Select Git source to use.
- if(NOT DEFINED dashboard_git_url)
- set(dashboard_git_url "git://cmake.org/cmake.git")
- endif()
- if(NOT DEFINED dashboard_git_branch)
- if("${dashboard_model}" STREQUAL "Nightly")
- set(dashboard_git_branch nightly)
- else()
- set(dashboard_git_branch next)
- endif()
- endif()
- if(NOT DEFINED dashboard_git_crlf)
- if(UNIX)
- set(dashboard_git_crlf false)
- else(UNIX)
- set(dashboard_git_crlf true)
- endif(UNIX)
- endif()
-
- # Look for a GIT command-line client.
- if(NOT DEFINED CTEST_GIT_COMMAND)
- find_program(CTEST_GIT_COMMAND
- NAMES git git.cmd
- PATH_SUFFIXES Git/cmd Git/bin
- )
+# Select Git source to use.
+if(NOT DEFINED dashboard_git_url)
+ set(dashboard_git_url "git://cmake.org/cmake.git")
+endif()
+if(NOT DEFINED dashboard_git_branch)
+ if("${dashboard_model}" STREQUAL "Nightly")
+ set(dashboard_git_branch nightly)
+ else()
+ set(dashboard_git_branch next)
endif()
+endif()
+if(NOT DEFINED dashboard_git_crlf)
+ if(UNIX)
+ set(dashboard_git_crlf false)
+ else(UNIX)
+ set(dashboard_git_crlf true)
+ endif(UNIX)
+endif()
- # Use git only if driving CTest is at least 2.8.0.
- if("${CMAKE_VERSION}" VERSION_LESS 2.8)
- set(CTEST_GIT_COMMAND "")
- endif()
-else()
- set(CTEST_GIT_COMMAND "")
+# Look for a GIT command-line client.
+if(NOT DEFINED CTEST_GIT_COMMAND)
+ find_program(CTEST_GIT_COMMAND
+ NAMES git git.cmd
+ PATH_SUFFIXES Git/cmd Git/bin
+ )
+endif()
+if(NOT CTEST_GIT_COMMAND)
+ message(FATAL_ERROR "CTEST_GIT_COMMAND not available!")
endif()
# Select a source directory name.
@@ -190,20 +182,18 @@ endif()
# Delete source tree if it is incompatible with current VCS.
if(EXISTS ${CTEST_SOURCE_DIRECTORY})
- if(CTEST_GIT_COMMAND)
- if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}/.git")
- set(vcs_refresh "because it is not managed by git.")
- else()
- execute_process(
- COMMAND ${CTEST_GIT_COMMAND} reset --hard
- WORKING_DIRECTORY "${CTEST_SOURCE_DIRECTORY}"
- OUTPUT_VARIABLE output
- ERROR_VARIABLE output
- RESULT_VARIABLE failed
- )
- if(failed)
- set(vcs_refresh "because its .git may be corrupted.")
- endif()
+ if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}/.git")
+ set(vcs_refresh "because it is not managed by git.")
+ else()
+ execute_process(
+ COMMAND ${CTEST_GIT_COMMAND} reset --hard
+ WORKING_DIRECTORY "${CTEST_SOURCE_DIRECTORY}"
+ OUTPUT_VARIABLE output
+ ERROR_VARIABLE output
+ RESULT_VARIABLE failed
+ )
+ if(failed)
+ set(vcs_refresh "because its .git may be corrupted.")
endif()
endif()
if(vcs_refresh AND "${CTEST_SOURCE_DIRECTORY}" MATCHES "/CMake[^/]*")
@@ -216,22 +206,21 @@ endif()
if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}"
AND NOT DEFINED CTEST_CHECKOUT_COMMAND)
get_filename_component(_name "${CTEST_SOURCE_DIRECTORY}" NAME)
- if(CTEST_GIT_COMMAND)
- execute_process(COMMAND ${CTEST_GIT_COMMAND} --version OUTPUT_VARIABLE output)
- string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+(\\.g[0-9a-f]+)?)?" GIT_VERSION "${output}")
- if(NOT "${GIT_VERSION}" VERSION_LESS "1.6.5")
- # Have "git clone -b <branch>" option.
- set(git_branch_new "-b ${dashboard_git_branch}")
- set(git_branch_old)
- else()
- # No "git clone -b <branch>" option.
- set(git_branch_new)
- set(git_branch_old "-b ${dashboard_git_branch} origin/${dashboard_git_branch}")
- endif()
+ execute_process(COMMAND ${CTEST_GIT_COMMAND} --version OUTPUT_VARIABLE output)
+ string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+(\\.g[0-9a-f]+)?)?" GIT_VERSION "${output}")
+ if(NOT "${GIT_VERSION}" VERSION_LESS "1.6.5")
+ # Have "git clone -b <branch>" option.
+ set(git_branch_new "-b ${dashboard_git_branch}")
+ set(git_branch_old)
+ else()
+ # No "git clone -b <branch>" option.
+ set(git_branch_new)
+ set(git_branch_old "-b ${dashboard_git_branch} origin/${dashboard_git_branch}")
+ endif()
- # Generate an initial checkout script.
- set(ctest_checkout_script ${CTEST_DASHBOARD_ROOT}/${_name}-init.cmake)
- file(WRITE ${ctest_checkout_script} "# git repo init script for ${_name}
+ # Generate an initial checkout script.
+ set(ctest_checkout_script ${CTEST_DASHBOARD_ROOT}/${_name}-init.cmake)
+ file(WRITE ${ctest_checkout_script} "# git repo init script for ${_name}
execute_process(
COMMAND \"${CTEST_GIT_COMMAND}\" clone -n ${git_branch_new} -- \"${dashboard_git_url}\"
\"${CTEST_SOURCE_DIRECTORY}\"
@@ -247,15 +236,7 @@ if(EXISTS \"${CTEST_SOURCE_DIRECTORY}/.git\")
)
endif()
")
- set(CTEST_CHECKOUT_COMMAND "\"${CMAKE_COMMAND}\" -P \"${ctest_checkout_script}\"")
- endif()
- # CTest delayed initialization is broken, so we put the
- # CTestConfig.cmake info here.
- set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
- set(CTEST_DROP_METHOD "http")
- set(CTEST_DROP_SITE "www.cdash.org")
- set(CTEST_DROP_LOCATION "/CDash/submit.php?project=CMake")
- set(CTEST_DROP_SITE_CDASH TRUE)
+ set(CTEST_CHECKOUT_COMMAND "\"${CMAKE_COMMAND}\" -P \"${ctest_checkout_script}\"")
endif()
# Enable bootstrap build?
@@ -317,19 +298,15 @@ macro(write_cache)
set(cache_make_program CMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM})
endif()
endif()
- set(cache_git_executable "")
- if(CTEST_GIT_COMMAND)
- set(cache_git_executable "GIT_EXECUTABLE:FILEPATH=${CTEST_GIT_COMMAND}")
- endif()
file(WRITE ${CTEST_BINARY_DIRECTORY}/CMakeCache.txt "
SITE:STRING=${CTEST_SITE}
BUILDNAME:STRING=${CTEST_BUILD_NAME}
CTEST_TEST_CTEST:BOOL=${CTEST_TEST_CTEST}
CTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS}
DART_TESTING_TIMEOUT:STRING=${CTEST_TEST_TIMEOUT}
+GIT_EXECUTABLE:FILEPATH=${CTEST_GIT_COMMAND}
${cache_build_type}
${cache_make_program}
-${cache_git_executable}
${dashboard_cache}
")
endmacro(write_cache)
-----------------------------------------------------------------------
Summary of changes:
cmake_common.cmake | 136 ++++++++++++++++++++++------------------------------
1 files changed, 57 insertions(+), 79 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list