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

Report location of site-config and user-config before loading them, so

Browse Source 
that we output location even if site-config exists with a fatal error.


[SVN r29584]
This commit is contained in:
Vladimir Prus
2005-06-15 11:43:50 +00:00
parent 4c496ca33c
commit be7f7e47f4
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/build-system.jam
View File

@@ -56,21 +56,29 @@ module site-config
}
if ! $(ignore-config)
{
{
local path ;
if [ os.name ] in NT CYGWIN
{
modules.load site-config : : [ modules.peek : SystemRoot ] $(user-path) ;
path = [ modules.peek : SystemRoot ] $(user-path) ;
}
else
{
modules.load site-config : : /etc $(user-path) ;
path = /etc $(user-path) ;
}
if --debug-configuration in [ modules.peek : ARGV ]
{
ECHO "notice: loaded site-config.jam from "
[ NORMALIZE_PATH [ modules.binding site-config ] ] ;
}
local where = [ GLOB $(path) : site-config.jam ] ;
if $(where)
{
ECHO "notice: loading site-config.jam from"
[ NORMALIZE_PATH $(where[1]) ] ;
}
}
modules.load site-config : : $(path) ;
}
@@ -83,12 +91,17 @@ module user-config
if ! $(ignore-config)
{
modules.load user-config : : $(user-path) ;
if --debug-configuration in [ modules.peek : ARGV ]
{
ECHO "notice: loaded user-config.jam from "
[ NORMALIZE_PATH [ modules.binding user-config ] ] ;
local where = [ GLOB $(user-path) : user-config.jam ] ;
if $(where)
{
ECHO "notice: loading user-config.jam from"
[ NORMALIZE_PATH $(where[1]) ] ;
}
}
modules.load user-config : : $(user-path) ;
}