From: ghost_at_[hidden]
Date: 2007-09-07 19:59:54
Author: vladimir_prus
Date: 2007-09-07 19:59:54 EDT (Fri, 07 Sep 2007)
New Revision: 39164
URL: http://svn.boost.org/trac/boost/changeset/39164
Log:
Implement --ignore-toolset-requirements and set in
during testing.
Text files modified:
trunk/tools/build/v2/build/toolset.jam | 14 +++++++++++++-
trunk/tools/build/v2/test/BoostBuild.py | 1 +
2 files changed, 14 insertions(+), 1 deletions(-)
Modified: trunk/tools/build/v2/build/toolset.jam
==============================================================================
--- trunk/tools/build/v2/build/toolset.jam (original)
+++ trunk/tools/build/v2/build/toolset.jam 2007-09-07 19:59:54 EDT (Fri, 07 Sep 2007)
@@ -18,6 +18,15 @@
.flag-no = 1 ;
+.ignore-requirements = ;
+
+# This is used only for testing, to make sure
+# we don't get random extra elements in paths.
+if --ignore-toolset-requirements in [ modules.peek : ARGV ]
+{
+ .ignore-requirements = 1 ;
+}
+
# Initializes an additional toolset-like module.
# First load 'toolset-module' and then calls its 'init'
# rule with trailing arguments
@@ -480,7 +489,10 @@
# indirect conditional.
rule add-requirements ( requirements * )
{
- .requirements += $(requirements) ;
+ if ! $(.ignore-requirements)
+ {
+ .requirements += $(requirements) ;
+ }
}
local rule __test__ ( )
Modified: trunk/tools/build/v2/test/BoostBuild.py
==============================================================================
--- trunk/tools/build/v2/test/BoostBuild.py (original)
+++ trunk/tools/build/v2/test/BoostBuild.py 2007-09-07 19:59:54 EDT (Fri, 07 Sep 2007)
@@ -222,6 +222,7 @@
program_list.append('-sBOOST_BUILD_PATH=' + boost_build_path)
if verbosity:
program_list += verbosity
+ program_list += ["--ignore-toolset-requirements"]
if arguments:
program_list += arguments.split(" ")