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

(register-actual-name) Always generate verbose error message. Also, fix

Browse Source 
a typo which caused the same location to be reported for both targets.


[SVN r23168]
This commit is contained in:
Vladimir Prus
2004-06-23 10:56:34 +00:00
parent e4d86166f9
commit 703047bca1
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
v2/build/virtual-target.jam
View File

@@ -795,7 +795,7 @@ rule register-actual-name ( actual-name : virtual-target )
local cs1 = [ $(.actual.$(actual-name)).creating-subvariant ] ;
local cs2 = [ $(virtual-target).creating-subvariant ] ;
local cmt1 = [ $(cs1).main-target ] ;
local cmt2 = [ $(cs1).main-target ] ;
local cmt2 = [ $(cs2).main-target ] ;
local action1 = [ $(.actual.$(actual-name)).action ] ;
@@ -813,22 +813,13 @@ rule register-actual-name ( actual-name : virtual-target )
properties-added = [ set.difference $(p2) : $(p1) ] ;
properties-added ?= "none" ;
}
if $(properties-added) != "none" || $(properties-removed) != "none"
{
errors.error "Duplicate name of actual target:" $(actual-name)
: "previous virtual target" [ $(.actual.$(actual-name)).str ]
: "created from" [ $(cmt1).location ]
: "another virtual target" [ $(virtual-target).str ]
: "created from" [ $(cmt2).location ]
: "added properties: " $(properties-added)
: "removed properties: " $(properties-removed) ;
}
else
{
errors.error "Duplicate name of actual target:" $(actual-name)
: "previous virtual target" [ $(.actual.$(actual-name)).str ]
: "another virtual target" [ $(virtual-target).str ] ;
}
errors.error "Duplicate name of actual target:" $(actual-name)
: "previous virtual target" [ $(.actual.$(actual-name)).str ]
: "created from" [ $(cmt1).location ]
: "another virtual target" [ $(virtual-target).str ]
: "created from" [ $(cmt2).location ]
: "added properties: " $(properties-added)
: "removed properties: " $(properties-removed) ;
}
else
{