From: bdawes_at_[hidden]
Date: 2007-11-25 12:55:35
Author: bemandawes
Date: 2007-11-25 12:55:35 EST (Sun, 25 Nov 2007)
New Revision: 41366
URL: http://svn.boost.org/trac/boost/changeset/41366
Log:
Full merge from trunk at revision 41356 of entire boost-root tree. Do Serialization separately to verify pre-commit check failures have been fixed.
Text files modified:
branches/release/libs/serialization/build/Jamfile.v2 | 41 +++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 11 deletions(-)
Modified: branches/release/libs/serialization/build/Jamfile.v2
==============================================================================
--- branches/release/libs/serialization/build/Jamfile.v2 (original)
+++ branches/release/libs/serialization/build/Jamfile.v2 2007-11-25 12:55:35 EST (Sun, 25 Nov 2007)
@@ -10,12 +10,31 @@
: source-location ../src
;
+rule include-spirit ( properties * )
+{
+ local result ;
+ local SPIRIT_ROOT = [ modules.peek : SPIRIT_ROOT ] ;
+ for local tset in borland { # vc iw
+ if ( <toolset>$(tset) in $(properties) ) {
+ if ( $(SPIRIT_ROOT) ) {
+ result = <cxxflags>-I$(SPIRIT_ROOT) ;
+ }
+ else {
+ echo **** spirit 1.6x required to build library with this compiler **** ;
+ result = <build>no ;
+
+ }
+ }
+ }
+ return $(result) ;
+}
+
+
SOURCES =
basic_archive
- basic_archive_impl
basic_iarchive
- basic_oarchive
basic_iserializer
+ basic_oarchive
basic_oserializer
basic_pointer_iserializer
basic_pointer_oserializer
@@ -25,6 +44,7 @@
basic_xml_archive
binary_iarchive
binary_oarchive
+ codecvt_null
extended_type_info
extended_type_info_no_rtti
extended_type_info_typeid
@@ -40,14 +60,13 @@
;
WSOURCES =
- codecvt_null
- utf8_codecvt_facet
basic_text_wiprimitive
basic_text_woprimitive
binary_wiarchive
binary_woarchive
text_wiarchive
text_woarchive
+ utf8_codecvt_facet
xml_wgrammar
xml_wiarchive
xml_woarchive
@@ -56,15 +75,15 @@
lib boost_serialization
: $(SOURCES).cpp
: <toolset>msvc:<cxxflags>/Gy
- <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
- :
- : <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
+ <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
+ <conditional>@include-spirit
;
lib boost_wserialization
: $(WSOURCES).cpp boost_serialization
- : <toolset>msvc:<cxxflags>/Gy
- <link>shared:<define>BOOST_WSERIALIZATION_DYN_LINK=1
- :
- : <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
+ : <toolset>msvc:<cxxflags>/Gy
+ <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
+ <conditional>@include-spirit
;
+
+boost-install boost_serialization boost_wserialization ;
\ No newline at end of file