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

More fixes to common.find-path for case the 'path-last' is true.

Browse Source 
[SVN r23388]
This commit is contained in:
Vladimir Prus
2004-07-07 07:03:32 +00:00
parent e3ae4eb059
commit f9b602480d
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
v2/tools/common.jam
View File

@@ -116,7 +116,7 @@ rule get-invocation-command (
local command ;
if ! $(user-provided-command)
{
command = [ common.find-tool $(tool) : $(additional-paths) : path-last ] ;
command = [ common.find-tool $(tool) : $(additional-paths) : $(path-last) ] ;
if ! $(command)
{
ECHO "warning: toolset $(toolset) initialization: can't find tool $(tool)" ;
@@ -165,30 +165,33 @@ rule get-absolute-tool-path ( command )
# If 'path-last' is specified, path is checked after 'additional-paths'.
rule find-tool ( name : additional-paths * : path-last ? )
{
local m ;
local path = [ sequence.transform path.make : [ modules.peek : PATH Path path ] ] ;
local match = [ path.glob $(path) : $(name) $(name).exe ] ;
local additional-match = [ path.glob $(additional-paths) : $(name) $(name).exe ] ;
local result ;
if $(path-last)
{
m = [ path.glob $(additional-paths) : $(name) $(name).exe ] ;
{
result = $(additional-match) ;
if ! $(result) && $(match)
{
result = $(name) ;
}
}
else
{
m = [ GLOB [ modules.peek : PATH Path path ] : $(name) $(name).exe ] ;
}
if $(m)
{
return $(name) ;
}
else
{
if $(path-last)
if $(match)
{
return [ GLOB [ modules.peek : PATH Path path ] : $(name) $(name).exe ] ;
result = $(name) ;
}
else
{
return [ path.glob $(additional-paths) : $(name) $(name).exe ] ;
}
{
result = $(additional-match) ;
}
}
if $(result)
{
return [ path.native $(result[1]) ] ;
}
}