diff options
| -rw-r--r-- | README.rst | 12 | ||||
| -rw-r--r-- | src/CHANGES.txt | 20 | ||||
| -rw-r--r-- | src/engine/SCons/Builder.py | 2 | ||||
| -rw-r--r-- | test/Builder/different-actions.py | 2 | ||||
| -rw-r--r-- | test/Builder/multi/different-environments.py | 5 |
5 files changed, 31 insertions, 10 deletions
@@ -1,6 +1,18 @@ SCons - a software construction tool #################################### +.. image:: https://img.shields.io/badge/IRC-scons-blue.svg + :target: http://webchat.freenode.net/?channels=%23scons&uio=d4 + :alt: IRC + +.. image:: https://img.shields.io/sourceforge/dm/scons.svg + :target: https://sourceforge.net/projects/scons + :alt: Sourceforge Monthly Downloads + +.. image:: https://img.shields.io/sourceforge/dt/scons.svg + :target: https://sourceforge.net/projects/scons + :alt: Sourceforge Total Downloads + Welcome to the SCons development tree. The real purpose of this tree is to package SCons for production distribution in a variety of formats, not just to hack SCons code. diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 6f7bd4c..c05682c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,8 +6,12 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - From Jakub Pola: - - Intel Compiler 2016 (Linux/Mac) update for tool directories. + From Dirk Baechle: + - Removed a lot of compatibility methods and workarounds + for Python versions < 2.7, in order to prepare the work + towards a combined 2.7/3.x version. (PR #284) + Also fixed the default arguments for the print_tree and + render_tree methods. (PR #284, too) From William Blevins: - Added support for cross-language dependency scanning; @@ -15,12 +19,12 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Resolved missing cross-language dependencies for SWIG bindings (fixes #2264). - From Dirk Baechle: - - Removed a lot of compatibility methods and workarounds - for Python versions < 2.7, in order to prepare the work - towards a combined 2.7/3.x version. (PR #284) - Also fixed the default arguments for the print_tree and - render_tree methods. (PR #284, too) + From William Deegan: + - Add better messaging when two environments have + different actions for the same target (Bug #2024) + + From Jakub Pola: + - Intel Compiler 2016 (Linux/Mac) update for tool directories. RELEASE 2.4.1 - Mon, 07 Nov 2015 10:37:21 -0700 diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index e034cad..50e85ec 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -299,7 +299,7 @@ def _node_errors(builder, env, tlist, slist): msg = "Two different environments were specified for target %s,\n\tbut they appear to have the same action: %s" % (t, action.genstring(tlist, slist, t.env)) SCons.Warnings.warn(SCons.Warnings.DuplicateEnvironmentWarning, msg) else: - msg = "Two environments with different actions were specified for the same target: %s" % t + msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents,contents) raise UserError(msg) if builder.multi: if t.builder != builder: diff --git a/test/Builder/different-actions.py b/test/Builder/different-actions.py index 33a1363..d84a9f9 100644 --- a/test/Builder/different-actions.py +++ b/test/Builder/different-actions.py @@ -43,6 +43,8 @@ e2.Command('out.txt', [], 'echo 2 > $TARGET') expect = TestSCons.re_escape(""" scons: *** Two environments with different actions were specified for the same target: out.txt +(action 1: echo 1 > out.txt) +(action 2: echo 2 > out.txt) """) + TestSCons.file_expr test.run(arguments='out.txt', status=2, stderr=expect) diff --git a/test/Builder/multi/different-environments.py b/test/Builder/multi/different-environments.py index ad5154a..783b7f9 100644 --- a/test/Builder/multi/different-environments.py +++ b/test/Builder/multi/different-environments.py @@ -30,6 +30,7 @@ but the overrides don't appear to affect the build operation. """ import TestSCons +import sys test = TestSCons.TestSCons(match=TestSCons.match_re) @@ -57,7 +58,9 @@ test.write('file03b.in', 'file03b.in\n') expect = TestSCons.re_escape(""" scons: *** Two environments with different actions were specified for the same target: file03.out -""") + TestSCons.file_expr +(action 1: %s build.py 1 file03.out file03b.in) +(action 2: %s build.py 2 file03.out file03b.in) +""" % (sys.executable, sys.executable )) + TestSCons.file_expr test.run(arguments='file03.out', status=2, stderr=expect) |