mirror of
https://github.com/boostorg/build.git
synced 2026-02-11 23:52:20 +00:00
build/
* generators.jam (construct): Remove the 'allowed-type' parameter. Adjust other files. [SVN r35608]
This commit is contained in:
@@ -1134,12 +1134,7 @@ local rule construct-really (
|
||||
# 'construct' in stack, returns only targets of requested 'target-type',
|
||||
# otherwise, returns also unused sources and additionally generated
|
||||
# targets.
|
||||
#
|
||||
# Does not return target which are not of 'allowed-type' or of type derived from
|
||||
# it. If 'allowed-type' is not specified, it's defaulted to 'target-type'.
|
||||
# See lib-target-class for use case of this.
|
||||
rule construct ( project name ? : target-type : property-set * : sources *
|
||||
: allowed-type * )
|
||||
rule construct ( project name ? : target-type : property-set * : sources * )
|
||||
{
|
||||
if (.construct-stack)
|
||||
{
|
||||
|
||||
@@ -480,7 +480,7 @@ class lib-generator : generator
|
||||
property-set = [ $(property-set).add-raw <main-target-type>LIB ] ;
|
||||
# Construct the target.
|
||||
return [ generators.construct $(project) $(name) : $(actual-type)
|
||||
: $(property-set) : $(sources) : LIB ] ;
|
||||
: $(property-set) : $(sources) ] ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ class install-target-class : basic-target
|
||||
else
|
||||
{
|
||||
local targets = [ generators.construct $(self.project) $(name) :
|
||||
INSTALLED_$(t) : $(new-properties) : $(i) : * ] ;
|
||||
INSTALLED_$(t) : $(new-properties) : $(i) ] ;
|
||||
staged-targets += $(targets[2-]) ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ class stlport-target-class : basic-target
|
||||
= [ targets.main-target-requirements
|
||||
[ $(lib-file.props).raw ] <file>$(lib-file[-1])
|
||||
: $(self.project) ] ;
|
||||
return [ generators.construct $(self.project) $(name) : LIB : $(lib-file.requirements) : : LIB ] ;
|
||||
return [ generators.construct $(self.project) $(name) : LIB : $(lib-file.requirements) ] ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user