boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-18 01:52:17 +00:00
Code Issues Projects Releases Wiki Activity

Uniquely-identify value-specific subfeatures

Browse Source 
[SVN r17516]
This commit is contained in:
Dave Abrahams
2003-02-19 00:57:28 +00:00
parent e6fd724bd8
commit 6db40621b9
4 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
new/build-request.jam
View File

@@ -260,7 +260,7 @@ rule __test__ ( )
: $(test-space) ;
assert.result
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>msvc/<stdlib>stlport/<variant>debug
<toolset>msvc/<variant>debug
@@ -268,7 +268,7 @@ rule __test__ ( )
: $(test-space) ;
assert.result
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>on/<runtime-link>dynamic
<toolset>gcc/<toolset-gcc: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
@@ -276,7 +276,7 @@ rule __test__ ( )
: $(test-space) ;
assert.result
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>msvc/<variant>debug
<variant>debug/<toolset>msvc/<stdlib>stlport
@@ -284,14 +284,14 @@ rule __test__ ( )
: $(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
<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>off
<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>release/<inlining>off
: build-request.expand-no-defaults gcc-3.0.1/stlport debug release <inlining>off
: $(test-space) ;
assert.result
<include>a/b/c/<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<include>x/y/z
<include>a/b/c/<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>debug/<include>x/y/z
<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

37
new/feature.jam
View File

@@ -186,9 +186,7 @@ local rule find-implied-subfeature ( feature subvalue : value-string ? )
error invalid feature $(feature) ;
}
value-string ?= "" ;
return $($(feature)$(value-string)<>$(subvalue).subfeature) ;
return $($(feature)$(value-string:E="")<>$(subvalue).subfeature) ;
}
# Given a feature and a value of one of its subfeatures, find the name
@@ -383,12 +381,13 @@ rule extend-subfeature (
validate-value-string $(feature) $(value-string) ;
}
local subfeature-name = [ get-subfeature-name $(subfeature) $(value-string) ] ;
# provide a way to get from the given feature or property and
# subfeature value to the subfeature name.
value-string ?= "" ;
for local subvalue in $(subvalues)
{
$(feature)$(value-string)<>$(subvalue).subfeature = $(subfeature) ;
$(feature)$(value-string:E="")<>$(subvalue).subfeature = $(subfeature-name) ;
}
}
@@ -446,6 +445,12 @@ rule extend ( feature-or-property subfeature ? : values * )
}
}
local rule get-subfeature-name ( subfeature value-string ? )
{
local prefix = $(value-string): ;
return $(prefix:E="")$(subfeature) ;
}
# Declares a subfeature
rule subfeature (
feature # Root feature that is not a subfeature
@@ -460,14 +465,20 @@ rule subfeature (
{
feature = [ grist $(feature) ] ;
validate-feature $(feature) ;
if $(subfeature) in $($(feature).subfeatures)
# Add grist to the subfeature name if a value-string was supplied
local value-prefix = $(value-string): ;
local subfeature-name = [ get-subfeature-name $(subfeature) $(value-string) ] ;
if $(subfeature-name) in $($(feature).subfeatures)
{
error \"$(subfeature)\" already declared as a subfeature of \"$(feature)\" ;
error \"$(subfeature)\" already declared as a subfeature of \"$(feature)\"
"specific to "$(value-string) ;
}
$(feature).subfeatures += $(subfeature) ;
$(feature).subfeatures += $(subfeature-name) ;
extend-subfeature $(feature) $(value-string) : $(subfeature) : $(subvalues) ;
local f = [ utility.ungrist $(feature) ] ;
feature $(f)-$(subfeature) : $(subvalues) : $(attributes) ;
feature $(f)-$(subfeature-name) : $(subvalues) : $(attributes) ;
}
# Set the components of the given composite property
@@ -660,7 +671,7 @@ rule minimize ( properties * )
{
# locate all subproperties of f in the property set
local subproperties ;
local subfeatures = $($(f).subfeatures) ;
local subfeatures = $($(f).subfeatures:G=) ;
if $(subfeatures)
{
local f_ = [ utility.ungrist $(f) ] ;
@@ -840,13 +851,13 @@ local rule __test__ ( )
action <magic>17 : handle-magic2 ;
action <magic>17 : handle-magic3 ;
assert.result <toolset>gcc <toolset-version>3.0.1
assert.result <toolset>gcc <toolset-gcc:version>3.0.1
: expand-subfeatures <toolset>gcc-3.0.1 ;
assert.result <define>foo=x-y
: expand-subfeatures <define>foo=x-y ;
assert.result <toolset>gcc <toolset-version>3.0.1
assert.result <toolset>gcc <toolset-gcc:version>3.0.1
: expand-subfeatures gcc-3.0.1 ;
feature dummy : dummy1 dummy2 ;
@@ -855,7 +866,7 @@ local rule __test__ ( )
assert.result a c e
: get-values x : <x>a <y>b <x>c <y>d <x>e ;
assert.result <toolset>gcc <toolset-version>3.0.1
assert.result <toolset>gcc <toolset-gcc:version>3.0.1
<variant>debug <define>_DEBUG <optimization>on
: expand gcc-3.0.1 debug <optimization>on
;

12
v2/build/build-request.jam
View File

@@ -260,7 +260,7 @@ rule __test__ ( )
: $(test-space) ;
assert.result
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>msvc/<stdlib>stlport/<variant>debug
<toolset>msvc/<variant>debug
@@ -268,7 +268,7 @@ rule __test__ ( )
: $(test-space) ;
assert.result
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>on/<runtime-link>dynamic
<toolset>gcc/<toolset-gcc: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
@@ -276,7 +276,7 @@ rule __test__ ( )
: $(test-space) ;
assert.result
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>msvc/<variant>debug
<variant>debug/<toolset>msvc/<stdlib>stlport
@@ -284,14 +284,14 @@ rule __test__ ( )
: $(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
<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>off
<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>release/<inlining>off
: build-request.expand-no-defaults gcc-3.0.1/stlport debug release <inlining>off
: $(test-space) ;
assert.result
<include>a/b/c/<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<include>x/y/z
<include>a/b/c/<toolset>gcc/<toolset-gcc:version>3.0.1/<stdlib>stlport/<variant>debug/<include>x/y/z
<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

37
v2/build/feature.jam
View File

@@ -186,9 +186,7 @@ local rule find-implied-subfeature ( feature subvalue : value-string ? )
error invalid feature $(feature) ;
}
value-string ?= "" ;
return $($(feature)$(value-string)<>$(subvalue).subfeature) ;
return $($(feature)$(value-string:E="")<>$(subvalue).subfeature) ;
}
# Given a feature and a value of one of its subfeatures, find the name
@@ -383,12 +381,13 @@ rule extend-subfeature (
validate-value-string $(feature) $(value-string) ;
}
local subfeature-name = [ get-subfeature-name $(subfeature) $(value-string) ] ;
# provide a way to get from the given feature or property and
# subfeature value to the subfeature name.
value-string ?= "" ;
for local subvalue in $(subvalues)
{
$(feature)$(value-string)<>$(subvalue).subfeature = $(subfeature) ;
$(feature)$(value-string:E="")<>$(subvalue).subfeature = $(subfeature-name) ;
}
}
@@ -446,6 +445,12 @@ rule extend ( feature-or-property subfeature ? : values * )
}
}
local rule get-subfeature-name ( subfeature value-string ? )
{
local prefix = $(value-string): ;
return $(prefix:E="")$(subfeature) ;
}
# Declares a subfeature
rule subfeature (
feature # Root feature that is not a subfeature
@@ -460,14 +465,20 @@ rule subfeature (
{
feature = [ grist $(feature) ] ;
validate-feature $(feature) ;
if $(subfeature) in $($(feature).subfeatures)
# Add grist to the subfeature name if a value-string was supplied
local value-prefix = $(value-string): ;
local subfeature-name = [ get-subfeature-name $(subfeature) $(value-string) ] ;
if $(subfeature-name) in $($(feature).subfeatures)
{
error \"$(subfeature)\" already declared as a subfeature of \"$(feature)\" ;
error \"$(subfeature)\" already declared as a subfeature of \"$(feature)\"
"specific to "$(value-string) ;
}
$(feature).subfeatures += $(subfeature) ;
$(feature).subfeatures += $(subfeature-name) ;
extend-subfeature $(feature) $(value-string) : $(subfeature) : $(subvalues) ;
local f = [ utility.ungrist $(feature) ] ;
feature $(f)-$(subfeature) : $(subvalues) : $(attributes) ;
feature $(f)-$(subfeature-name) : $(subvalues) : $(attributes) ;
}
# Set the components of the given composite property
@@ -660,7 +671,7 @@ rule minimize ( properties * )
{
# locate all subproperties of f in the property set
local subproperties ;
local subfeatures = $($(f).subfeatures) ;
local subfeatures = $($(f).subfeatures:G=) ;
if $(subfeatures)
{
local f_ = [ utility.ungrist $(f) ] ;
@@ -840,13 +851,13 @@ local rule __test__ ( )
action <magic>17 : handle-magic2 ;
action <magic>17 : handle-magic3 ;
assert.result <toolset>gcc <toolset-version>3.0.1
assert.result <toolset>gcc <toolset-gcc:version>3.0.1
: expand-subfeatures <toolset>gcc-3.0.1 ;
assert.result <define>foo=x-y
: expand-subfeatures <define>foo=x-y ;
assert.result <toolset>gcc <toolset-version>3.0.1
assert.result <toolset>gcc <toolset-gcc:version>3.0.1
: expand-subfeatures gcc-3.0.1 ;
feature dummy : dummy1 dummy2 ;
@@ -855,7 +866,7 @@ local rule __test__ ( )
assert.result a c e
: get-values x : <x>a <y>b <x>c <y>d <x>e ;
assert.result <toolset>gcc <toolset-version>3.0.1
assert.result <toolset>gcc <toolset-gcc:version>3.0.1
<variant>debug <define>_DEBUG <optimization>on
: expand gcc-3.0.1 debug <optimization>on
;