[Boost-commit] svn:boost r64407 - in trunk/tools/build/v2: build kernel tools

Subject: [Boost-commit] svn:boost r64407 - in trunk/tools/build/v2: build kernel tools
From: ghost_at_[hidden]
Date: 2010-07-28 08:27:09

Author: vladimir_prus
Date: 2010-07-28 08:27:08 EDT (Wed, 28 Jul 2010)
New Revision: 64407
URL: http://svn.boost.org/trac/boost/changeset/64407

Log:
Fix header dependencies processing.

Text files modified: 
   trunk/tools/build/v2/build/scanner.py     |     2 +-                                      
   trunk/tools/build/v2/kernel/bootstrap.jam |     4 +++-                                    
   trunk/tools/build/v2/tools/builtin.py     |     4 ++--                                    
   3 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/tools/build/v2/build/scanner.py
==============================================================================
--- trunk/tools/build/v2/build/scanner.py	(original)
+++ trunk/tools/build/v2/build/scanner.py	2010-07-28 08:27:08 EDT (Wed, 28 Jul 2010)
@@ -116,7 +116,7 @@
         bjam.call("mark-included", target, matches)
 
         get_manager().engine().set_target_variable(matches, "SEARCH",
-                                   [target_path] + self.includes)
+                                                   [target_path] + self.includes)
         get_manager().scanners().propagate(self, matches)
 
 class ScannerRegistry:

Modified: trunk/tools/build/v2/kernel/bootstrap.jam
==============================================================================
--- trunk/tools/build/v2/kernel/bootstrap.jam	(original)
+++ trunk/tools/build/v2/kernel/bootstrap.jam	2010-07-28 08:27:08 EDT (Wed, 28 Jul 2010)
@@ -216,7 +216,9 @@
             }
 
             rule mark-included ( targets * : includes * ) {
-                INCLUDES $(targets) : $(INCLUDES) ;
+                NOCARE $(includes) ;
+                INCLUDES $(targets) : $(includes) ;
+                ISFILE $(includes) ;
             }
         }
 

Modified: trunk/tools/build/v2/tools/builtin.py
==============================================================================
--- trunk/tools/build/v2/tools/builtin.py	(original)
+++ trunk/tools/build/v2/tools/builtin.py	2010-07-28 08:27:08 EDT (Wed, 28 Jul 2010)
@@ -379,8 +379,8 @@
         bjam.call("mark-included", target, all)
 
         engine = get_manager().engine()
-        engine.set_target_variable(angle, "SEARCH", self.includes_)
-        engine.set_target_variable(quoted, "SEARCH", self.includes_)
+        engine.set_target_variable(angle, "SEARCH", get_value(self.includes_))
+        engine.set_target_variable(quoted, "SEARCH", get_value(self.includes_))
         
         # Just propagate current scanner to includes, in a hope
         # that includes do not change scanners.