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

Speedup. Add implicit include directories only for targets that

Browse Source 
can really be included.

* build/virtual-target.jam
  (subvariant.implicit-includes,all-target-directories,
  compute-target-directories): Accept 'target-type' parameter.

* tools/builtin.jam
  (compile-action.adjust-properties): Only add "include" properties for
  targets of type "H".


[SVN r21117]
This commit is contained in:
Vladimir Prus
2003-12-03 13:13:08 +00:00
parent 779b53aa3c
commit 3a3b4e7049
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -984,6 +984,7 @@ local rule clone-action-template ( action from cloned-from : new-source )
class subvariant
{
import sequence ;
import type ;
rule __init__ ( main-target # The instance of main-target class
: property-set # Properties requested for this target
@@ -1071,40 +1072,46 @@ class subvariant
}
return $(all-targets) ;
}
# Returns a list of properties which contain implicit includes,
# needed to handle dependencies of generated headers.
# The name of feature is given by 'feature', this is typically 'include'.
# The values of feature are all target directories of this dependency graph,
# plus target directories of all dependency graphs referred to by
# <implicit-dependency> property
rule implicit-includes ( feature )
# Returns the properties which specify implicit include paths to
# generated headers. This traverses all targets in this subvariant,
# and subvariants referred by <implcit-dependecy>properties.
# For all targets which are of type 'target-type' (or for all targets,
# if 'target-type' is not specified), the result will contain
# <$(feature)>path-to-that-target.
rule implicit-includes ( feature : target-type ? )
{
local target-paths = [ all-target-directories ] ;
local target-paths = [ all-target-directories $(target-type) ] ;
target-paths = [ sequence.unique $(target-paths) ] ;
return $(target-paths:G=$(feature)) ;
}
rule all-target-directories ( )
rule all-target-directories ( target-type ? )
{
if ! $(self.target-directories)
{
compute-target-directories ;
compute-target-directories $(target-type) ;
}
return $(self.target-directories) ;
}
rule compute-target-directories ( )
rule compute-target-directories ( target-type ? )
{
local result ;
for local t in $(self.created-targets)
{
result = [ sequence.merge $(result) : [ $(t).path ] ] ;
if $(target-type) && ! [ type.is-derived [ $(t).type ] $(target-type) ]
{
# Skip target which is of wrong type.
}
else
{
result = [ sequence.merge $(result) : [ $(t).path ] ] ;
}
}
for local d in $(self.other-dg)
{
result += [ $(d).all-target-directories ] ;
result += [ $(d).all-target-directories $(target-type) ] ;
}
self.target-directories = $(result) ;
}

2
v2/tools/builtin.jam
View File

@@ -552,7 +552,7 @@ class compile-action : action
rule adjust-properties ( properties * )
{
local s = [ $(self.targets[1]).creating-subvariant ] ;
return $(properties) [ $(s).implicit-includes "include" ] ;
return $(properties) [ $(s).implicit-includes "include" : H ] ;
}
}