[Boost-commit] svn:boost r64427 - in trunk/tools/build/v2: . build

Subject: [Boost-commit] svn:boost r64427 - in trunk/tools/build/v2: . build
From: ghost_at_[hidden]
Date: 2010-07-29 03:33:04

Author: vladimir_prus
Date: 2010-07-29 03:33:02 EDT (Thu, 29 Jul 2010)
New Revision: 64427
URL: http://svn.boost.org/trac/boost/changeset/64427

Log:
Fix requesting specific files on the command line
Text files modified: 
   trunk/tools/build/v2/build/project.py |     2 ++                                      
   trunk/tools/build/v2/build/targets.py |     2 +-                                      
   trunk/tools/build/v2/build_system.py  |     4 +++-                                    
   3 files changed, 6 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/build/project.py
==============================================================================
--- trunk/tools/build/v2/build/project.py	(original)
+++ trunk/tools/build/v2/build/project.py	2010-07-29 03:33:02 EDT (Thu, 29 Jul 2010)
@@ -214,6 +214,8 @@
             if not project_module in self.jamfile_modules and \
                b2.util.path.glob([location], self.JAMROOT + self.JAMFILE):
                 project_module = self.load(location)
+            else:
+                project_module = None
 
         return project_module
 

Modified: trunk/tools/build/v2/build/targets.py
==============================================================================
--- trunk/tools/build/v2/build/targets.py	(original)
+++ trunk/tools/build/v2/build/targets.py	2010-07-29 03:33:02 EDT (Thu, 29 Jul 2010)
@@ -738,7 +738,7 @@
                 "Failed to build '%s'\n"
                 "with properties '%s'\n"
                 "because no best-matching alternative could be found."
-                  % (full_name, prop_set.raw ()))
+                  % (self.full_name(), prop_set))
 
         result = best_alternative.generate (prop_set)
                     

Modified: trunk/tools/build/v2/build_system.py
==============================================================================
--- trunk/tools/build/v2/build_system.py	(original)
+++ trunk/tools/build/v2/build_system.py	2010-07-29 03:33:02 EDT (Thu, 29 Jul 2010)
@@ -551,6 +551,8 @@
     virtual_targets = []
     actual_targets = []
 
+    explicitly_requested_files = []
+
     # Process each target specified on the command-line and convert it into
     # internal Boost Build target objects. Detect special clean target. If no
     # main Boost Build targets were explictly requested use the current project
@@ -568,7 +570,7 @@
             if not t:
                 print "notice: could not find main target '%s'" % id
                 print "notice: assuming it's a name of file to create " ;
-                bjam_targets.append(id)
+                explicitly_requested_files.append(id)
             else:
                 targets.append(t)