Merge branch 'feature/upstream' into develop

1 files changed, 62 insertions, 45 deletions

diff --git a/RELEASE.txt b/RELEASE.txt
index db86a71..5f84c9e 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1,73 +1,90 @@
-  A new SCons checkpoint release, 3.1.1, is now available
+  A new SCons checkpoint release, 3.1.2, is now available
   on the SCons download page:
 
           https://scons.org/pages/download.html
 
-  XXX The primary purpose of this release ... XXX
+  Here is a summary of the changes since 3.1.1:
 
-  A SCons "checkpoint release" is intended to provide early access to
-  new features so they can be tested in the field before being released
-  for adoption by other software distributions.
-
-  Note that a checkpoint release is developed using the same test-driven
-  development methodology as all SCons releases.  Existing SCons
-  functionality should all work as it does in previous releases (except
-  for any changes identified in the release notes) and early adopters
-  should be able to use a checkpoint release safely for production work
-  with existing SConscript files.  If not, it represents not only a bug
-  in SCons but also a hole in the regression test suite, and we want to
-  hear about it.
-
-  New features may be more lightly tested than in past releases,
-  especially as concerns their interaction with all of the other
-  functionality in SCons.  We are especially interested in hearing bug
-  reports about new functionality.
-
-  We do not recommend that downstream distributions (Debian, Fedora,
-  etc.) package a checkpoint release, mainly to avoid confusing the
-  "public" release numbering with the long checkpoint release names.
-
-  Here is a summary of the changes since 1.3.0:
+  NOTE: The 4.0.0 Release of SCons will drop Python 2.7 Support
 
   NEW FUNCTIONALITY
+    - Added debug option "action_timestamps" which outputs to stdout the absolute start and end time for each target.
 
-    - List new features (presumably why a checkpoint is being released)
-
-  DEPRECATED FUNCTIONALITY
+  REMOVED FUNCTIONALITY
+    - Turn previously deprecated debug options into failures:
+      --debug=tree, --debug=dtree, --debug=stree, --debug=nomemoizer.
+    - Remove deprecated SourceSignatures, TargetSignatures
+    - Remove deprecated Builder keywords: overrides and scanner
+    - Remove deprecated env.Copy
+    - Remove deprecated BuildDir plus SConscript keyword build_dir
 
-    - List anything that's been deprecated since the last release
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
-
-    - List modifications to existing features, where the previous behavior
-      wouldn't actually be considered a bug
+    - Update Command() function to accept target_scanner, source_factory, and target_factory arguments.
+      This makes Command act more like a one-off builder.
+    - Added support for "-imacros" to ParseFlags
+    - EXPERIMENTAL NEW FEATURE: Enable caching MSVC configuration
+      If SCONS_CACHE_MSVC_CONFIG shell environment variable is set,
+      SCons will cache the results of past calls to vcvarsall.bat to
+      a file; integrates with existing memoizing of such vars.
+      On vs2019 saves 5+ seconds per SCons invocation, which really
+      helps test suite runs.
 
   FIXES
-
-    - List fixes of outright bugs
+    - Fix suncxx tool (Oracle Studio compiler) when using Python 3.  Previously would throw an exception.
+      Resolved by properly handling tool version string output as unicode.
+    - Resolved a race condition in multithreaded Windows builds with Python 2
+      in the case where a child process is spawned while a Python action has a
+      file open. Original author: Ryan Beasley.
+    - Fix CheckFunc detection code for Visual 2019. Some functions
+      (e.g. memmove) were incorrectly recognized as not available.
+    - Fix stacktrace when using SCons with Python 3.5+ and SunOS/Solaris related tools.
+    - Latex: Avoid crash with UnicodeDecodeError on Python 3 when a Latex log file in
+      non-UTF-8 encoding (e.g. containing umlauts in Latin-1 encoding when
+      the fontenc package is included with \usepackage[T1]{fontenc}) is read.
+    - CmdStringHolder fix from issue #3428
 
   IMPROVEMENTS
+    - Improved threading performance by ensuring NodeInfo is shared
+      across threads. Results in ~13% improvement for parallel builds
+      (-j# > 1) with many shared nodes.
+    - Improve performance of Entry.disambiguate() by making check for
+      most common case first, preventing unnecessary IO.
+    - Improved DAG walk performance by reducing unnecessary work when
+      there are no un-visited children.
 
-    - List improvements that wouldn't be visible to the user in the
-      documentation:  performance improvements (describe the circumstances
-      under which they would be observed), or major code cleanups
 
   PACKAGING
 
-    - List changes in the way SCons is packaged and/or released
+     - N/A
 
   DOCUMENTATION
 
-    - List any significant changes to the documentation (not individual
-      typo fixes, even if they're mentioned in src/CHANGES.txt to give
-      the contributor credit)
+    -  N/A
 
   DEVELOPMENT
 
-    - List visible changes in the way SCons is developed
+    - N/A
+
+
+Thanks to the following developers for their contributions to this release.
+git shortlog --no-merges -ns 3.1.1..HEAD
+    59  Mats Wichmann
+    21  William Deegan
+     8  Edoardo Bezzeccheri
+     5  Adam Gross
+     5  maiphi
+     4  Ivan Kravets
+     4  Mathew Robinson
+     2  Jakub Kulík
+     2  Jacek Kuczera
+     2  Rob Boehne
+     2  Jason Kenny
+     2  Tim Gates
+     1  Jakub Kulik
+     1  Theogen Ratkin
+     1  jw0k
 
-  Thanks to CURLY, LARRY, and MOE for their contributions to this release.
-  Contributors are listed alphabetically by their last name.
 
 Copyright (c) 2001 - 2019 The SCons Foundation
-src/RELEASE.txt 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan
+src/RELEASE.txt bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan