From efe586285488a4b2087631c54e14b5c07f6f7909 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 13 Jan 2016 16:20:00 -0800 Subject: Fix bug 2081: Better messaging for different actions for same target in two environments --- src/engine/SCons/Builder.py | 2 +- test/Builder/different-actions.py | 2 ++ test/Builder/multi/different-environments.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index b457d1e..80dcaca 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..68749cf 100644 --- a/test/Builder/multi/different-environments.py +++ b/test/Builder/multi/different-environments.py @@ -57,6 +57,8 @@ 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 +(action 1: /usr/bin/python build.py 1 file03.out file03b.in) +(action 2: /usr/bin/python build.py 2 file03.out file03b.in) """) + TestSCons.file_expr test.run(arguments='file03.out', status=2, stderr=expect) -- cgit v0.12 From 004f199b69e50f4418edacb57d6aafbdfa990d15 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 13 Jan 2016 16:21:50 -0800 Subject: Fix bug 2081: Better messaging for different actions for same target in two environments --- src/CHANGES.txt | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 13a1697..f59eaaf 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 -- cgit v0.12 From 4ab77641ede6bdb2d6b30c4038b3691cc36d0450 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 14 Jan 2016 16:50:47 +0000 Subject: README.rst edited online with Bitbucket --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 5710586..ca71f44 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,10 @@ SCons - a software construction tool #################################### +.. image:: https://img.shields.io/badge/IRC-pyinstalller-blue.svg + :target: http://webchat.freenode.net/?channels=%23scons&uio=d4 + :alt: IRC + 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. -- cgit v0.12 From 6a98fffc60e1789b37627181b71dbb0d4f01674d Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 14 Jan 2016 16:56:23 +0000 Subject: Added shields from shields.io.. --- README.rst | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index ca71f44..b4b24b7 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,17 @@ SCons - a software construction tool #################################### -.. image:: https://img.shields.io/badge/IRC-pyinstalller-blue.svg +.. 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 -- cgit v0.12 From 447fe1ef8e8974b1862fa87fa730b38a50db0c7f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 14 Jan 2016 11:38:14 -0800 Subject: fix test which was expecting a given location for python binary running the test --- test/Builder/multi/different-environments.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/Builder/multi/different-environments.py b/test/Builder/multi/different-environments.py index 68749cf..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,9 +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 -(action 1: /usr/bin/python build.py 1 file03.out file03b.in) -(action 2: /usr/bin/python build.py 2 file03.out file03b.in) -""") + 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) -- cgit v0.12