boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

Account for "normalized path" bugs

Browse Source 
[SVN r13622]
This commit is contained in:
Dave Abrahams
2002-05-02 17:08:41 +00:00
parent 548b75e446
commit ca889e05f7
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
new/project.jam
View File

@@ -216,13 +216,13 @@ local rule find-jamfile (
local jamfile-found = ;
for local jamfile in $(jamfile-glob)
{
local normalized = $(jamfile) ;
if ! [ os.path.is_rooted $(jamfile) ]
local normalized = [ os.path.make $(jamfile) ] ;
if ! [ os.path.is_rooted $(normalized) ]
{
local root-path =
[ os.path.parent [ os.path.make [ modules.binding [ CALLER_MODULE ] ] ] ] ;
normalized =
[ os.path.native [ os.path.root_relative_path $(jamfile) $(root-path) ] ] ;
[ os.path.native [ os.path.root_relative_path $(normalized) $(root-path) ] ] ;
}
# Filter out if the found file is above the target parent root.
@@ -234,7 +234,10 @@ local rule find-jamfile (
}
}
jamfile-found += $(normalized) ;
if $(normalized)
{
jamfile-found += [ os.path.native $(normalized) ] ;
}
}
return $(jamfile-found) ;

11
v2/build/project.jam
View File

@@ -216,13 +216,13 @@ local rule find-jamfile (
local jamfile-found = ;
for local jamfile in $(jamfile-glob)
{
local normalized = $(jamfile) ;
if ! [ os.path.is_rooted $(jamfile) ]
local normalized = [ os.path.make $(jamfile) ] ;
if ! [ os.path.is_rooted $(normalized) ]
{
local root-path =
[ os.path.parent [ os.path.make [ modules.binding [ CALLER_MODULE ] ] ] ] ;
normalized =
[ os.path.native [ os.path.root_relative_path $(jamfile) $(root-path) ] ] ;
[ os.path.native [ os.path.root_relative_path $(normalized) $(root-path) ] ] ;
}
# Filter out if the found file is above the target parent root.
@@ -234,7 +234,10 @@ local rule find-jamfile (
}
}
jamfile-found += $(normalized) ;
if $(normalized)
{
jamfile-found += [ os.path.native $(normalized) ] ;
}
}
return $(jamfile-found) ;