[Boost-commit] svn:boost r79845 - in trunk/tools/build/v2: . doc/src

Subject: [Boost-commit] svn:boost r79845 - in trunk/tools/build/v2: . doc/src
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-02 06:21:03

Author: jurko
Date: 2012-08-02 06:21:02 EDT (Thu, 02 Aug 2012)
New Revision: 79845
URL: http://svn.boost.org/trac/boost/changeset/79845

Log:
Boost Build cleanup - removed the old legacy --ignore-config command-line option. Has never been documented correctly except in embedded code comments where it has been documented as deprecated for a long time, and has not been used anywhere in Boost Build test code for several years.
Text files modified: 
   trunk/tools/build/v2/build-system.jam     |    49 +++++++-------------------------------- 
   trunk/tools/build/v2/build_system.py      |    43 ++++++++--------------------------      
   trunk/tools/build/v2/doc/src/overview.xml |     9 -------                                 
   3 files changed, 20 insertions(+), 81 deletions(-)

Modified: trunk/tools/build/v2/build-system.jam
==============================================================================
--- trunk/tools/build/v2/build-system.jam	(original)
+++ trunk/tools/build/v2/build-system.jam	2012-08-02 06:21:02 EDT (Thu, 02 Aug 2012)
@@ -41,16 +41,6 @@
 # locating and loading Boost Build configuration files.
 .debug-config = [ MATCH ^(--debug-configuration)$ : $(.argv) ] ;
 
-# Legacy option doing too many things, some of which are not even documented.
-# Should be phased out.
-#   * Disables loading site and user configuration files.
-#   * Disables auto-configuration for toolsets specified explicitly on the
-#     command-line.
-#   * Causes --toolset command-line options to be ignored.
-#   * Prevents the default toolset from being used even if no toolset has been
-#     configured at all.
-.legacy-ignore-config = [ MATCH ^(--ignore-config)$ : $(.argv) ] ;
-
 # The cleaning is tricky. Say, if user says 'bjam --clean foo' where 'foo' is a
 # directory, then we want to clean targets which are in 'foo' as well as those
 # in any children Jamfiles under foo but not in any unrelated Jamfiles. To
@@ -293,8 +283,7 @@
 #   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 either the --ignore-site-config or the --ignore-config command-line
-# option is specified.
+# loaded or the --ignore-site-config command-line option is specified.
 #
 #   -- user-config --
 #   Named user-config.jam by default or may be named explicitly using the
@@ -302,10 +291,9 @@
 # variable. If named explicitly the file is looked for from the current working
 # directory and if the default one is used then it is searched for in the
 # user's home directory and the Boost Build path, in that order. Not loaded in
-# case either the test-config configuration file is loaded, --ignore-config
-# command-line option is specified or an empty file name is explicitly
-# specified. If the file name has been given explicitly then the file must
-# exist.
+# case either the test-config configuration file is loaded or an empty file name
+# is explicitly specified. If the file name has been given explicitly then the
+# file must exist.
 #
 #   -- project-config --
 #   Always named project-config.jam. Looked up in the current working folder and
@@ -320,12 +308,6 @@
     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" ;
-        ECHO "notice: due to the --ignore-config command-line option." ;
-    }
-
     initialize-config-module test-config ;
     local test-config = [ MATCH ^--test-config=(.*)$ : $(.argv) ] ;
     local uq = [ MATCH \"(.*)\" : $(test-config) ] ;
@@ -339,7 +321,7 @@
             [ load-config test-config : $(test-config:BS) : $(test-config:D) ] ;
         if $(where)
         {
-            if $(.debug-config) && ! $(.legacy-ignore-config)
+            if $(.debug-config)
             {
                 ECHO "notice: Regular site and user configuration files will" ;
                 ECHO "notice: be ignored due to the test configuration being"
@@ -359,20 +341,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) && ! $(ignore-site-config) && ! $(.legacy-ignore-config)
+    if ! $(test-config) && ! $(ignore-site-config)
     {
         load-config site-config : site-config.jam : $(site-path) ;
     }
 
     initialize-config-module user-config ;
-    if ! $(test-config) && ! $(.legacy-ignore-config)
+    if ! $(test-config)
     {
         local user-config = [ MATCH ^--user-config=(.*)$ : $(.argv) ] ;
         user-config = $(user-config[-1]) ;
@@ -563,14 +539,7 @@
 
     load-configuration-files ;
 
-    local extra-properties ;
-    # Note that this causes --toolset options to be ignored if --ignore-config
-    # is specified.
-    if ! $(.legacy-ignore-config)
-    {
-        extra-properties = [ process-explicit-toolset-requests ] ;
-    }
-
+    local extra-properties = [ process-explicit-toolset-requests ] ;
 
     # We always load project in "." so that 'use-project' directives have any
     # chance of being seen. Otherwise, we would not be able to refer to
@@ -584,7 +553,7 @@
 
     # In case there are no toolsets currently defined makes the build run using
     # the default toolset.
-    if ! $(.legacy-ignore-config) && ! [ feature.values <toolset> ]
+    if ! [ feature.values <toolset> ]
     {
         local default-toolset = $(.default-toolset) ;
         local default-toolset-version = ;

Modified: trunk/tools/build/v2/build_system.py
==============================================================================
--- trunk/tools/build/v2/build_system.py	(original)
+++ trunk/tools/build/v2/build_system.py	2012-08-02 06:21:02 EDT (Thu, 02 Aug 2012)
@@ -49,16 +49,6 @@
 # locating and loading Boost Build configuration files.
 debug_config = False
 
-# Legacy option doing too many things, some of which are not even documented.
-# Should be phased out.
-#   * Disables loading site and user configuration files.
-#   * Disables auto-configuration for toolsets specified explicitly on the
-#     command-line.
-#   * Causes --toolset command-line options to be ignored.
-#   * Prevents the default toolset from being used even if no toolset has been
-#     configured at all.
-legacy_ignore_config = False
-
 # The cleaning is tricky. Say, if user says 'bjam --clean foo' where 'foo' is a
 # directory, then we want to clean targets which are in 'foo' as well as those
 # in any children Jamfiles under foo but not in any unrelated Jamfiles. To
@@ -234,8 +224,7 @@
 #   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 either the --ignore-site-config or the --ignore-config command-line
-# option is specified.
+# loaded or the --ignore-site-config command-line option is specified.
 #
 #   -- user-config --
 #   Named user-config.jam by default or may be named explicitly using the
@@ -243,10 +232,9 @@
 # variable. If named explicitly the file is looked for from the current working
 # directory and if the default one is used then it is searched for in the
 # user's home directory and the Boost Build path, in that order. Not loaded in
-# case either the test-config configuration file is loaded, --ignore-config
-# command-line option is specified or an empty file name is explicitly
-# specified. If the file name has been given explicitly then the file must
-# exist.
+# case either the test-config configuration file is loaded or an empty file
+# name is explicitly specified. If the file name has been given explicitly then
+# the file must exist.
 #
 # Test configurations have been added primarily for use by Boost Build's
 # internal unit testing system but may be used freely in other places as well.
@@ -256,10 +244,6 @@
     # Flag indicating that site configuration should not be loaded.
     ignore_site_config = "--ignore-site-config" in sys.argv
 
-    if legacy_ignore_config and debug_config:
-        print "notice: Regular site and user configuration files will be ignored"
-        print "notice: due to the --ignore-config command-line option."
-
     initialize_config_module("test-config")
     test_config = None
     for a in sys.argv:
@@ -271,7 +255,7 @@
     if test_config:
         where = load_config("test-config", os.path.basename(test_config), [os.path.dirname(test_config)])
         if where:
-            if debug_config and not legacy_ignore_config:
+            if debug_config:
                 print "notice: Regular site and user configuration files will"
                 print "notice: be ignored due to the test configuration being loaded."
 
@@ -280,16 +264,16 @@
     if os.name in ["nt"]:
         site_path = [os.getenv("SystemRoot")] + user_path
 
-    if ignore_site_config and not legacy_ignore_config:
+    if ignore_site_config:
         print "notice: Site configuration files will be ignored due to the"
         print "notice: --ignore-site-config command-line option."
 
     initialize_config_module("site-config")
-    if not test_config and not ignore_site_config and not legacy_ignore_config:
+    if not test_config and not ignore_site_config:
         load_config('site-config', 'site-config.jam', site_path)
 
     initialize_config_module('user-config')
-    if not test_config and not legacy_ignore_config:
+    if not test_config:
 
         # Here, user_config has value of None if nothing is explicitly
         # specified, and value of '' if user explicitly does not want
@@ -459,10 +443,9 @@
 
 def main_real():
 
-    global debug_config, legacy_ignore_config, out_xml
+    global debug_config, out_xml
 
     debug_config = "--debug-configuration" in sys.argv
-    legacy_ignore_config = "--ignore_config" in sys.argv
     out_xml = any(re.match("^--out-xml=(.*)$", a) for a in sys.argv)
         
     engine = Engine()
@@ -485,11 +468,7 @@
 
     load_configuration_files()
 
-    extra_properties = []
-    # Note that this causes --toolset options to be ignored if --ignore-config
-    # is specified.
-    if not legacy_ignore_config:
-        extra_properties = process_explicit_toolset_requests()
+    extra_properties = process_explicit_toolset_requests()
 
     # We always load project in "." so that 'use-project' directives have any
     # chance of being seen. Otherwise, we would not be able to refer to
@@ -501,7 +480,7 @@
 
     # In case there are no toolsets currently defined makes the build run using
     # the default toolset.
-    if not legacy_ignore_config and not feature.values("toolset"):
+    if not feature.values("toolset"):
 
         dt = default_toolset
         dtv = None

Modified: trunk/tools/build/v2/doc/src/overview.xml
==============================================================================
--- trunk/tools/build/v2/doc/src/overview.xml	(original)
+++ trunk/tools/build/v2/doc/src/overview.xml	2012-08-02 06:21:02 EDT (Thu, 02 Aug 2012)
@@ -751,15 +751,6 @@
           </varlistentry>
           
           <varlistentry>
-            <term><option>--ignore-config</option></term>
-            <listitem>
-              <para>Do not load <literal>site-config.jam</literal> or
-              <literal>user-config.jam</literal>.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
             <term><option>-d0</option></term>
             <listitem>
               <para>Supress all informational messages.</para>