Update of /cvsroot/boost/boost/tools/build/v2/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10123/tools/build/v2/build
Modified Files:
Tag: RC_1_34_0
property-set.jam generators.jam feature.jam
Log Message:
** This comment represents the aggregate changes merged from the **
** bbv2python branch. **
gcc.jam: build and use import libraries on Cygwin and Windows, but
accept DLL-only linking with prebuilt DLLs.
builtin.jam: fix default-host-os so that <target-os> actually becomes
a functional feature. Improve English in comments
property-set.jam: add str method so we can print them in generator
debugging output.
generators.jam: improved debugging output
build-system.jam: add missing semicolon
python.jam:
* fix cross-NT/CYGWIN build support
* add condition to the build requirements of the python targets
os.jam:
* add the ability to get constants for a particular OS
builtin.jam:
* remove "optional" attribute from host-os
* fix confusing indents
python.jam
----------
* Removed comments about known problems because they make no sense.
* Unified MacOS initialization with NT and *nix
* Updated comment describing init behavior
* Support for passing Python command as first argument
* Removed unused get-python-interpreter and get-python-version rules,
since they can't work with that interface. Working versions of
these will be reinstated for Doug Gregor in the near future.
* When invoking Python to collect configuration info, collect it all at at once.
* When a Cygwin symlink is found by an NT build of bjam, give hints
about where to find the file it points at.
* Lots of refactoring
* Make the logic work plausibly even when no Python executable can be found
darwin.jam
----------
* Simplified logic for setting up FRAMEWORK_PATH
* Corrected logic for setting up -framework option
feature.jam
-----------
* Make feature.defaults, feature.attributes, feature.values, and
feature.get-values resilient to feature names being passed without
grist.
gcc.jam, python.jam, builtin.jam
--------------------------------
* Include some progress volodya has made toward support for
<suppress-import-lib>
Index: property-set.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/property-set.jam,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -u -d -r1.24.2.3 -r1.24.2.4
--- property-set.jam 8 Nov 2006 10:02:36 -0000 1.24.2.3
+++ property-set.jam 15 Mar 2007 04:02:24 -0000 1.24.2.4
@@ -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.96.2.10
retrieving revision 1.96.2.11
diff -u -d -r1.96.2.10 -r1.96.2.11
--- generators.jam 6 Jan 2007 13:26:48 -0000 1.96.2.10
+++ generators.jam 15 Mar 2007 04:02:25 -0000 1.96.2.11
@@ -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.60.2.3
retrieving revision 1.60.2.4
diff -u -d -r1.60.2.3 -r1.60.2.4
--- feature.jam 20 Nov 2006 17:15:40 -0000 1.60.2.3
+++ feature.jam 15 Mar 2007 04:02:25 -0000 1.60.2.4
@@ -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
