Update of /cvsroot/boost/boost/tools/build/v2/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26897/tools/build/v2/build
Modified Files:
modifiers.jam
Log Message:
Index: modifiers.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/modifiers.jam,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- modifiers.jam 21 Jan 2005 08:42:50 -0000 1.8
+++ modifiers.jam 29 Jul 2007 21:39:32 -0000 1.9
@@ -14,7 +14,7 @@
import errors ;
import type ;
import "class" : new ;
-import generators : generator ;
+import generators ;
import property ;
import virtual-target ;
import numbers ;
@@ -25,17 +25,23 @@
# Base generator for creating targets that are modifications of existing
# targets.
#
-rule modifier (
- id
- composing ?
- : source-types *
- : target-types-and-names +
- : requirements *
- )
+class modifier : generator
{
- generator.__init__ $(id) $(composing) : $(source-types) :
$(target-types-and-names) : $(requirements) ;
+ rule __init__ (
+ id
+ composing ?
+ : source-types *
+ : target-types-and-names +
+ : requirements *
+ )
+ {
+ generator.__init__ $(id) $(composing)
+ : $(source-types)
+ : $(target-types-and-names)
+ : $(requirements) ;
- self.targets-in-progress = ;
+ self.targets-in-progress = ;
+ }
# Wraps the generation of the target to call before and after rules to
# affect the real target.
@@ -47,16 +53,21 @@
if ! $(current-target) in $(self.targets-in-progress)
{
# Before modifications...
- local project_ = [ modify-project-before
- $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
- local name_ = [ modify-name-before
- $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
- local property-set_ = [ modify-properties-before
- $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
- local sources_ = [ modify-sources-before
- $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
- local multiple_ = [ modify-multiple-before
- $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
+ local project_ =
+ [ modify-project-before
+ $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
+ local name_ =
+ [ modify-name-before
+ $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
+ local property-set_ =
+ [ modify-properties-before
+ $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
+ local sources_ =
+ [ modify-sources-before
+ $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
+ local multiple_ =
+ [ modify-multiple-before
+ $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
project = $(project_) ;
name = $(name_) ;
property-set = $(property-set_) ;
@@ -64,16 +75,23 @@
multiple = $(multiple_) ;
# Generate the real target...
- local target-type-p = [ property.select <main-target-type> : [
$(property-set).raw ] ] ;
+ local target-type-p =
+ [ property.select <main-target-type> : [ $(property-set).raw ]
] ;
self.targets-in-progress += $(current-target) ;
result =
- [ generators.construct $(project) $(name) :
$(target-type-p:G=) $(multiple) :
- $(property-set) : $(sources) ] ;
+ [ generators.construct $(project) $(name)
+ : $(target-type-p:G=) $(multiple)
+ : $(property-set)
+ : $(sources) ] ;
self.targets-in-progress = $(self.targets-in-progress[1--2]) ;
# After modifications...
- result = [ modify-target-after $(result) :
- $(project) $(name) : $(property-set) : $(sources) :
$(multiple) ] ;
+ result =
+ [ modify-target-after $(result)
+ : $(project) $(name)
+ : $(property-set)
+ : $(sources)
+ : $(multiple) ] ;
}
return $(result) ;
}
@@ -135,17 +153,19 @@
return $(result) ;
}
}
-class modifier : generator ;
# A modifier that changes the name of a target, after it's generated, given
# a regular expression to slpit the name, and a set of token to insert
# between the split tokens of the name. This also exposes the target for other
# uses with a symlink to the original name (optionally).
#
-rule name-modifier ( )
+class name-modifier : modifier
{
- # Apply ourselves to EXE targets, for now.
- modifier.__init__ name.modifier : : EXE LIB : <name-modify>yes ;
+ rule __init__ ( )
+ {
+ # Apply ourselves to EXE targets, for now.
+ modifier.__init__ name.modifier : : EXE LIB : <name-modify>yes ;
+ }
# Modifies the name, by cloning the target with the new name.
#
@@ -203,7 +223,6 @@
return <name-modify>yes ;
}
}
-class name-modifier : modifier ;
feature.feature name-modifier : : free ;
feature.feature name-modify : no yes : incidental optional ;
generators.register [ new name-modifier ] ;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
