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

Speedup: call 'normalize-raw-paths' only when we're really going to

Browse Source 
load module.


[SVN r18687]
This commit is contained in:
Vladimir Prus
2003-06-06 06:31:25 +00:00
parent 736169e2b3
commit 4fa7253c46
2 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
kernel/modules.jam
View File

@@ -265,32 +265,37 @@ rule import ( module-names + : rules-opt * : rename-opt * )
errors.error when loading multiple modules, no specific rules or renaming is allowed ;
}
# if the importing module isn't already in the BOOST_BUILD_PATH,
# prepend it to the path. We don't want to invert the search
# order of modules that are already there.
local caller = [ CALLER_MODULE ] ;
local cwd = [ PWD ] ;
local caller-location ;
if $(caller)
{
caller-location = [ binding $(caller) ] ;
caller-location = $(caller-location:D) ;
caller-location = [ normalize-raw-paths $(caller-location:R=$(cwd)) ] ;
}
local search = [ peek : BOOST_BUILD_PATH ] ;
search = [ normalize-raw-paths $(search:R=$(cwd)) ] ;
if $(caller-location) && ! $(caller-location) in $(search)
{
search = $(caller-location) $(search) ;
}
local caller = [ CALLER_MODULE ] ;
# Import each specified module
for local m in $(module-names)
{
load $(m) : : $(search) ;
if ! $(m) in $(.loaded)
{
# if the importing module isn't already in the BOOST_BUILD_PATH,
# prepend it to the path. We don't want to invert the search
# order of modules that are already there.
local cwd = [ PWD ] ;
local caller-location ;
if $(caller)
{
caller-location = [ binding $(caller) ] ;
caller-location = $(caller-location:D) ;
caller-location = [ normalize-raw-paths $(caller-location:R=$(cwd)) ] ;
}
local search = [ peek : BOOST_BUILD_PATH ] ;
search = [ normalize-raw-paths $(search:R=$(cwd)) ] ;
if $(caller-location) && ! $(caller-location) in $(search)
{
search = $(caller-location) $(search) ;
}
load $(m) : : $(search) ;
}
local all-rules = [ RULENAMES $(m) ] ;
# import all the rules with qualification

51
v2/kernel/modules.jam
View File

@@ -265,32 +265,37 @@ rule import ( module-names + : rules-opt * : rename-opt * )
errors.error when loading multiple modules, no specific rules or renaming is allowed ;
}
# if the importing module isn't already in the BOOST_BUILD_PATH,
# prepend it to the path. We don't want to invert the search
# order of modules that are already there.
local caller = [ CALLER_MODULE ] ;
local cwd = [ PWD ] ;
local caller-location ;
if $(caller)
{
caller-location = [ binding $(caller) ] ;
caller-location = $(caller-location:D) ;
caller-location = [ normalize-raw-paths $(caller-location:R=$(cwd)) ] ;
}
local search = [ peek : BOOST_BUILD_PATH ] ;
search = [ normalize-raw-paths $(search:R=$(cwd)) ] ;
if $(caller-location) && ! $(caller-location) in $(search)
{
search = $(caller-location) $(search) ;
}
local caller = [ CALLER_MODULE ] ;
# Import each specified module
for local m in $(module-names)
{
load $(m) : : $(search) ;
if ! $(m) in $(.loaded)
{
# if the importing module isn't already in the BOOST_BUILD_PATH,
# prepend it to the path. We don't want to invert the search
# order of modules that are already there.
local cwd = [ PWD ] ;
local caller-location ;
if $(caller)
{
caller-location = [ binding $(caller) ] ;
caller-location = $(caller-location:D) ;
caller-location = [ normalize-raw-paths $(caller-location:R=$(cwd)) ] ;
}
local search = [ peek : BOOST_BUILD_PATH ] ;
search = [ normalize-raw-paths $(search:R=$(cwd)) ] ;
if $(caller-location) && ! $(caller-location) in $(search)
{
search = $(caller-location) $(search) ;
}
load $(m) : : $(search) ;
}
local all-rules = [ RULENAMES $(m) ] ;
# import all the rules with qualification