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

Cleaned up Boost Build error & debugging messages displayed when loading configuration files.

Browse Source 
[SVN r79167]
This commit is contained in:
Jurko Gospodnetić
2012-06-29 18:03:57 +00:00
parent 41125133ad
commit 7f0741c2a9
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/build-system.jam
View File

@@ -235,8 +235,10 @@ local rule load-config ( module-name : filename : path + : must-find ? )
{
if $(.debug-config)
{
ECHO notice: Searching $(path) for $(module-name) configuration file
$(filename) . ;
local path-string = $(path) ;
if $(path-string) = "" { path-string = . ; }
ECHO notice: Searching '$(path-string)' for $(module-name)
configuration file '$(filename)'. ;
}
local where = [ GLOB $(path) : $(filename) ] ;
if $(where)
@@ -244,8 +246,11 @@ local rule load-config ( module-name : filename : path + : must-find ? )
where = [ NORMALIZE_PATH $(where[1]) ] ;
if $(.debug-config)
{
ECHO notice: Loading $(module-name) configuration file $(filename)
from $(where) . ;
local where-string = $(where:D) ;
if $(where-string) = "" { where-string = . ; }
where-string = '$(where-string)' ;
ECHO notice: Loading $(module-name) configuration file '$(filename)'
from $(where-string:J=" "). ;
}
# Set source location so that path-constant in config files with
@@ -256,19 +261,20 @@ local rule load-config ( module-name : filename : path + : must-find ? )
modules.load $(module-name) : $(filename) : $(path) ;
project.load-used-projects $(module-name) ;
}
else
else if $(must-find) || $(.debug-config)
{
local path-string = $(path) ;
if $(path-string) = "" { path-string = . ; }
path-string = '$(path-string)' ;
path-string = $(path-string:J=" ") ;
if $(must-find)
{
import errors ;
errors.user-error Configuration file $(filename) not found "in"
$(path) . ;
}
if $(.debug-config)
{
ECHO notice: Configuration file $(filename) not found "in" $(path) .
;
errors.user-error Configuration file '$(filename)' not found "in"
$(path-string). ;
}
ECHO notice: Configuration file '$(filename)' not found "in"
$(path-string). ;
}
return $(where) ;
}