[Boost-commit] svn:boost r42281 - branches/serialization_next_release/boost/libs/serialization/build

From: ramey_at_[hidden]
Date: 2007-12-24 19:08:27

Author: ramey
Date: 2007-12-24 19:08:27 EST (Mon, 24 Dec 2007)
New Revision: 42281
URL: http://svn.boost.org/trac/boost/changeset/42281

Log:
Adjustments for trak tickets - ready for upload as version 1.36.0
Text files modified: 
   branches/serialization_next_release/boost/libs/serialization/build/Jamfile.v2 |    36 ++++++++++++++++++++++++------------    
   1 files changed, 24 insertions(+), 12 deletions(-)

Modified: branches/serialization_next_release/boost/libs/serialization/build/Jamfile.v2
==============================================================================
--- branches/serialization_next_release/boost/libs/serialization/build/Jamfile.v2	(original)
+++ branches/serialization_next_release/boost/libs/serialization/build/Jamfile.v2	2007-12-24 19:08:27 EST (Mon, 24 Dec 2007)
@@ -13,6 +13,24 @@
 ;
 
 SPIRIT_ROOT = [ modules.peek : SPIRIT_ROOT ] ;
+rule include-spirit ( properties * )
+{
+    local result ;
+    for local tset in borland { # vc iw
+        if ( <toolset>$(tset) in $(properties) ) {
+            if ( $(SPIRIT_ROOT) ) {
+                # note - we can't use <include>$(SPIRIT_ROOT) because 
+                # it puts -I$(SPIRIT_ROOT) AFTER the "../../.." in the command line.
+                # so use these instead 
+                result = <cxxflags>-I$(SPIRIT_ROOT) ;
+            }
+            else {
+                echo **** spirit 1.6x required to build library with this compiler **** ;
+                result = <build>no ;
+            }
+        }
+    }
+}
 
 SOURCES = 
     basic_archive
@@ -61,12 +79,9 @@
     : $(SOURCES).cpp
         : 
             <toolset>msvc:<cxxflags>/Gy
-        # note - we can't use <include>$(SPIRIT_ROOT) because 
-        # it puts -I$(SPIRIT_ROOT) AFTER the "../../.." in the command line.
-        # so use these instead 
-        <toolset>msvc-6.5:<cxxflags>-I$(SPIRIT_ROOT)
-        <toolset>msvc-7.0:<cxxflags>-I$(SPIRIT_ROOT)
-        <toolset>borland:<cxxflags>-I$(SPIRIT_ROOT)
+        <toolset>msvc-6.5:<conditional>@include-spirit
+        <toolset>msvc-7.0:<conditional>@include-spirit
+        <toolset>borland:<conditional>@include-spirit
               <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
         ;
 
@@ -74,12 +89,9 @@
         : $(WSOURCES).cpp boost_serialization 
         :	  
         <toolset>msvc:<cxxflags>/Gy 
-        # note - we can't use <include>$(SPIRIT_ROOT) because 
-        # it puts -I$(SPIRIT_ROOT) AFTER the "../../.." in the command line.
-        # so use these instead 
-        <toolset>msvc-6.5:<cxxflags>-I$(SPIRIT_ROOT)
-        <toolset>msvc-7.0:<cxxflags>-I$(SPIRIT_ROOT)
-        <toolset>borland:<cxxflags>-I$(SPIRIT_ROOT)
+        <toolset>msvc-6.5:<conditional>@include-spirit
+        <toolset>msvc-7.0:<conditional>@include-spirit
+        <toolset>borland:<conditional>@include-spirit
         <dependency>../../config/test//BOOST_NO_STD_WSTREAMBUF
         <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
         ;