[Boost-commit] svn:boost r66406 - in branches/release/tools/build/v2: . util

Subject: [Boost-commit] svn:boost r66406 - in branches/release/tools/build/v2: . util
From: ghost_at_[hidden]
Date: 2010-11-05 11:25:26

Author: vladimir_prus
Date: 2010-11-05 11:25:20 EDT (Fri, 05 Nov 2010)
New Revision: 66406
URL: http://svn.boost.org/trac/boost/changeset/66406

Log:
Merge r64579 | steven_watanabe | 2010-08-03 21:46:19 +0400 (Tue, 03 Aug 2010)

      Make print more robust. This should fix the regression test failure.

Properties modified: 
   branches/release/tools/build/v2/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/util/print.jam |     8 ++++++--                                
   1 files changed, 6 insertions(+), 2 deletions(-)

Modified: branches/release/tools/build/v2/util/print.jam
==============================================================================
--- branches/release/tools/build/v2/util/print.jam	(original)
+++ branches/release/tools/build/v2/util/print.jam	2010-11-05 11:25:20 EDT (Fri, 05 Nov 2010)
@@ -423,7 +423,7 @@
     local scanner = [ get-scanner ] ;
     local file = [ path.native [ modules.binding $(__name__) ] ] ;
     local g = [ MATCH <(.*)> : $(target:G) ] ;
-    local dependency-target = $(__file__:G=$(g)-$(target:G=)-$(scanner)) ;
+    local dependency-target = $(__file__:G=$(g:E=)-$(target:G=)-$(scanner)) ;
     DEPENDS $(target) : $(dependency-target) ;
     SEARCH on $(dependency-target) = $(file:D) ;
     ISFILE $(dependency-target) ;
@@ -449,7 +449,11 @@
         local base = [ on $(target) return $(base) ] ;
         local nl = [ on $(base) return $(nl) ] ;
         local text-content = [ on $(base) return $(text-content) ] ;
-        local dir = [ path.make [ on $(base) return $(LOCATE) ] ] ;
+        local dir = [ on $(base) return $(LOCATE) ] ;
+        if $(dir)
+        {
+            dir = [ path.make $(dir) ] ;
+        }
         local file = [ path.native [ path.join $(dir) $(base:G=) ] ] ;
         local actual-content ;
         if [ os.name ] = NT