mirror of
https://github.com/boostorg/build.git
synced 2026-02-18 01:52:17 +00:00
Merge
[SVN r35691]
This commit is contained in:
@@ -639,7 +639,6 @@ rule register ( g )
|
||||
# a generator and then call 'run' method on that generator, bypassing all
|
||||
# generator selection.
|
||||
rule register-standard ( id : source-types * : target-types + : requirements * )
|
||||
|
||||
{
|
||||
local g = [ new generator $(id) : $(source-types) : $(target-types)
|
||||
: $(requirements) ] ;
|
||||
@@ -1168,3 +1167,22 @@ rule construct ( project name ? : target-type : property-set * : sources * )
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
# Given 'result', obtained from some generator or
|
||||
# generators.construct, adds 'raw-properties' as usage requirements
|
||||
# to it. If result already contains usage requirements -- that is
|
||||
# the first element of result of an instance of the property-set class,
|
||||
# the existing usage requirements and 'raw-properties' are combined.
|
||||
rule add-usage-requirements ( result * : raw-properties * )
|
||||
{
|
||||
if $(result)
|
||||
{
|
||||
if [ class.is-a $(result[1]) : property-set ]
|
||||
{
|
||||
return [ $(result[1]).add-raw $(raw-properties) ] $(result[2-]) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
return [ property-set.create $(raw-properties) ] $(result) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user