From: jurko.gospodnetic_at_[hidden]
Date: 2008-01-06 02:28:48
Author: jurko
Date: 2008-01-06 02:28:47 EST (Sun, 06 Jan 2008)
New Revision: 42514
URL: http://svn.boost.org/trac/boost/changeset/42514
Log:
Added the --ignore-site-config option telling Boost.Build not to load the site configuration file.
Text files modified:
trunk/tools/build/v2/build-system.jam | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
Modified: trunk/tools/build/v2/build-system.jam
==============================================================================
--- trunk/tools/build/v2/build-system.jam (original)
+++ trunk/tools/build/v2/build-system.jam 2008-01-06 02:28:47 EST (Sun, 06 Jan 2008)
@@ -269,7 +269,8 @@
# 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-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 @@
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) ;
}