incorporate defaults into build-request.expand
[SVN r14311]
This commit is contained in:
Dave Abrahams
parent
6c444b6022
commit
1b355b296c
@ -20,7 +20,7 @@ local rule apply-to-property-set ( f property-set )
|
||||
|
||||
# expand the given build request by combining all property-sets which don't
|
||||
# specify conflicting non-free features.
|
||||
rule expand ( property-sets * : feature-space ? )
|
||||
local rule expand-no-defaults ( property-sets * : feature-space ? )
|
||||
{
|
||||
feature-space ?= feature ;
|
||||
|
||||
@ -97,17 +97,25 @@ local rule x-product ( property-sets * : feature-space )
|
||||
}
|
||||
|
||||
#
|
||||
# Returns the result of 'expand' after appying feature default to it.
|
||||
# Returns the result of 'expand-no-defaults' after appying feature default to it.
|
||||
#
|
||||
rule expand-with-defaults ( property-sets * : feature-space ? )
|
||||
rule expand ( property-sets * : feature-space ? )
|
||||
{
|
||||
feature-space ?= feature ;
|
||||
local expanded = [ expand $(property-sets) : $(feature-space) ] ;
|
||||
local result = ;
|
||||
local expanded = [ expand-no-defaults $(property-sets) : $(feature-space) ] ;
|
||||
|
||||
expanded ?= "" ;
|
||||
|
||||
local result ;
|
||||
for local p in $(expanded)
|
||||
{
|
||||
p = [ $(feature-space).split $(p) ] ;
|
||||
|
||||
if ! $(p)
|
||||
{
|
||||
p = ;
|
||||
}
|
||||
|
||||
p = [ $(feature-space).add-defaults $(p) ] ;
|
||||
result += $(p:J=/) ;
|
||||
}
|
||||
@ -187,24 +195,25 @@ local rule convert-command-line-element ( e : feature-space )
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
local rule __test__ ( )
|
||||
rule __test__ ( )
|
||||
{
|
||||
import assert ;
|
||||
import errors : try catch ;
|
||||
import class ;
|
||||
|
||||
local test-space = [ class.new feature-space ] ;
|
||||
|
||||
|
||||
module $(test-space)
|
||||
{
|
||||
local test-space = [ modules.peek build-request : test-space ] ;
|
||||
|
||||
import build-request ;
|
||||
import build-request : expand-no-defaults : build-request.expand-no-defaults ;
|
||||
import errors : try catch ;
|
||||
|
||||
feature toolset : gcc msvc : implicit ;
|
||||
subfeature toolset gcc : version : 2.95.2 2.95.3 2.95.4
|
||||
3.0 3.0.1 3.0.2 ;
|
||||
3.0 3.0.1 3.0.2 : optional ;
|
||||
|
||||
feature variant : debug release : implicit composite ;
|
||||
feature inlining : on off ;
|
||||
@ -216,6 +225,10 @@ local rule __test__ ( )
|
||||
|
||||
# empty build requests should expand to empty.
|
||||
assert.result
|
||||
: build-request.expand-no-defaults
|
||||
: $(test-space) ;
|
||||
|
||||
assert.result <toolset>gcc/<variant>debug/<inlining>on/<stdlib>native/<runtime-link>dynamic
|
||||
: build-request.expand
|
||||
: $(test-space) ;
|
||||
|
||||
@ -224,6 +237,14 @@ local rule __test__ ( )
|
||||
<toolset>msvc/<stdlib>stlport/<variant>debug
|
||||
<toolset>msvc/<variant>debug
|
||||
|
||||
: build-request.expand-no-defaults gcc-3.0.1/stlport msvc/stlport msvc debug
|
||||
: $(test-space) ;
|
||||
|
||||
assert.result
|
||||
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>on/<runtime-link>dynamic
|
||||
<toolset>msvc/<stdlib>stlport/<variant>debug/<inlining>on/<runtime-link>dynamic
|
||||
<toolset>msvc/<variant>debug/<inlining>on/<stdlib>native/<runtime-link>dynamic
|
||||
|
||||
: build-request.expand gcc-3.0.1/stlport msvc/stlport msvc debug
|
||||
: $(test-space) ;
|
||||
|
||||
@ -232,14 +253,14 @@ local rule __test__ ( )
|
||||
<toolset>msvc/<variant>debug
|
||||
<variant>debug/<toolset>msvc/<stdlib>stlport
|
||||
|
||||
: build-request.expand gcc-3.0.1/stlport msvc debug msvc/stlport
|
||||
: build-request.expand-no-defaults gcc-3.0.1/stlport msvc debug msvc/stlport
|
||||
: $(test-space) ;
|
||||
|
||||
assert.result
|
||||
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>off
|
||||
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>release/<inlining>off
|
||||
|
||||
: build-request.expand gcc-3.0.1/stlport debug release <inlining>off
|
||||
: build-request.expand-no-defaults gcc-3.0.1/stlport debug release <inlining>off
|
||||
: $(test-space) ;
|
||||
|
||||
assert.result
|
||||
@ -247,7 +268,7 @@ local rule __test__ ( )
|
||||
<include>a/b/c/<toolset>msvc/<stdlib>stlport/<variant>debug/<include>x/y/z
|
||||
<include>a/b/c/<toolset>msvc/<variant>debug/<include>x/y/z
|
||||
|
||||
: build-request.expand <include>a/b/c gcc-3.0.1/stlport msvc/stlport msvc debug <include>x/y/z
|
||||
: build-request.expand-no-defaults <include>a/b/c gcc-3.0.1/stlport msvc/stlport msvc debug <include>x/y/z
|
||||
: $(test-space) ;
|
||||
|
||||
local r ;
|
||||
|
||||
@ -18,7 +18,7 @@ build-request = [ build-request.from-command-line [ modules.peek : ARGV ] ] ;
|
||||
|
||||
targets = [ $(build-request).get-at 1 ] ;
|
||||
properties = [ $(build-request).get-at 2 ] ;
|
||||
expanded = [ build-request.expand-with-defaults $(properties) ] ;
|
||||
expanded = [ build-request.expand $(properties) ] ;
|
||||
|
||||
|
||||
root-target = [ $(current-project).target ] ;
|
||||
|
||||
@ -456,7 +456,7 @@ rule extend ( feature-or-property subfeature ? : values * )
|
||||
#
|
||||
# subfeature toolset gcc-2.95.2 target-platform : aix linux mac cygwin
|
||||
#
|
||||
rule subfeature ( feature value-string ? : subfeature : subvalues * )
|
||||
rule subfeature ( feature value-string ? : subfeature : subvalues * : attributes * )
|
||||
{
|
||||
feature = [ grist $(feature) ] ;
|
||||
validate-feature $(feature) ;
|
||||
@ -467,7 +467,7 @@ rule subfeature ( feature value-string ? : subfeature : subvalues * )
|
||||
$(feature).subfeatures += $(subfeature) ;
|
||||
extend-subfeature $(feature) $(value-string) : $(subfeature) : $(subvalues) ;
|
||||
local f = [ utility.ungrist $(feature) ] ;
|
||||
feature $(f)-$(subfeature) : $(subvalues) : optional ;
|
||||
feature $(f)-$(subfeature) : $(subvalues) : $(attributes) ;
|
||||
}
|
||||
|
||||
# Set the components of the given composite property
|
||||
@ -660,7 +660,7 @@ rule add-defaults ( properties * )
|
||||
if $(v) in $(properties)
|
||||
{
|
||||
error add-defaults requires explicitly specified features,
|
||||
but $(v) appears to be the value of an un-expanded implicit feature ;
|
||||
but \"$(v)\" appears to be the value of an un-expanded implicit feature ;
|
||||
}
|
||||
}
|
||||
local missing = [ set.difference $(.all-features) : $(properties:G) ] ;
|
||||
@ -725,7 +725,7 @@ local rule __test__ ( )
|
||||
|
||||
extend-feature toolset : msvc metrowerks ;
|
||||
subfeature toolset gcc : version : 2.95.2 2.95.3 2.95.4
|
||||
3.0 3.0.1 3.0.2 ;
|
||||
3.0 3.0.1 3.0.2 : optional ;
|
||||
|
||||
assert.result <toolset>gcc <toolset-version>3.0.1
|
||||
: expand-subfeatures <toolset>gcc-3.0.1 ;
|
||||
@ -734,7 +734,7 @@ local rule __test__ ( )
|
||||
: expand-subfeatures gcc-3.0.1 ;
|
||||
|
||||
feature dummy : dummy1 dummy2 ;
|
||||
subfeature dummy : subdummy : x y z ;
|
||||
subfeature dummy : subdummy : x y z : optional ;
|
||||
|
||||
assert.result a c e
|
||||
: get-values x : <x>a <y>b <x>c <y>d <x>e ;
|
||||
|
||||
@ -198,7 +198,7 @@ rule basic-target ( name : project
|
||||
if ! $(properties)
|
||||
{
|
||||
# CONSIDER: I'm really not sure if this is correct...
|
||||
properties = [ build-request.expand-with-defaults $(self.default-build) ] ;
|
||||
properties = [ build-request.expand $(self.default-build) ] ;
|
||||
local result = ;
|
||||
for local p in $(properties)
|
||||
{
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Comprehensive tests for Boost.Build v2; requires Python. To test, execute:
|
||||
|
||||
python test-all.py
|
||||
python test_all.py
|
||||
|
||||
@ -20,7 +20,7 @@ local rule apply-to-property-set ( f property-set )
|
||||
|
||||
# expand the given build request by combining all property-sets which don't
|
||||
# specify conflicting non-free features.
|
||||
rule expand ( property-sets * : feature-space ? )
|
||||
local rule expand-no-defaults ( property-sets * : feature-space ? )
|
||||
{
|
||||
feature-space ?= feature ;
|
||||
|
||||
@ -97,17 +97,25 @@ local rule x-product ( property-sets * : feature-space )
|
||||
}
|
||||
|
||||
#
|
||||
# Returns the result of 'expand' after appying feature default to it.
|
||||
# Returns the result of 'expand-no-defaults' after appying feature default to it.
|
||||
#
|
||||
rule expand-with-defaults ( property-sets * : feature-space ? )
|
||||
rule expand ( property-sets * : feature-space ? )
|
||||
{
|
||||
feature-space ?= feature ;
|
||||
local expanded = [ expand $(property-sets) : $(feature-space) ] ;
|
||||
local result = ;
|
||||
local expanded = [ expand-no-defaults $(property-sets) : $(feature-space) ] ;
|
||||
|
||||
expanded ?= "" ;
|
||||
|
||||
local result ;
|
||||
for local p in $(expanded)
|
||||
{
|
||||
p = [ $(feature-space).split $(p) ] ;
|
||||
|
||||
if ! $(p)
|
||||
{
|
||||
p = ;
|
||||
}
|
||||
|
||||
p = [ $(feature-space).add-defaults $(p) ] ;
|
||||
result += $(p:J=/) ;
|
||||
}
|
||||
@ -187,24 +195,25 @@ local rule convert-command-line-element ( e : feature-space )
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
local rule __test__ ( )
|
||||
rule __test__ ( )
|
||||
{
|
||||
import assert ;
|
||||
import errors : try catch ;
|
||||
import class ;
|
||||
|
||||
local test-space = [ class.new feature-space ] ;
|
||||
|
||||
|
||||
module $(test-space)
|
||||
{
|
||||
local test-space = [ modules.peek build-request : test-space ] ;
|
||||
|
||||
import build-request ;
|
||||
import build-request : expand-no-defaults : build-request.expand-no-defaults ;
|
||||
import errors : try catch ;
|
||||
|
||||
feature toolset : gcc msvc : implicit ;
|
||||
subfeature toolset gcc : version : 2.95.2 2.95.3 2.95.4
|
||||
3.0 3.0.1 3.0.2 ;
|
||||
3.0 3.0.1 3.0.2 : optional ;
|
||||
|
||||
feature variant : debug release : implicit composite ;
|
||||
feature inlining : on off ;
|
||||
@ -216,6 +225,10 @@ local rule __test__ ( )
|
||||
|
||||
# empty build requests should expand to empty.
|
||||
assert.result
|
||||
: build-request.expand-no-defaults
|
||||
: $(test-space) ;
|
||||
|
||||
assert.result <toolset>gcc/<variant>debug/<inlining>on/<stdlib>native/<runtime-link>dynamic
|
||||
: build-request.expand
|
||||
: $(test-space) ;
|
||||
|
||||
@ -224,6 +237,14 @@ local rule __test__ ( )
|
||||
<toolset>msvc/<stdlib>stlport/<variant>debug
|
||||
<toolset>msvc/<variant>debug
|
||||
|
||||
: build-request.expand-no-defaults gcc-3.0.1/stlport msvc/stlport msvc debug
|
||||
: $(test-space) ;
|
||||
|
||||
assert.result
|
||||
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>on/<runtime-link>dynamic
|
||||
<toolset>msvc/<stdlib>stlport/<variant>debug/<inlining>on/<runtime-link>dynamic
|
||||
<toolset>msvc/<variant>debug/<inlining>on/<stdlib>native/<runtime-link>dynamic
|
||||
|
||||
: build-request.expand gcc-3.0.1/stlport msvc/stlport msvc debug
|
||||
: $(test-space) ;
|
||||
|
||||
@ -232,14 +253,14 @@ local rule __test__ ( )
|
||||
<toolset>msvc/<variant>debug
|
||||
<variant>debug/<toolset>msvc/<stdlib>stlport
|
||||
|
||||
: build-request.expand gcc-3.0.1/stlport msvc debug msvc/stlport
|
||||
: build-request.expand-no-defaults gcc-3.0.1/stlport msvc debug msvc/stlport
|
||||
: $(test-space) ;
|
||||
|
||||
assert.result
|
||||
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>off
|
||||
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>release/<inlining>off
|
||||
|
||||
: build-request.expand gcc-3.0.1/stlport debug release <inlining>off
|
||||
: build-request.expand-no-defaults gcc-3.0.1/stlport debug release <inlining>off
|
||||
: $(test-space) ;
|
||||
|
||||
assert.result
|
||||
@ -247,7 +268,7 @@ local rule __test__ ( )
|
||||
<include>a/b/c/<toolset>msvc/<stdlib>stlport/<variant>debug/<include>x/y/z
|
||||
<include>a/b/c/<toolset>msvc/<variant>debug/<include>x/y/z
|
||||
|
||||
: build-request.expand <include>a/b/c gcc-3.0.1/stlport msvc/stlport msvc debug <include>x/y/z
|
||||
: build-request.expand-no-defaults <include>a/b/c gcc-3.0.1/stlport msvc/stlport msvc debug <include>x/y/z
|
||||
: $(test-space) ;
|
||||
|
||||
local r ;
|
||||
|
||||
@ -456,7 +456,7 @@ rule extend ( feature-or-property subfeature ? : values * )
|
||||
#
|
||||
# subfeature toolset gcc-2.95.2 target-platform : aix linux mac cygwin
|
||||
#
|
||||
rule subfeature ( feature value-string ? : subfeature : subvalues * )
|
||||
rule subfeature ( feature value-string ? : subfeature : subvalues * : attributes * )
|
||||
{
|
||||
feature = [ grist $(feature) ] ;
|
||||
validate-feature $(feature) ;
|
||||
@ -467,7 +467,7 @@ rule subfeature ( feature value-string ? : subfeature : subvalues * )
|
||||
$(feature).subfeatures += $(subfeature) ;
|
||||
extend-subfeature $(feature) $(value-string) : $(subfeature) : $(subvalues) ;
|
||||
local f = [ utility.ungrist $(feature) ] ;
|
||||
feature $(f)-$(subfeature) : $(subvalues) : optional ;
|
||||
feature $(f)-$(subfeature) : $(subvalues) : $(attributes) ;
|
||||
}
|
||||
|
||||
# Set the components of the given composite property
|
||||
@ -660,7 +660,7 @@ rule add-defaults ( properties * )
|
||||
if $(v) in $(properties)
|
||||
{
|
||||
error add-defaults requires explicitly specified features,
|
||||
but $(v) appears to be the value of an un-expanded implicit feature ;
|
||||
but \"$(v)\" appears to be the value of an un-expanded implicit feature ;
|
||||
}
|
||||
}
|
||||
local missing = [ set.difference $(.all-features) : $(properties:G) ] ;
|
||||
@ -725,7 +725,7 @@ local rule __test__ ( )
|
||||
|
||||
extend-feature toolset : msvc metrowerks ;
|
||||
subfeature toolset gcc : version : 2.95.2 2.95.3 2.95.4
|
||||
3.0 3.0.1 3.0.2 ;
|
||||
3.0 3.0.1 3.0.2 : optional ;
|
||||
|
||||
assert.result <toolset>gcc <toolset-version>3.0.1
|
||||
: expand-subfeatures <toolset>gcc-3.0.1 ;
|
||||
@ -734,7 +734,7 @@ local rule __test__ ( )
|
||||
: expand-subfeatures gcc-3.0.1 ;
|
||||
|
||||
feature dummy : dummy1 dummy2 ;
|
||||
subfeature dummy : subdummy : x y z ;
|
||||
subfeature dummy : subdummy : x y z : optional ;
|
||||
|
||||
assert.result a c e
|
||||
: get-values x : <x>a <y>b <x>c <y>d <x>e ;
|
||||
|
||||
@ -198,7 +198,7 @@ rule basic-target ( name : project
|
||||
if ! $(properties)
|
||||
{
|
||||
# CONSIDER: I'm really not sure if this is correct...
|
||||
properties = [ build-request.expand-with-defaults $(self.default-build) ] ;
|
||||
properties = [ build-request.expand $(self.default-build) ] ;
|
||||
local result = ;
|
||||
for local p in $(properties)
|
||||
{
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Comprehensive tests for Boost.Build v2; requires Python. To test, execute:
|
||||
|
||||
python test-all.py
|
||||
python test_all.py
|
||||
|
||||
Loading…
Reference in New Issue
Block a user