Merge branch 'feature/upstream' into develop

1 files changed, 39 insertions, 1 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index ff28506..abcced8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,44 @@
                             Change Log
 
 
+RELEASE 3.0.1 - Mon, 14 Nov 2017 08:28:09 -0700
+
+  From Thomas Berg:
+    - Fixed a regression in scons-3.0.0 where "from __future__ import print_function" was imposed
+      on the scope where SConstruct is executed, breaking existing builds using PY 2.7.
+
+  From William Deegan:
+    - Fix issue where code in utility routine to_String_for_subst() had code whose result was never
+      properly returned.  
+      (Found by: James Rinkevich https://pairlist4.pair.net/pipermail/scons-users/2017-October/006358.html )
+    - Fixed Variables.GenerateHelpText() to now use the sort parameter. Due to incorrect 2to3 fixer changes 
+      8 years ago it was being used as a boolean parameter.  Now you can specify sort to be a callable, or boolean
+      value. (True = normal sort). Manpage also updated.
+    - Fixed Tool loading logic from exploding sys.path with many site_scons/site_tools prepended on py3.
+    - Added additional output with time to process each SConscript file when using --debug=time.
+    - Fix broken subst logic where a string with "$$(abc)" was being treated as "$(abc) and the
+      logic for removing the signature escapes was then failing because there was no closing "$)".
+      This was introduced by a pull request to allow recursive variable evaluations to yield a string
+      such as "$( $( some stuff $) $)".
+
+  From Daniel Moody:
+    - Jar can take multiple targets, and will make a duplicate jar from the sources for each target
+    - Added some warnings in case the Jar builder makes an implicit target
+    - Added Jar method and changed jar build to be more specific. Jar method will take in
+      directories or classes as source. Added more tests to JAR to ensure the jar was 
+      packaged with the correct compiled class files.
+    - Added a No result test case to handle bug which seems unrelated to java in the 
+      swig-dependencies.py test, more info here: http://scons.tigris.org/issues/show_bug.cgi?id=2907
+    - Added a travis script to test on ubuntu trusty now that the project is on github
+      so that Continuus Integration tests can be run automatically. It tests most case and considers 
+      no result a pass as well. Improving this script can install more dependincies allowing for more 
+      tests to be run.
+    - Updated the Jar Builder tool in Tool/__init__.py so that is doesn't force class files as
+      sources, allowing directories to be passed, which was causing test/Java/JAR.py to fail.
+
+  From Zachary Tessler:
+    - Fix incorrect warning for repeated identical builder calls that use overrides
+
 RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
 
 NOTE: This is a major release.  You should expect that some targets may rebuild when upgrading.
@@ -6138,4 +6176,4 @@ A brief overview of important functionality available in release 0.01:
 
 
 Copyright (c) 2001 - 2017 The SCons Foundation
-src/CHANGES.txt rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog
+src/CHANGES.txt 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog