|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r52813 - in branches/release: . tools/build/CMake tools/build/CMake/CompileTest tools/build/CMake/LinkTest
From: dgregor_at_[hidden]
Date: 2009-05-06 19:34:51
Author: dgregor
Date: 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
New Revision: 52813
URL: http://svn.boost.org/trac/boost/changeset/52813
Log:
CMake: Use CTest for testing, with submission to the dashboard at:
http://www.cdash.org/CDashPublic/index.php?project=Boost
Added:
branches/release/CTestConfig.cmake (contents, props changed)
branches/release/tools/build/CMake/CompileTest/
branches/release/tools/build/CMake/CompileTest/CMakeLists.txt (contents, props changed)
Removed:
branches/release/tools/build/CMake/BoostBuildSlave.cmake
branches/release/tools/build/CMake/boost_build_slave.py.in
branches/release/tools/build/CMake/unix_kill.py.in
branches/release/tools/build/CMake/windows_kill.py.in
Text files modified:
branches/release/CMakeLists.txt | 2
branches/release/tools/build/CMake/BoostCore.cmake | 19 ----
branches/release/tools/build/CMake/BoostTesting.cmake | 142 +++++++++++----------------------------
branches/release/tools/build/CMake/LinkTest/CMakeLists.txt | 6 +
4 files changed, 50 insertions(+), 119 deletions(-)
Modified: branches/release/CMakeLists.txt
==============================================================================
--- branches/release/CMakeLists.txt (original)
+++ branches/release/CMakeLists.txt 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
@@ -84,9 +84,9 @@
list(APPEND CMAKE_MODULE_PATH ${Boost_SOURCE_DIR}/tools/build/CMake)
include(BoostUtils)
include(BoostConfig)
-include(BoostBuildSlave)
include(BoostCore)
include(BoostDocs)
+include(CTest)
include(BoostTesting)
##########################################################################
Added: branches/release/CTestConfig.cmake
==============================================================================
--- (empty file)
+++ branches/release/CTestConfig.cmake 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
@@ -0,0 +1,13 @@
+## This file should be placed in the root directory of your project.
+## Then modify the CMakeLists.txt file in the root directory of your
+## project to incorporate the testing dashboard.
+## # The following are required to uses Dart and the Cdash dashboard
+## ENABLE_TESTING()
+## INCLUDE(CTest)
+set(CTEST_PROJECT_NAME "Boost")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "www.cdash.org")
+set(CTEST_DROP_LOCATION "/CDashPublic/submit.php?project=Boost")
+set(CTEST_DROP_SITE_CDASH TRUE)
Deleted: branches/release/tools/build/CMake/BoostBuildSlave.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostBuildSlave.cmake 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,157 +0,0 @@
-##########################################################################
-# Boost Build Slave Support #
-##########################################################################
-# Copyright (C) 2008 Troy D. Straszheim #
-# #
-# Distributed under the Boost Software License, Version 1.0. #
-# See accompanying file LICENSE_1_0.txt or copy at #
-# http://www.boost.org/LICENSE_1_0.txt #
-##########################################################################
-option(BOOST_BUILD_SLAVE "Be a build slave, report build/testing" OFF)
-
-file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}" BOOST_BUILD_SLAVE_PYTHONPATH)
-
-if(BOOST_BUILD_SLAVE)
- set(BOOST_BUILD_SLAVE_SUBMIT_URL "http://boost:boost@boost.resophonic.com/trac/login/xmlrpc"
- CACHE STRING "URL to post regression testing results to.")
-
- file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}" BOOST_BUILD_SLAVE_PYTHONPATH)
-
- set(BOOST_BUILD_SLAVE_TIMEOUT 300
- CACHE STRING "Seconds until build slave times out any individual build step")
-
- set(BOOST_BUILD_SLAVE_DETAILS_FILE "slave-description.txt"
- CACHE FILEPATH "Path to file, absolute or relative to build directory, containing descriptive text about the build (configuration peculiarities, etc) to be reported to the server")
-
- set(BOOST_BUILD_SLAVE_CONTACT_INFO "buildmeister_at_[hidden]"
- CACHE STRING "Contact information regarding this build")
-
- set(BOOST_BUILD_SLAVE_HOSTNAME ""
- CACHE STRING "If set, don't report what python determines to be the FQDN of this host, report this string instead.")
-
- set(BOOST_BUILD_SLAVE_SLEEP_DURATION "60"
- CACHE STRING "Number of seconds to sleep between checks for updates from the repository.")
-
-endif(BOOST_BUILD_SLAVE)
-
-message(STATUS "Configuring test/compile drivers")
-
-if(CMAKE_VERBOSE_MAKEFILE)
- set(BOOST_DRIVER_VERBOSE True)
-else(CMAKE_VERBOSE_MAKEFILE)
- set(BOOST_DRIVER_VERBOSE False)
-endif(CMAKE_VERBOSE_MAKEFILE)
-
-#
-# the programs that do the dirty work.
-#
-foreach(PYFILE boost_build_slave passthru marshal start finish info post classify)
- configure_file(tools/build/CMake/${PYFILE}.py.in
- ${BOOST_BUILD_SLAVE_PYTHONPATH}/${PYFILE}.py
- @ONLY
- )
-endforeach()
-
-if(WIN32)
- configure_file(tools/build/CMake/windows_kill.py.in
- ${BOOST_BUILD_SLAVE_PYTHONPATH}/kill_subprocess.py
- COPYONLY
- )
-else(WIN32)
- configure_file(tools/build/CMake/unix_kill.py.in
- ${BOOST_BUILD_SLAVE_PYTHONPATH}/kill_subprocess.py
- COPYONLY
- )
-endif(WIN32)
-
-
-#
-# the test driver is either marshal or passthru depending on whether
-# you're in build slave mode or not. The compilation/link rules
-# aren't modified if you're not in slave mode, BUUUT the tests still
-# need a driver script that knows whether to expect failure or not
-# and 'flips' the return status accordingly: thus passthru.py.
-#
-if(BOOST_BUILD_SLAVE)
- file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/marshal.py BOOST_TEST_DRIVER)
-
- configure_file(tools/build/CMake/run_continuous_slave.py.in
- ${CMAKE_BINARY_DIR}/run_continuous_slave.py
- @ONLY
- )
-
-else(BOOST_BUILD_SLAVE)
- file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/passthru.py BOOST_TEST_DRIVER)
-endif(BOOST_BUILD_SLAVE)
-
-if(BOOST_BUILD_SLAVE)
- #
- # Redirect various build steps
- #
-
- set(CMAKE_CXX_COMPILE_OBJECT
- "\"${PYTHON_EXECUTABLE}\" \"${BOOST_TEST_DRIVER}\" <CMAKE_CURRENT_BINARY_DIR> cxx_compile_object <OBJECT> ${CMAKE_CXX_COMPILE_OBJECT}" )
-
- set(CMAKE_CXX_CREATE_SHARED_LIBRARY
- "\"${PYTHON_EXECUTABLE}\" \"${BOOST_TEST_DRIVER}\" <CMAKE_CURRENT_BINARY_DIR> create_shared_library <TARGET> ${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
-
- set(CMAKE_CXX_CREATE_STATIC_LIBRARY
- "\"${PYTHON_EXECUTABLE}\" \"${BOOST_TEST_DRIVER}\" <CMAKE_CURRENT_BINARY_DIR> create_static_library <TARGET> ${CMAKE_CXX_CREATE_STATIC_LIBRARY}")
-
- set(CMAKE_CXX_LINK_EXECUTABLE
- "\"${PYTHON_EXECUTABLE}\" \"${BOOST_TEST_DRIVER}\" <CMAKE_CURRENT_BINARY_DIR> link_executable <TARGET> ${CMAKE_CXX_LINK_EXECUTABLE}")
-
- #
- # Custom targets for talking to the server via xmlrpc
- #
-
-
- #
- # Get us a new build id from the server
- #
- file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/start.py
- BOOST_BUILD_SLAVE_START_PY)
- add_custom_target(slave-start
- COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_START_PY}
- COMMENT "Slave starting build"
- )
-
- #
- # Tell server we're done... it'll update finish time in the db.
- #
- file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/finish.py
- BOOST_BUILD_SLAVE_FINISH_PY)
- add_custom_target(slave-finish
- COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_FINISH_PY}
- COMMENT "Slave finishing build"
- )
- #
-
- # Local only: show what we report to server (our platform description, toolset, etc)
- #
- file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/info.py
- BOOST_BUILD_SLAVE_INFO_PY)
- add_custom_target(slave-info
- COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_INFO_PY}
- COMMENT "Print slave info"
- )
-endif(BOOST_BUILD_SLAVE)
-
-#
-# Used over in BoostTesting and BoostCore to attach xmlrpc submission rules
-# to various intermediate build targets (libraries, test suites)
-#
-
-file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/post.py
- BOOST_BUILD_SLAVE_POST_PY)
-macro(boost_post_results PROJECT_NAME_ PARENT_TARGET BUILD_OR_TEST LOGDIR)
- if(BOOST_BUILD_SLAVE)
- add_custom_command(TARGET ${PARENT_TARGET}
- POST_BUILD
- COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_POST_PY} ${PROJECT_NAME_} ${PARENT_TARGET} ${BUILD_OR_TEST} ${LOGDIR}
- COMMENT "Submitting results for '${BUILD_OR_TEST}' of ${PARENT_TARGET} in ${PROJECT_NAME_}"
- )
- set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${LOGDIR}/Log.marshal)
- add_dependencies(test ${PARENT_TARGET})
- endif(BOOST_BUILD_SLAVE)
-endmacro(boost_post_results PARENT_TARGET)
Modified: branches/release/tools/build/CMake/BoostCore.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostCore.cmake (original)
+++ branches/release/tools/build/CMake/BoostCore.cmake 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
@@ -311,25 +311,14 @@
endforeach(SUBDIR ${THIS_PROJECT_SRCDIRS})
endif()
+ # FIXME: Temporary testing hack
if(BUILD_TESTING AND THIS_PROJECT_TESTDIRS)
# Testing is enabled globally and this project has some
# tests. So, include the tests
- add_custom_target(${PROJECT_NAME}-test)
-
- add_dependencies(test ${PROJECT_NAME}-test)
-
- # the last argument here, the binary directory that the
- # logs are in, has to match the binary directory
- # passed to 'add_subdirectory', in the foreach() just below
- boost_post_results(${PROJECT_NAME} ${PROJECT_NAME}-test
- test
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-test
- )
-
foreach(SUBDIR ${THIS_PROJECT_TESTDIRS})
- add_subdirectory(${SUBDIR} ${PROJECT_NAME}-test)
+ add_subdirectory(${SUBDIR})
endforeach()
- endif(BUILD_TESTING AND THIS_PROJECT_TESTDIRS)
+ endif()
if (BUILD_DOCUMENTATION AND THIS_PROJECT_DOCDIRS)
foreach(SUBDIR ${THIS_PROJECT_DOCDIRS})
@@ -715,8 +704,6 @@
# The basic LIBNAME target depends on each of the variants
add_dependencies(${LIBNAME} ${VARIANT_LIBNAME})
- boost_post_results(${PROJECT_NAME} ${VARIANT_LIBNAME} build ${CMAKE_CURRENT_BINARY_DIR})
-
# Link against whatever libraries this library depends on
target_link_libraries(${VARIANT_LIBNAME} ${THIS_VARIANT_LINK_LIBS})
foreach(dependency ${THIS_LIB_DEPENDS})
Modified: branches/release/tools/build/CMake/BoostTesting.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostTesting.cmake (original)
+++ branches/release/tools/build/CMake/BoostTesting.cmake 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
@@ -40,10 +40,10 @@
option(BUILD_TESTING "Enable testing" OFF)
if (BUILD_TESTING)
- add_custom_target(test COMMENT "Running all tests")
+ enable_testing()
option(TEST_INSTALLED_TREE "Enable testing of an already-installed tree" OFF)
-
+
if (TEST_INSTALLED_TREE)
include("${CMAKE_INSTALL_PREFIX}/lib/Boost${BOOST_VERSION}/boost-targets.cmake")
endif (TEST_INSTALLED_TREE)
@@ -164,9 +164,6 @@
# source files, BOOST_TEST_SOURCES will contain those; otherwise,
# BOOST_TEST_SOURCES will only contain "testname.cpp".
#
-# BOOST_TEST_TAG: compile, compile_fail, run, or run_fail.
-# Used in test-reporting systems.
-#
# BOOST_TEST_TESTNAME: A (hopefully) globally unique target name
# for the test, constructed from PROJECT-testname-TAG
#
@@ -211,20 +208,7 @@
set(BOOST_TEST_SOURCES "${testname}.cpp")
endif (BOOST_TEST_DEFAULT_ARGS)
- #message("Sources: ${BOOST_TEST_SOURCES}")
- if (BOOST_TEST_RUN)
- set(BOOST_TEST_TAG "run")
- elseif(BOOST_TEST_COMPILE)
- set(BOOST_TEST_TAG "compile")
- elseif(BOOST_TEST_LINK)
- set(BOOST_TEST_TAG "link")
- endif(BOOST_TEST_RUN)
-
- if (BOOST_TEST_FAIL)
- set(BOOST_TEST_TAG ${BOOST_TEST_TAG}-fail)
- endif(BOOST_TEST_FAIL)
-
- set(BOOST_TEST_TESTNAME "${PROJECT_NAME}-${testname}-${BOOST_TEST_TAG}")
+ set(BOOST_TEST_TESTNAME "${PROJECT_NAME}-${testname}")
#message("testname: ${BOOST_TEST_TESTNAME}")
# If testing is turned off, this test is not okay
if (NOT BUILD_TESTING)
@@ -295,33 +279,15 @@
${BOOST_TEST_EXTRA_OPTIONS})
if (THIS_EXE_OKAY)
- # This target builds and runs the test
- add_custom_target(${BOOST_TEST_TESTNAME})
-
- file( TO_NATIVE_PATH "${BOOST_TEST_DRIVER}" NATIVE_BOOST_TEST_DRIVER )
-
- set(THIS_TEST_PREFIX_ARGS
- ${PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER}
- ${CMAKE_CURRENT_BINARY_DIR} ${BOOST_TEST_TAG} ${testname}
- )
-
- add_custom_command(TARGET ${BOOST_TEST_TESTNAME}
- POST_BUILD
- COMMAND
- ${THIS_TEST_PREFIX_ARGS}
- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/tests/${PROJECT_NAME}/${testname}
- ${BOOST_TEST_ARGS}
- COMMENT "${PROJECT_NAME} => Running '${testname}'"
- )
-
- add_dependencies(${BOOST_TEST_TESTNAME}
- ${PROJECT_NAME}-${testname}
- )
-
- add_dependencies(${PROJECT_NAME}-test
- ${BOOST_TEST_TESTNAME}
- )
-
+ get_target_property(THIS_TEST_OUTPUT_DIRECTORY ${testname}
+ RUNTIME_OUTPUT_DIRECTORY)
+ add_test (${BOOST_TEST_TESTNAME}
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/tests/${PROJECT_NAME}/${testname}
+ ${BOOST_TEST_ARGS})
+
+ if (BOOST_TEST_FAIL)
+ set_tests_properties(${BOOST_TEST_TESTNAME} PROPERTIES WILL_FAIL ON)
+ endif ()
endif(THIS_EXE_OKAY)
endif (BOOST_TEST_OKAY)
endmacro(boost_test_run)
@@ -335,7 +301,6 @@
boost_test_run(${testname} ${ARGN} FAIL)
endmacro(boost_test_run_fail)
-
# This macro creates a Boost regression test that will be compiled,
# but not linked or executed. If the test can be compiled with no
# failures, the test passes.
@@ -368,34 +333,26 @@
get_directory_property(BOOST_TEST_INCLUDE_DIRS INCLUDE_DIRECTORIES)
set(BOOST_TEST_INCLUDES "")
foreach(DIR ${BOOST_TEST_INCLUDE_DIRS})
- set(BOOST_TEST_INCLUDES "${BOOST_TEST_INCLUDES};-I${DIR}")
+ set(BOOST_TEST_INCLUDES "${BOOST_TEST_INCLUDES};${DIR}")
endforeach(DIR ${BOOST_TEST_INCLUDE_DIRS})
- set(THIS_TEST_PREFIX_ARGS
- ${PYTHON_EXECUTABLE} ${BOOST_TEST_DRIVER} ${CMAKE_CURRENT_BINARY_DIR} ${BOOST_TEST_TAG} ${testname}
- )
-
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BOOST_TEST_TESTNAME}.${CMAKE_CXX_OUTPUT_EXTENSION}
- COMMAND
- ${THIS_TEST_PREFIX_ARGS}
- ${CMAKE_CXX_COMPILER}
- ${BOOST_TEST_COMPILE_FLAGS}
- ${BOOST_TEST_INCLUDES}
- -c ${BOOST_TEST_SOURCES}
- -o ${CMAKE_CURRENT_BINARY_DIR}/${BOOST_TEST_TESTNAME}${CMAKE_CXX_OUTPUT_EXTENSION}
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${BOOST_TEST_SOURCES}
- COMMENT "${PROJECT_NAME} => Running Compile ${test_pass} Test '${BOOST_TEST_SOURCES}'"
- )
-
- add_custom_target(${BOOST_TEST_TESTNAME}
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BOOST_TEST_TESTNAME}.${CMAKE_CXX_OUTPUT_EXTENSION}
- )
-
- add_dependencies(${PROJECT_NAME}-test
- ${BOOST_TEST_TESTNAME}
+ add_test(${BOOST_TEST_TESTNAME}
+ ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ ${Boost_SOURCE_DIR}/tools/Build/CMake/CompileTest
+ ${Boost_BINARY_DIR}/tools/Build/CMake/CompileTest
+ --build-generator ${CMAKE_GENERATOR}
+ --build-makeprogram ${CMAKE_MAKE_PROGRAM}
+ --build-project CompileTest
+ --build-options
+ "-DSOURCE:STRING=${CMAKE_CURRENT_SOURCE_DIR}/${BOOST_TEST_SOURCES}"
+ "-DINCLUDES:STRING=${BOOST_TEST_INCLUDES}"
+ "-DCOMPILE_FLAGS:STRING=${BOOST_TEST_COMPILE_FLAGS}"
)
+ if (BOOST_TEST_FAIL)
+ set_tests_properties(${BOOST_TEST_TESTNAME} PROPERTIES WILL_FAIL ON)
+ endif ()
endif(BOOST_TEST_OKAY)
endmacro(boost_test_compile)
@@ -418,37 +375,22 @@
macro(boost_test_link testname)
boost_test_parse_args(${testname} ${ARGN} LINK)
if(BOOST_TEST_OKAY)
-
- set(THIS_TEST_PREFIX_ARGS
- ${PYTHON_EXECUTABLE} ${BOOST_TEST_DRIVER} ${CMAKE_CURRENT_BINARY_DIR} test_link ${testname}
+ add_test(${BOOST_TEST_TESTNAME}
+ ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ ${Boost_SOURCE_DIR}/tools/build/CMake/LinkTest
+ ${Boost_BINARY_DIR}/tools/build/CMake/LinkTest
+ --build-generator ${CMAKE_GENERATOR}
+ --build-makeprogram ${CMAKE_MAKE_PROGRAM}
+ --build-project LinkTest
+ "-DSOURCE:STRING=${CMAKE_CURRENT_SOURCE_DIR}/${BOOST_TEST_SOURCES}"
+ "-DINCLUDES:STRING=${BOOST_TEST_INCLUDES}"
+ "-DCOMPILE_FLAGS:STRING=${BOOST_TEST_COMPILE_FLAGS}"
)
-
- #
- # FIXME: no ctest.
- #
- add_custom_target(TARGET ${BOOST_TEST_TESTNAME}
- COMMAND /link/tests/are/failing/at/the/moment
- COMMENT "${PROJECT_NAME} => Link test '${testname}' is failing."
- )
-
- # POST_BUILD
- # COMMAND
- # ${THIS_TEST_PREFIX_ARGS}
- # ${CMAKE_CTEST_COMMAND}
- # --build-and-test
- # ${Boost_SOURCE_DIR}/tools/build/CMake/LinkTest
- # ${Boost_BINARY_DIR}/tools/build/CMake/LinkTest
- # --build-generator \\"${CMAKE_GENERATOR}\\"
- # --build-makeprogram \\"${MAKEPROGRAM}\\"
- # --build-project LinkTest
- # --build-options -DSOURCE=${CMAKE_CURRENT_SOURCE_DIR}/${BOOST_TEST_SOURCES} -DINCLUDES=${Boost_SOURCE_DIR} -DCOMPILE_FLAGS=\\"${BOOST_TEST_COMPILE_FLAGS}\\"
- # COMMENT "Running ${testname} (link) in project ${PROJECT_NAME}"
- # )
- add_dependencies(${PROJECT_NAME}-test
- ${BOOST_TEST_TESTNAME}
- )
-
+ if (BOOST_TEST_FAIL)
+ set_tests_properties(${BOOST_TEST_TESTNAME} PROPERTIES WILL_FAIL ON)
+ endif ()
endif(BOOST_TEST_OKAY)
endmacro(boost_test_link)
Added: branches/release/tools/build/CMake/CompileTest/CMakeLists.txt
==============================================================================
--- (empty file)
+++ branches/release/tools/build/CMake/CompileTest/CMakeLists.txt 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 2.6)
+project(CompileTest)
+add_library(compile-test STATIC ${SOURCE})
+include_directories(${INCLUDES})
+set_source_files_properties(${SOURCE}
+ PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS}")
\ No newline at end of file
Modified: branches/release/tools/build/CMake/LinkTest/CMakeLists.txt
==============================================================================
--- branches/release/tools/build/CMake/LinkTest/CMakeLists.txt (original)
+++ branches/release/tools/build/CMake/LinkTest/CMakeLists.txt 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
@@ -1,5 +1,7 @@
-cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.6)
project(LinkTest)
include_directories (${INCLUDES})
-add_executable(link ${SOURCE} COMPILE_FLAGS "${COMPILE_FLAGS}")
+add_executable(link-test ${SOURCE} COMPILE_FLAGS "${COMPILE_FLAGS}")
+set_source_files_properties(${SOURCE}
+ PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS}")
\ No newline at end of file
Deleted: branches/release/tools/build/CMake/boost_build_slave.py.in
==============================================================================
--- branches/release/tools/build/CMake/boost_build_slave.py.in 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-#!/usr/bin/python
-#
-# copyright (C) 2008 troy d. straszheim <troy_at_[hidden]>
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt
-#
-
-#
-# Utilities, variables, imports for build slave python
-#
-
-import os, os.path, marshal, xmlrpclib, pysvn, socket, platform
-from pprint import pprint
-
-repo_path = "@CMAKE_SOURCE_DIR@"
-client = pysvn.Client()
-svn_entry = client.info(repo_path)
-_configured_hostname = "@BOOST_BUILD_SLAVE_HOSTNAME@"
-fqdn = _configured_hostname if len(_configured_hostname) > 0 else socket.getfqdn()
-uname = platform.uname()
-toolset = "@BOOST_TOOLSET@"
-
-timeout_seconds = @BOOST_BUILD_SLAVE_TIMEOUT@
-slave_details_file = "@BOOST_BUILD_SLAVE_DETAILS_FILE@"
-contact_info = "@BOOST_BUILD_SLAVE_CONTACT_INFO@"
-
-xmlrpc_url = "@BOOST_BUILD_SLAVE_SUBMIT_URL@"
-
-build_id_file = os.path.join(r'@BOOST_BUILD_SLAVE_PYTHONPATH@', "build_id.txt")
-
-try:
- f = open(build_id_file)
- build_id = int(f.read())
-except:
- build_id = None
-
-def set_build_id(build_id):
- print "Setting new build id %d locally" % build_id
- f = open(build_id_file, "w")
- f.write(str(build_id))
- f.close()
-
-def details():
- if os.path.isabs(slave_details_file):
- thefile = slave_details_file
- else:
- thefile = os.path.join("@CMAKE_BINARY_DIR@", slave_details_file)
-
- if os.path.exists(thefile):
- f = open(thefile)
- txt = f.read()
- else:
- txt = "Build slave details file @BOOST_BUILD_SLAVE_DETAILS_FILE@ not found."
-
- return txt
Deleted: branches/release/tools/build/CMake/unix_kill.py.in
==============================================================================
--- branches/release/tools/build/CMake/unix_kill.py.in 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,6 +0,0 @@
-import os, signal
-def kill_subprocess(pid):
- os.kill(pid, signal.SIGKILL)
- os.waitpid(-1, os.WNOHANG)
-
-
Deleted: branches/release/tools/build/CMake/windows_kill.py.in
==============================================================================
--- branches/release/tools/build/CMake/windows_kill.py.in 2009-05-06 19:34:49 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,9 +0,0 @@
-import os
-def kill_subprocess(pid):
- cmd = 'TASKKILL /PID ' + str(pid) + ' /T /F'
- print "Timeout, killing subprocess:\n" + cmd
- os.popen(cmd)
-
-import win32api, win32con
-win32api.SetErrorMode( win32con.SEM_NOGPFAULTERRORBOX | win32con.SEM_FAILCRITICALERRORS )
-
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk