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

From: troy_at_[hidden]
Date: 2008-06-15 04:43:17

Author: troy
Date: 2008-06-15 04:43:17 EDT (Sun, 15 Jun 2008)
New Revision: 46405
URL: http://svn.boost.org/trac/boost/changeset/46405

Log:
Various escapings and double-quotings for windows and paths with spaces
Text files modified: 
   branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake   |    30 +++++++++++++++++-------------          
   branches/CMake/release/tools/build/CMake/boost_build_slave.py.in |     2 +-                                      
   branches/CMake/release/tools/build/CMake/marshal.py.in           |     2 +-                                      
   3 files changed, 19 insertions(+), 15 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-15 04:43:17 EDT (Sun, 15 Jun 2008)
@@ -12,7 +12,7 @@
 set(BOOST_BUILD_SLAVE_SUBMIT_URL "http://boost:[e-mail]/trac/login/xmlrpc" 
   CACHE STRING "URL to post regression testing results to.")
 
-set(BOOST_BUILD_SLAVE_PYTHONPATH "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}")
+file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}" BOOST_BUILD_SLAVE_PYTHONPATH)
 
 set(BOOST_BUILD_SLAVE_TIMEOUT 120 
   CACHE STRING "Seconds until build slave times out any individual build step")    
@@ -72,32 +72,35 @@
   #  Redirect various build steps
   # 
   
-  file( TO_NATIVE_PATH "${PYTHON_EXECUTABLE}" NATIVE_PYTHON_EXECUTABLE )
-  file( TO_NATIVE_PATH "${BOOST_TEST_DRIVER}" NATIVE_BOOST_TEST_DRIVER )
-  
-  message( "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> cxx_compile_object <OBJECT> ${CMAKE_CXX_COMPILE_OBJECT}"  )
+  file(TO_NATIVE_PATH "${PYTHON_EXECUTABLE}" NATIVE_PYTHON_EXECUTABLE)
+  file(TO_NATIVE_PATH "${BOOST_TEST_DRIVER}" NATIVE_BOOST_TEST_DRIVER)
   
   set(CMAKE_CXX_COMPILE_OBJECT 
-    "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> cxx_compile_object <OBJECT> ${CMAKE_CXX_COMPILE_OBJECT}" )
+    "\"${NATIVE_PYTHON_EXECUTABLE}\" \"${NATIVE_BOOST_TEST_DRIVER}\" <CMAKE_CURRENT_BINARY_DIR> cxx_compile_object <OBJECT> ${CMAKE_CXX_COMPILE_OBJECT}" )
 
   set(CMAKE_CXX_CREATE_SHARED_LIBRARY  
-    "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> create_shared_library <TARGET> ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") 
+    "\"${NATIVE_PYTHON_EXECUTABLE}\" \"${NATIVE_BOOST_TEST_DRIVER}\" <CMAKE_CURRENT_BINARY_DIR> create_shared_library <TARGET> ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") 
     
   set(CMAKE_CXX_CREATE_STATIC_LIBRARY  
-    "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> create_static_library <TARGET> ${CMAKE_CXX_CREATE_STATIC_LIBRARY}") 
+    "\"${NATIVE_PYTHON_EXECUTABLE}\" \"${NATIVE_BOOST_TEST_DRIVER}\" <CMAKE_CURRENT_BINARY_DIR> create_static_library <TARGET> ${CMAKE_CXX_CREATE_STATIC_LIBRARY}") 
 
   set(CMAKE_CXX_LINK_EXECUTABLE  
-    "${NATIVE_PYTHON_EXECUTABLE} ${NATIVE_BOOST_TEST_DRIVER} <CMAKE_CURRENT_BINARY_DIR> link_executable <TARGET> ${CMAKE_CXX_LINK_EXECUTABLE}") 
+    "\"${NATIVE_PYTHON_EXECUTABLE}\" \"${NATIVE_BOOST_TEST_DRIVER}\" <CMAKE_CURRENT_BINARY_DIR> link_executable <TARGET> ${CMAKE_CXX_LINK_EXECUTABLE}") 
 
   #
   #  Custom targets for talking to the server via xmlrpc
   #
 
+file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/start.py NATIVE_SLAVE_START)
+file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/finish.py NATIVE_SLAVE_FINISH)
+file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/info.py NATIVE_SLAVE_INFO)
+file(TO_NATIVE_PATH ${BOOST_BUILD_SLAVE_PYTHONPATH}/post.py NATIVE_SLAVE_POST)
+
   #
   #  Get us a new build id from the server
   #
   add_custom_target(slave-start
-    COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_PYTHONPATH}/start.py
+    COMMAND \"${NATIVE_PYTHON_EXECUTABLE}\" \"${NATIVE_SLAVE_START}\"
     COMMENT "Slave starting build"
     )
 
@@ -105,7 +108,7 @@
   #  Tell server we're done... it'll update finish time in the db.
   #
   add_custom_target(slave-finish
-    COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_PYTHONPATH}/finish.py
+    COMMAND \"${NATIVE_PYTHON_EXECUTABLE}\" \"${NATIVE_SLAVE_FINISH}\"
     COMMENT "Slave finishing build"
     )
   #
@@ -113,13 +116,14 @@
   #  Local only:  show what we report to server (our platform description, toolset, etc)
   #
   add_custom_target(slave-info
-    COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_PYTHONPATH}/info.py
+    COMMAND \"${NATIVE_PYTHON_EXECUTABLE}\" \"${NATIVE_SLAVE_INFO}\"
     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) 
@@ -128,7 +132,7 @@
   if(BOOST_BUILD_SLAVE)
     add_custom_command(TARGET ${PARENT_TARGET}
       POST_BUILD
-      COMMAND ${PYTHON_EXECUTABLE} ${BOOST_BUILD_SLAVE_PYTHONPATH}/post.py ${PROJECT_NAME_} ${PARENT_TARGET} ${BUILD_OR_TEST} ${LOGDIR}
+      COMMAND \"${NATIVE_PYTHON_EXECUTABLE}\" \"${NATIVE_SLAVE_POST}\" ${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)

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-15 04:43:17 EDT (Sun, 15 Jun 2008)
@@ -27,7 +27,7 @@
 
 xmlrpc_url = "@BOOST_BUILD_SLAVE_SUBMIT_URL@"
 
-build_id_file = os.path.join(r'@BOOST_BUILD_SLAVE_PYTHONPATH@', 'build_id.txt')
+build_id_file = os.path.join(r'@BOOST_BUILD_SLAVE_PYTHONPATH@', "build_id.txt")
 
 try:
     f = open(build_id_file)

Modified: branches/CMake/release/tools/build/CMake/marshal.py.in
==============================================================================
--- branches/CMake/release/tools/build/CMake/marshal.py.in	(original)
+++ branches/CMake/release/tools/build/CMake/marshal.py.in	2008-06-15 04:43:17 EDT (Sun, 15 Jun 2008)
@@ -25,7 +25,7 @@
 argv = sys.argv[4:]
 expect_fail = op.endswith("fail")
 
-# print "***\n*** Executing op:" + op + "\n*** " + str(argv) + "\n*** log=" + log + "\n***"
+print "***\n*** Executing op:" + op + "\n*** " + str(argv) + "\n*** log=" + log + "\n***"
 
 #
 #  execute subprocess, watch for timeout