boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-17 13:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Use property-set in more places

Browse Source 
[SVN r26487]
This commit is contained in:
Vladimir Prus
2004-12-10 15:49:30 +00:00
parent 5ec008ddbc
commit 46d4c39af4
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/build/toolset.jam
View File

@@ -194,14 +194,15 @@ rule handle-flag-value ( value * : properties * )
}
else
{
result += $(values) ;
result += $(value) ;
}
return $(result) ;
}
rule set-target-variables ( rule-or-module targets + : properties * )
rule set-target-variables ( rule-or-module targets + : property-set )
{
properties = [ $(property-set).raw ] ;
for local f in $(.$(rule-or-module).flags)
{
local variable = $(.$(rule-or-module).variable.$(f)) ;
@@ -229,7 +230,7 @@ rule set-target-variables ( rule-or-module targets + : properties * )
local next = [ MATCH ^(.+)\\.([^\\.])* : $(rule-or-module) ] ;
if $(next)
{
set-target-variables $(next) $(targets) : $(properties) ;
set-target-variables $(next) $(targets) : $(property-set) ;
}
}

9
src/build/virtual-target.jam
View File

@@ -609,8 +609,7 @@ class action
self.actualized = true ;
local ps = [ properties ] ;
local properties = [ adjust-properties [ $(ps).raw ] ] ;
local properties = [ adjust-properties $(ps) ] ;
local actual-targets ;
for local i in [ targets ]
@@ -629,7 +628,7 @@ class action
: $(properties) ;
indirect.call $(self.action-name)
$(actual-targets) : $(self.actual-sources) : $(properties)
$(actual-targets) : $(self.actual-sources) : [ $(properties).raw ]
;
# Since we set up creating action here, we also set up
@@ -694,9 +693,9 @@ class action
# This is last chance to fix properties, for example to adjust includes
# to get generated headers correctly. Default implementation returns
# its argument.
rule adjust-properties ( properties * )
rule adjust-properties ( property-set )
{
return $(properties) ;
return $(property-set) ;
}

5
src/tools/builtin.jam
View File

@@ -460,10 +460,11 @@ class compile-action : action
# For all virtual targets for the same dependency graph as self,
# i.e. which belong to the same main target, add their directories
# to include path.
rule adjust-properties ( properties * )
rule adjust-properties ( property-set )
{
local s = [ $(self.targets[1]).creating-subvariant ] ;
return $(properties) [ $(s).implicit-includes "include" : H ] ;
return [ $(property-set).add-raw
[ $(s).implicit-includes "include" : H ] ] ;
}
}