[Boost-commit] svn:boost r46428 - branches/CMake/release/tools/build/CMake

From: troy_at_[hidden]
Date: 2008-06-16 11:37:38

Author: troy
Date: 2008-06-16 11:37:37 EDT (Mon, 16 Jun 2008)
New Revision: 46428
URL: http://svn.boost.org/trac/boost/changeset/46428

Log:

Add user-settable reported hostname, bump up timeout.

Text files modified: 
   branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake   |     5 ++++-                                   
   branches/CMake/release/tools/build/CMake/boost_build_slave.py.in |     3 ++-                                     
   2 files changed, 6 insertions(+), 2 deletions(-)

Modified: branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake	(original)
+++ branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake	2008-06-16 11:37:37 EDT (Mon, 16 Jun 2008)
@@ -14,7 +14,7 @@
 
 file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}" BOOST_BUILD_SLAVE_PYTHONPATH)
 
-set(BOOST_BUILD_SLAVE_TIMEOUT 120 
+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"
@@ -23,6 +23,9 @@
 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.")
+
 message(STATUS "Configuring test/compile drivers")
   
 if(CMAKE_VERBOSE_MAKEFILE)

Modified: branches/CMake/release/tools/build/CMake/boost_build_slave.py.in
==============================================================================
--- branches/CMake/release/tools/build/CMake/boost_build_slave.py.in	(original)
+++ branches/CMake/release/tools/build/CMake/boost_build_slave.py.in	2008-06-16 11:37:37 EDT (Mon, 16 Jun 2008)
@@ -17,7 +17,8 @@
 repo_path = "@CMAKE_SOURCE_DIR@"
 client = pysvn.Client()
 svn_entry = client.info(repo_path)
-fqdn = socket.getfqdn()
+_configured_hostname = "@BOOST_BUILD_SLAVE_HOSTNAME@"
+fqdn = _configured_hostname if len(_configured_hostname) > 0 else socket.getfqdn()
 uname = platform.uname()
 toolset = "@BOOST_TOOLSET@"