Subject: [Boost-commit] svn:boost r64636 - in trunk/tools/build/v2: build test
From: ghost_at_[hidden]
Date: 2010-08-06 08:45:51
Author: vladimir_prus
Date: 2010-08-06 08:45:48 EDT (Fri, 06 Aug 2010)
New Revision: 64636
URL: http://svn.boost.org/trac/boost/changeset/64636
Log:
Do not make source-location attribute always absolute.
Also, adjust reporting and expectations for metatarget reference
recursion.
Text files modified:
trunk/tools/build/v2/build/project.py | 6 +++---
trunk/tools/build/v2/build/targets.py | 6 ++----
trunk/tools/build/v2/test/loop.py | 1 -
3 files changed, 5 insertions(+), 8 deletions(-)
Modified: trunk/tools/build/v2/build/project.py
==============================================================================
--- trunk/tools/build/v2/build/project.py (original)
+++ trunk/tools/build/v2/build/project.py 2010-08-06 08:45:48 EDT (Fri, 06 Aug 2010)
@@ -306,10 +306,10 @@
is_jamroot = True
jamfile_to_load = jamfile_to_load[0]
-
- # The module of the jamfile.
- dir = os.path.realpath(os.path.dirname(jamfile_to_load))
+ dir = os.path.dirname(jamfile_to_load)
+ if not dir:
+ dir = "."
# Initialize the jamfile module before loading.
#
self.initialize(jamfile_module, dir, os.path.basename(jamfile_to_load))
Modified: trunk/tools/build/v2/build/targets.py
==============================================================================
--- trunk/tools/build/v2/build/targets.py (original)
+++ trunk/tools/build/v2/build/targets.py 2010-08-06 08:45:48 EDT (Fri, 06 Aug 2010)
@@ -197,12 +197,10 @@
"""
if self.targets_being_built_.has_key(id(main_target_instance)):
names = []
- for t in self.targets_being_built_.values():
+ for t in self.targets_being_built_.values() + [main_target_instance]:
names.append (t.full_name())
- get_manager().errors()(
- "Recursion in main target references\n"
- "the following target are being built currently: '%s'" % names)
+ get_manager().errors()("Recursion in main target references\n")
self.targets_being_built_[id(main_target_instance)] = main_target_instance
Modified: trunk/tools/build/v2/test/loop.py
==============================================================================
--- trunk/tools/build/v2/test/loop.py (original)
+++ trunk/tools/build/v2/test/loop.py 2010-08-06 08:45:48 EDT (Fri, 06 Aug 2010)
@@ -21,6 +21,5 @@
t.run_build_system("--no-error-backtrace", status=1)
t.fail_test(string.find(t.stdout(),
"error: Recursion in main target references") == -1)
-t.fail_test(string.find(t.stdout(), "./main ./l ./main") == -1)
t.cleanup()