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

From: jurko.gospodnetic_at_[hidden]
Date: 2008-06-03 19:59:28

Author: jurko
Date: 2008-06-03 19:59:27 EDT (Tue, 03 Jun 2008)
New Revision: 46108
URL: http://svn.boost.org/trac/boost/changeset/46108

Log:
Cleaned up the build/modifiers.jam Boost Build module so it no longer references long removed 'multiple' parameter to a generator.run() rule.
Text files modified: 
   trunk/tools/build/v2/build/modifiers.jam |    36 +++++++++++++-----------------------    
   1 files changed, 13 insertions(+), 23 deletions(-)

Modified: trunk/tools/build/v2/build/modifiers.jam
==============================================================================
--- trunk/tools/build/v2/build/modifiers.jam	(original)
+++ trunk/tools/build/v2/build/modifiers.jam	2008-06-03 19:59:27 EDT (Tue, 03 Jun 2008)
@@ -45,7 +45,7 @@
     # Wraps the generation of the target to call before and after rules to
     # affect the real target.
     #
-    rule run ( project name ? : property-set : sources + :  multiple ? )
+    rule run ( project name ? : property-set : sources + )
     {
         local result ;
         local current-target = $(project)^$(name) ;
@@ -54,24 +54,20 @@
             # Before modifications...
             local project_ =
                 [ modify-project-before
-                    $(project) $(name) : $(property-set) : $(sources) : $(multiple) ] ;
+                    $(project) $(name) : $(property-set) : $(sources) ] ;
             local name_ =
                 [ modify-name-before
-                    $(project) $(name) : $(property-set) : $(sources) : $(multiple) ] ;
+                    $(project) $(name) : $(property-set) : $(sources) ] ;
             local property-set_ =
                 [ modify-properties-before
-                    $(project) $(name) : $(property-set) : $(sources) : $(multiple) ] ;
+                    $(project) $(name) : $(property-set) : $(sources) ] ;
             local sources_ =
                 [ modify-sources-before
-                    $(project) $(name) : $(property-set) : $(sources) : $(multiple) ] ;
-            local multiple_ =
-                [ modify-multiple-before
-                    $(project) $(name) : $(property-set) : $(sources) : $(multiple) ] ;
+                    $(project) $(name) : $(property-set) : $(sources) ] ;
             project = $(project_) ;
             name = $(name_) ;
             property-set = $(property-set_) ;
             sources = $(sources_) ;
-            multiple = $(multiple_) ;
 
             # Generate the real target...
             local target-type-p =
@@ -79,7 +75,7 @@
             self.targets-in-progress += $(current-target) ;
             result =
                 [ generators.construct $(project) $(name)
-                    : $(target-type-p:G=) $(multiple)
+                    : $(target-type-p:G=)
                     : $(property-set)
                     : $(sources) ] ;
             self.targets-in-progress = $(self.targets-in-progress[1--2]) ;
@@ -89,38 +85,32 @@
                 [ modify-target-after $(result)
                     : $(project) $(name)
                     : $(property-set)
-                    : $(sources)
-                    : $(multiple) ] ;
+                    : $(sources) ] ;
         }
         return $(result) ;
     }
 
-    rule modify-project-before ( project name ? : property-set : sources + :  multiple ? )
+    rule modify-project-before ( project name ? : property-set : sources + )
     {
         return $(project) ;
     }
 
-    rule modify-name-before ( project name ? : property-set : sources + :  multiple ? )
+    rule modify-name-before ( project name ? : property-set : sources + )
     {
         return $(name) ;
     }
 
-    rule modify-properties-before ( project name ? : property-set : sources + :  multiple ? )
+    rule modify-properties-before ( project name ? : property-set : sources + )
     {
         return $(property-set) ;
     }
 
-    rule modify-sources-before ( project name ? : property-set : sources + :  multiple ? )
+    rule modify-sources-before ( project name ? : property-set : sources + )
     {
         return $(sources) ;
     }
 
-    rule modify-multiple-before ( project name ? : property-set : sources + :  multiple ? )
-    {
-        return $(multiple) ;
-    }
-
-    rule modify-target-after ( target : project name ? : property-set : sources + :  multiple ? )
+    rule modify-target-after ( target : project name ? : property-set : sources + )
     {
         return $(target) ;
     }
@@ -170,7 +160,7 @@
 
     # Modifies the name, by cloning the target with the new name.
     #
-    rule modify-target-after ( target : project name ? : property-set : sources + :  multiple ? )
+    rule modify-target-after ( target : project name ? : property-set : sources + )
     {
         local result = $(target) ;