[Boost-commit] svn:boost r83763 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r83763 - trunk/tools/build/v2/tools
From: steven_at_[hidden]
Date: 2013-04-04 00:01:04

Author: steven_watanabe
Date: 2013-04-04 00:01:03 EDT (Thu, 04 Apr 2013)
New Revision: 83763
URL: http://svn.boost.org/trac/boost/changeset/83763

Log:
Fix bad interaction with changing toolset.requirements.
Text files modified: 
   trunk/tools/build/v2/tools/zlib.jam |    17 +++++++++--------                       
   1 files changed, 9 insertions(+), 8 deletions(-)

Modified: trunk/tools/build/v2/tools/zlib.jam
==============================================================================
--- trunk/tools/build/v2/tools/zlib.jam	(original)
+++ trunk/tools/build/v2/tools/zlib.jam	2013-04-04 00:01:03 EDT (Thu, 04 Apr 2013)
@@ -21,6 +21,7 @@
 import errors ;
 import indirect ;
 import property ;
+import property-set ;
 
 header = zlib.h ;
 names = z zlib zll zdll ;
@@ -88,10 +89,8 @@
     : options *
     # A list of the options to use
 
-    : condition *
-    # A list of properties specifying when this configuration will be used.
-    # It is an error to initialize zlib more than once with the
-    # same condition.
+    : requirements *
+    # The requirements for the zlib target
 
     : is-default ?
     # Default configurations are only used when zlib
@@ -122,7 +121,8 @@
     local build-name = [ property.select <build-name> : $(options) ] ;
     build-name = $(build-name:G=) ;
 
-    condition = [ targets.main-target-requirements $(condition) : $(.project) ] ;
+    condition = [ property-set.create $(requirements) ] ;
+    condition = [ $(condition).base ] ;
 
     local no-build-from-source ;
     # Ignore environmental ZLIB_SOURCE if this initialization
@@ -173,7 +173,7 @@
             ECHO "notice: [zlib] Building zlib from source as $(build-name)" ;
             if $(condition)
             {
-                ECHO "notice: [zlib] Condition $(condition)" ;
+                ECHO "notice: [zlib] Condition" [ $(condition).raw ] ;
             }
             if $(sources)
             {
@@ -189,7 +189,8 @@
             target = [ targets.create-typed-target LIB : $(.project)
               : $(build-name).$(library-id)
               : $(sources)
-              : <tag>@$(tag)
+              : $(requirements)
+                <tag>@$(tag)
                 <include>$(source-path)
                 <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
                 <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
@@ -212,7 +213,7 @@
             ECHO "notice: [zlib] Using pre-installed library" ;
             if $(condition)
             {
-                ECHO "notice: [zlib] Condition $(condition)" ;
+                ECHO "notice: [zlib] Condition" [ $(condition).raw ] ;
             }
         }