diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-01-15 08:18:11 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-01-15 08:18:11 (GMT) |
| commit | fc44ee580c0108289037f2a284daa996b8b8060d (patch) | |
| tree | 21e877c75dc79ff5c9c1957c48b0442c3ff669fd /src | |
| parent | 7af8afe47afcb33f62da6a6c452680baf7b3b73b (diff) | |
| parent | d59da7c8d278e1c37f05ce01ca1a14125295ac15 (diff) | |
| download | SCons-fc44ee580c0108289037f2a284daa996b8b8060d.zip SCons-fc44ee580c0108289037f2a284daa996b8b8060d.tar.gz SCons-fc44ee580c0108289037f2a284daa996b8b8060d.tar.bz2 | |
Merge in from default.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 20 | ||||
| -rw-r--r-- | src/engine/SCons/Builder.py | 2 |
2 files changed, 13 insertions, 9 deletions
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: |