From: troy_at_[hidden]
Date: 2008-06-03 19:05:11
Author: troy
Date: 2008-06-03 19:05:10 EDT (Tue, 03 Jun 2008)
New Revision: 46100
URL: http://svn.boost.org/trac/boost/changeset/46100
Log:
Need to know if we're building or testing for correct display on the other side
Text files modified:
branches/CMake/release/tools/build/CMake/BoostBuildSlave.cmake | 10 +++++-----
branches/CMake/release/tools/build/CMake/post.py.in | 10 ++++++----
2 files changed, 11 insertions(+), 9 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-03 19:05:10 EDT (Tue, 03 Jun 2008)
@@ -92,14 +92,14 @@
-macro(boost_post_results PROJECT_NAME_ LIBRARY_TARGET WHAT LOGDIR)
+macro(boost_post_results PROJECT_NAME_ PARENT_TARGET BUILD_OR_TEST LOGDIR)
if(BOOST_BUILD_SLAVE)
- add_custom_command(TARGET ${LIBRARY_TARGET}
+ add_custom_command(TARGET ${PARENT_TARGET}
POST_BUILD
- COMMAND ${BOOST_BUILD_SLAVE_PYTHONPATH}/post.py ${PROJECT_NAME_} ${WHAT} ${LOGDIR}
- COMMENT "Submitting results for '${WHAT}' in ${PROJECT_NAME_}"
+ COMMAND ${BOOST_BUILD_SLAVE_PYTHONPATH}/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)
endif(BOOST_BUILD_SLAVE)
-endmacro(boost_post_results LIBRARY_TARGET)
+endmacro(boost_post_results PARENT_TARGET)
Modified: branches/CMake/release/tools/build/CMake/post.py.in
==============================================================================
--- branches/CMake/release/tools/build/CMake/post.py.in (original)
+++ branches/CMake/release/tools/build/CMake/post.py.in 2008-06-03 19:05:10 EDT (Tue, 03 Jun 2008)
@@ -18,11 +18,12 @@
s = xmlrpclib.Server(xmlrpc_url)
project_name = sys.argv[1]
-library_target = sys.argv[2]
-logdir = sys.argv[3]
+parent_target = sys.argv[2]
+build_or_test = sys.argv[3]
+logdir = sys.argv[4]
print "\n>>>\n>>> Project " + project_name \
- + "\n>>> POST build log for " + library_target \
+ + "\n>>> POST build log for " + parent_target \
+ "\n>>> from log dir" + logdir \
+ "\n>>> to " + xmlrpc_url \
+ "\n>>> Server build ID: %d" % build_id \
@@ -36,7 +37,8 @@
r = marshal.load(f)
r.update({ 'build_id' : build_id,
'project' : project_name,
- 'upper_target' : library_target})
+ 'parent_target' : parent_target,
+ 'build_or_test' : build_or_test })
pprint(r)
s.traash.step(r)
except EOFError, e: