Merge tag 'upstream/2.5.0'

Upstream version 2.5.0

1 files changed, 53 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 67912f7..5bfed07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,57 @@
 
                             Change Log
 
+RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
+
+  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;
+      SCons now respects scanner keys for implicit dependencies.
+      - Notes for SCons users with heterogeneous systems.
+        - May find new (previously missed) dependencies.
+        - May cause rebuild after upgrade due to dependency changes.
+        - May find new dependency errors (EG. cycles).
+          - Discovered in some of the SCons QT tests.
+    - Resolved missing cross-language dependencies for
+      SWIG bindings (fixes #2264).
+    - Corrected typo in User Guide for Scanner keyword. (PR #2959)
+    - Install builder interacts with scanner found in SCANNERS differently.
+      - Previous: Install builder recursively scanned implicit dependencies
+        for scanners from SCANNER, but not for built-in (default) scanners.
+      - Current: Install builder will not scan for implicit dependencies via
+        either scanner source. This optimizes some Install builder behavior
+        and brings orthogonality to Install builder scanning behavior.
+
+  From William Deegan:
+    - Add better messaging when two environments have
+      different actions for the same target (Bug #2024)
+    - Fix issue only with MSVC and Always build where targets
+      marked AlwaysBuild wouldn't make it into CHANGED_SOURCES
+      and thus yield an empty compile command line. (Bug #2622)
+    - Fix posix platform escaping logic to properly handle paths
+      with parens in them "()".  (Bug #2225)
+
+  From Jakub Pola:
+    - Intel Compiler 2016 (Linux/Mac) update for tool directories.
+
+  From Adarsh Sanjeev:
+    - Fix for issue #2494: Added string support for Chmod function.
+
+  From Tom Tanner:
+    - change cache to use 2 character subdirectories, rather than one character,
+      so as not to give huge directories for large caches, a situation which
+      causes issues for NFS.
+      For existing caches, you will need to run the scons-configure-cache.py
+      script to update them to the new format. You will get a warning every time
+      you build until you co this.
+    - Fix a bunch of unit tests on windows
+
 RELEASE 2.4.1 - Mon, 07 Nov 2015 10:37:21 -0700
 
   From Arfrever Frehtes Taifersar Arahesis:
@@ -5958,5 +6009,5 @@ A brief overview of important functionality available in release 0.01:
 
 
 
-Copyright (c) 2001 - 2015 The SCons Foundation
-src/CHANGES.txt rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog
+Copyright (c) 2001 - 2016 The SCons Foundation
+src/CHANGES.txt rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog