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

From: ghost_at_[hidden]
Date: 2007-12-11 14:41:47

Author: vladimir_prus
Date: 2007-12-11 14:41:47 EST (Tue, 11 Dec 2007)
New Revision: 41979
URL: http://svn.boost.org/trac/boost/changeset/41979

Log:
Put add-usage-requirements back
Text files modified: 
   trunk/tools/build/v2/build/generators.jam |    22 +++++++++++++++++++++-                  
   1 files changed, 21 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/build/generators.jam
==============================================================================
--- trunk/tools/build/v2/build/generators.jam	(original)
+++ trunk/tools/build/v2/build/generators.jam	2007-12-11 14:41:47 EST (Tue, 11 Dec 2007)
@@ -1186,6 +1186,26 @@
     decrease-indent ;
         
     .construct-stack = $(.construct-stack[2-]) ;
-                        
+                    
     return $(result) ;        
 }
+
+# Given 'result', obtained from some generator or 
+# generators.construct, adds 'raw-properties' as usage requirements
+# to it. If result already contains usage requirements -- that is
+# the first element of result of an instance of the property-set class,
+# the existing usage requirements and 'raw-properties' are combined.
+rule add-usage-requirements ( result * : raw-properties * )
+{
+    if $(result)
+    {
+        if [ class.is-a $(result[1]) : property-set ] 
+        {
+            return [ $(result[1]).add-raw $(raw-properties) ] $(result[2-]) ;
+        }
+        else
+        {
+            return [ property-set.create $(raw-properties) ] $(result) ;
+        }        
+    }    
+}