boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-18 01:52:17 +00:00
Code Issues Projects Releases Wiki Activity

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

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



[SVN r66406]
This commit is contained in:
Vladimir Prus
2010-11-05 15:25:20 +00:00
parent 16b9b25524
commit d219935c16
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
v2/util/print.jam
View File

@@ -423,7 +423,7 @@ rule check-for-update ( target )
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 @@ class print-scanner : scanner
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