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

Fixed a bug in for seldom used argument <property:/property-name/> in rule format-name.

Browse Source 
Added /property-name/ may be a regex.

[SVN r44343]
This commit is contained in:
Roland Schwarz
2008-04-12 11:02:35 +00:00
parent 44f0865599
commit 3d2aeda1dc
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
v2/tools/common.jam
View File

@@ -643,7 +643,8 @@ actions hard-link
# value as the version number.
# <property:/property-name/>[joiner]
# :: Direct lookup of the given property-name value in the
# build properties.
# build properties. /property-name/ is a regular expression.
# e.g. <property:toolset-.*:flavor> will match every toolset.
# /otherwise/
# :: The literal value of the format argument.
#
@@ -693,12 +694,15 @@ rule format-name ( format * : name : type ? : property-set )
case <property:*> :
local key = [ MATCH <property:(.*)> : $(f:G) ] ;
local p = [ $(property-set).get [ MATCH <property:(.*)> : $(f:G) ] ] ;
if $(p)
{
result += [ join-tag $(f:G=) : $(p) ] ;
local p0 = [ MATCH <($(key))> : [ $(property-set).raw ] ] ;
if $(p0) {
local p = [ $(property-set).get <$(p0)> ] ;
if $(p)
{
result += [ join-tag $(f:G=) : $(p) ] ;
}
}
case * :
result += $(f:G=) ;
}