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

Some bug fixes

Browse Source 
[SVN r13623]
This commit is contained in:
Dave Abrahams
2002-05-02 18:59:31 +00:00
parent b4aa7c86c2
commit e9b124397a
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/build/project.jam
View File

@@ -41,6 +41,8 @@ rule load ( jamfile-location )
if $(loaded)
{
.projects += $(jamfile-location) ;
for local subinclude in [ $(module-name).subincludes ]
{
load [ os.path.join $(jamfile-location) $(subinclude) ] ;
@@ -141,7 +143,14 @@ rule assign-option ( module : option + )
#
rule module-name ( jamfile-location )
{
return Jamfile@$(jamfile-location) ;
local absolute
= [ os.path.native
[ os.path.root_relative_path
[ os.path.make $(jamfile-location) ]
[ os.path.make [ PWD ] ]
] ] ;
return Jamfile<$(absolute)> ;
}
#
@@ -152,8 +161,7 @@ rule dump ( )
# Sort projects so that output is independent of order. It is
# needed to allow tests to works despite possible change in
# project inclusion order.
local projects = $(projects) ;
projects = [ sequence.insertion-sort $(projects) ] ;
local projects = [ sequence.insertion-sort $(.projects) ] ;
ECHO "Projects structure dump" ;
ECHO "" ;
@@ -217,13 +225,8 @@ local rule find-jamfile (
for local jamfile in $(jamfile-glob)
{
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 $(normalized) $(root-path) ] ] ;
}
normalized = [ os.path.root_relative_path $(normalized) [ os.path.make [ PWD ] ] ] ;
# Filter out if the found file is above the target parent root.
if $(parent-root)