Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r61054 - in trunk/tools/build/v2: build test
From: ghost_at_[hidden]
Date: 2010-04-04 17:04:49


Author: vladimir_prus
Date: 2010-04-04 17:04:48 EDT (Sun, 04 Apr 2010)
New Revision: 61054
URL: http://svn.boost.org/trac/boost/changeset/61054

Log:
Disambiguiate targets and directories passed to 'build-project'.

Previously, if a Jamfile had:
    exe a : a.cpp ;
    build-project a ;
where a is also a subdirectory, we'd get error.

Text files modified:
   trunk/tools/build/v2/build/targets.jam | 2 +-
   trunk/tools/build/v2/test/build_dir.py | 1 +
   2 files changed, 2 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/build/targets.jam
==============================================================================
--- trunk/tools/build/v2/build/targets.jam (original)
+++ trunk/tools/build/v2/build/targets.jam 2010-04-04 17:04:48 EDT (Sun, 04 Apr 2010)
@@ -288,7 +288,7 @@
         local self-location = [ get location ] ;
         for local pn in [ get projects-to-build ]
         {
- result += [ find $(pn) ] ;
+ result += [ find $(pn)/ ] ;
         }
 
         return $(result) ;

Modified: trunk/tools/build/v2/test/build_dir.py
==============================================================================
--- trunk/tools/build/v2/test/build_dir.py (original)
+++ trunk/tools/build/v2/test/build_dir.py 2010-04-04 17:04:48 EDT (Sun, 04 Apr 2010)
@@ -36,6 +36,7 @@
 
 # Test that building from child projects work.
 t.run_build_system(subdir='src')
+t.ignore("build/config.log")
 t.expect_nothing_more()
 
 # Test that project can override build dir.


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk