From: bdawes_at_[hidden]
Date: 2007-11-15 13:32:18
Author: bemandawes
Date: 2007-11-15 13:32:18 EST (Thu, 15 Nov 2007)
New Revision: 41112
URL: http://svn.boost.org/trac/boost/changeset/41112
Log:
Merge trunk changes from 41110.
Text files modified:
branches/release/tools/Jamfile.v2 | 7 +++++--
branches/release/tools/regression/build/Jamroot.jam | 20 +++++++++++++++++---
2 files changed, 22 insertions(+), 5 deletions(-)
Modified: branches/release/tools/Jamfile.v2
==============================================================================
--- branches/release/tools/Jamfile.v2 (original)
+++ branches/release/tools/Jamfile.v2 2007-11-15 13:32:18 EST (Thu, 15 Nov 2007)
@@ -14,12 +14,15 @@
<link>static
;
+use-project /boost/regression : regression/build ;
+
TOOLS =
bcp//bcp
inspect/build//inspect
quickbook//quickbook
- regression/build//compiler_status
- regression/build//process_jam_log
+ /boost/regression//compiler_status
+ /boost/regression//library_status
+ /boost/regression//process_jam_log
wave/build//wave
;
Modified: branches/release/tools/regression/build/Jamroot.jam
==============================================================================
--- branches/release/tools/regression/build/Jamroot.jam (original)
+++ branches/release/tools/regression/build/Jamroot.jam 2007-11-15 13:32:18 EST (Thu, 15 Nov 2007)
@@ -25,9 +25,21 @@
;
}
+obj tiny_xml
+ :
+ detail/tiny_xml.cpp
+ :
+ <define>BOOST_ALL_NO_LIB=1
+ <define>_CRT_SECURE_NO_WARNINGS
+ :
+ release
+ ;
+explicit tiny_xml ;
+
exe process_jam_log
:
- process_jam_log.cpp detail/tiny_xml.cpp
+ process_jam_log.cpp
+ tiny_xml
/boost/filesystem//boost_filesystem/<link>static
:
<define>BOOST_ALL_NO_LIB=1
@@ -39,7 +51,8 @@
exe compiler_status
:
- compiler_status.cpp detail/tiny_xml.cpp
+ compiler_status.cpp
+ tiny_xml
/boost/filesystem//boost_filesystem/<link>static
:
<define>BOOST_ALL_NO_LIB=1
@@ -50,7 +63,8 @@
exe library_status
:
- library_status.cpp detail/tiny_xml.cpp
+ library_status.cpp
+ tiny_xml
/boost/filesystem//boost_filesystem/<link>static
:
<define>BOOST_ALL_NO_LIB=1