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

Added the --ignore-site-config option telling Boost.Build not to load the site configuration file.

Browse Source 
[SVN r42514]
This commit is contained in:
Jurko Gospodnetić
2008-01-06 07:28:47 +00:00
parent 1bde777472
commit 1d2e1e8a8a
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
v2/build-system.jam
View File

@@ -269,7 +269,8 @@ local rule load-config ( module-name : filename : path + : must-find ? )
# Always named site-config.jam. Will only be found if located on the system
# root path (Windows), /etc (non-Windows), user's home folder or the Boost Build
# path, in that order. Not loaded in case the test-config configuration file is
# loaded or the --ignore-config command-line options is specified.
# loaded or either the --ignore-site-config or the --ignore-config command-line
# option is specified.
#
# -- user-config --
# Named user-config.jam by default but may be explicitly renamed using the
@@ -285,6 +286,10 @@ local rule load-config ( module-name : filename : path + : must-find ? )
#
local rule load-configuration-files
{
# Flag indicating that site configuration should not be loaded.
local ignore-site-config =
[ MATCH ^(--ignore-site-config)$ : $(.argv) ] ;
if $(.legacy-ignore-config) && $(.debug-config)
{
ECHO "notice: Regular site and user configuration files will be ignored" ;
@@ -319,8 +324,14 @@ local rule load-configuration-files
site-path = [ modules.peek : SystemRoot ] $(user-path) ;
}
if $(ignore-site-config) && !$(.legacy-ignore-config)
{
ECHO "notice: Site configuration files will be ignored due to the" ;
ECHO "notice: --ignore-site-config command-line option." ;
}
initialize-config-module site-config ;
if ! $(test-config) && ! $(.legacy-ignore-config)
if ! $(test-config) && ! $(ignore-site-config) && ! $(.legacy-ignore-config)
{
load-config site-config : site-config.jam : $(site-path) ;
}