Update of /cvsroot/boost/boost/tools/build/v2/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9323/tools/build/v2/build
Modified Files:
virtual-target.jam property-set.jam generators.jam feature.jam
Log Message:
Bringing forward BBv2/Python support and a few other things that were
obviously more up-to-date on the RC branch.
Removed the Boost.Python v1 zip archive.
Index: virtual-target.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/virtual-target.jam,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- virtual-target.jam 5 Nov 2006 06:40:20 -0000 1.122
+++ virtual-target.jam 3 Apr 2007 17:10:53 -0000 1.123
@@ -476,7 +476,18 @@
rule add-prefix-and-suffix ( specified-name : type ? : property-set )
{
local suffix = [ type.generated-target-suffix $(type) : $(property-set) ] ;
- suffix = .$(suffix) ;
+
+ # Handle suffixes for which no leading dot is desired. Those are
+ # specified by enclosing them in <...>. Needed by python so it
+ # can create "_d.so" extensions, for example.
+ if $(suffix:G)
+ {
+ suffix = [ utility.ungrist $(suffix) ] ;
+ }
+ else
+ {
+ suffix = .$(suffix) ;
+ }
local prefix = [ type.generated-target-prefix $(type) : $(property-set) ] ;
Index: property-set.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/property-set.jam,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- property-set.jam 8 Nov 2006 10:01:35 -0000 1.27
+++ property-set.jam 3 Apr 2007 17:10:53 -0000 1.28
@@ -101,6 +101,11 @@
return $(self.raw) ;
}
+ rule str ( )
+ {
+ return "[" $(self.raw) "]" ;
+ }
+
# Returns properties that are neither incidental nor free
rule base ( )
{
Index: generators.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/generators.jam,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- generators.jam 6 Jan 2007 13:14:21 -0000 1.107
+++ generators.jam 3 Apr 2007 17:10:53 -0000 1.108
@@ -842,6 +842,9 @@
local usage-requirements ;
local success ;
+
+ generators.dout [ indent ] returned $(targets) ;
+
if $(targets)
{
success = true ;
@@ -859,6 +862,12 @@
generators.dout [ indent ] " generator" [ $(generator).id ] " spawned " ;
generators.dout [ indent ] " " $(targets) ;
+ if $(usage-requirements)
+ {
+ generators.dout [ indent ] " with usage requirements:" $(x) ;
+ }
+
+
if $(success)
{
return $(usage-requirements) $(targets) ;
Index: feature.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/feature.jam,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- feature.jam 11 Nov 2006 22:58:18 -0000 1.64
+++ feature.jam 3 Apr 2007 17:10:53 -0000 1.65
@@ -165,13 +165,14 @@
local result ;
for local f in $(features)
{
- local a = $($(f).attributes) ;
+ local gf = $(:E=:G=$(f)) ;
+ local a = $($(gf).attributes) ;
if ( free in $(a) ) || ( optional in $(a) )
{
}
else
{
- result += $(f)$($(f).default) ;
+ result += $(gf)$($(gf).default) ;
}
}
return $(result) ;
@@ -189,13 +190,13 @@
# return the attibutes of the given feature
rule attributes ( feature )
{
- return $($(feature).attributes) ;
+ return $($(:E=:G=$(feature)).attributes) ;
}
# return the values of the given feature
rule values ( feature )
{
- return $($(feature).values) ;
+ return $($(:E=:G=$(feature)).values) ;
}
# returns true iff 'value-string' is a value-string of an implicit feature
@@ -640,6 +641,8 @@
rule get-values ( feature : properties * )
{
local result ;
+
+ feature = $(:E=:G=$(feature)) ; # add <> if necessary.
for local p in $(properties)
{
if $(p:G) = $(feature)
@@ -1050,6 +1053,8 @@
compose <variant>debug : <define>_DEBUG <optimization>off ;
compose <variant>release : <define>NDEBUG <optimization>on ;
+ assert.result dynamic static : values <runtime-link> ;
+ assert.result dynamic static : values runtime-link ;
try ;
{
@@ -1128,12 +1133,20 @@
: defaults <runtime-link> <define> <optimization>
;
+ # make sure defaults is resilient to missing grist.
+ assert.result <runtime-link>dynamic <optimization>on
+ : defaults runtime-link define optimization
+ ;
+
feature dummy : dummy1 dummy2 ;
subfeature dummy : subdummy : x y z : optional ;
feature fu : fu1 fu2 : optional ;
subfeature fu : subfu : x y z : optional ;
subfeature fu : subfu2 : q r s ;
+
+ assert.result optional : attributes <fu> ;
+ assert.result optional : attributes fu ;
assert.result <runtime-link>static <define>foobar <optimization>on
<toolset>gcc:<define>FOO
<toolset>gcc <variant>debug <stdlib>native <dummy>dummy1
<toolset-gcc:version>2.95.2
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
