mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 01:12:13 +00:00
Merge from trunk
[SVN r34023]
This commit is contained in:
@@ -281,9 +281,7 @@ class project-target : abstract-target
|
||||
local self-location = [ get location ] ;
|
||||
for local pn in [ get projects-to-build ]
|
||||
{
|
||||
local p = [ project.module-name
|
||||
[ path.root $(pn) $(self-location) ] ] ;
|
||||
result += [ project.target $(p) ] ;
|
||||
result += [ find $(pn) ] ;
|
||||
}
|
||||
|
||||
return $(result) ;
|
||||
@@ -793,21 +791,22 @@ class file-reference : abstract-target
|
||||
|
||||
rule generate ( properties )
|
||||
{
|
||||
return [ property-set.empty ]
|
||||
[ virtual-target.from-file $(self.name)
|
||||
: [ location ]
|
||||
compute-location ;
|
||||
return [ property-set.empty ]
|
||||
[ virtual-target.from-file $(self.name)
|
||||
: $(self.file-location)
|
||||
: $(self.project) ] ;
|
||||
}
|
||||
|
||||
# Returns true if the referred file really exists;
|
||||
rule exists ( )
|
||||
{
|
||||
location ;
|
||||
compute-location ;
|
||||
return $(self.file-path) ;
|
||||
}
|
||||
|
||||
# Returns the location of target. Needed by 'testing.jam'
|
||||
rule location ( )
|
||||
rule compute-location ( )
|
||||
{
|
||||
if ! $(self.file-location)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user