Merge branch 'master' of github.com:SCons/scons

3 files changed, 8 insertions, 70 deletions

diff --git a/src/Announce.txt b/src/Announce.txt
index 1359696..2ceb8bc 100755
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,7 +18,7 @@ So that everyone using SCons can help each other learn how to use it more
 effectively, please go to http://scons.org/lists.html#users to sign up for
 the scons-users mailing list.
 
-RELEASE VERSION/DATE TO BE FILLED IN LATER
+RELEASE 3.1.0 - Mon, 20 Jul 2019 16:59:23 -0700
 
   Please consult the RELEASE.txt file for a summary of changes since the last
   release and consult the CHANGES.txt file for complete a list of changes
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 842767a..da238d7 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,10 +4,7 @@
 
                             Change Log
 
-
-**PLEASE ADD YOUR NAME IN ALPHABETICAL ORDER TO AVOID NEEDED TO REORDER BELOW**
-
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
+RELEASE 3.1.0 - Mon, 20 Jul 2019 16:59:23 -0700
 
   From John Doe:
 
@@ -27,10 +24,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Code to supply correct version-specifier argument to vswhere for
       VS version selection.
 
-  From Peter Diener:
-    - Additional fix to issue #3135 - Also handle 'pure' and 'elemental' type bound procedures
-    - Fix issue #3135 - Handle Fortran submodules and type bound procedures
-
   From William Deegan:
     - Enhanced --debug=explain output. Now the separate components of the dependency list are split up
       as follows:
@@ -66,6 +59,10 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
           def my_decider(dependency, target, prev_ni, repo_node):
       Where repo_node is the repository (or other) node to use to check if the node is out of date instead of dependency.
 
+  From Peter Diener:
+    - Additional fix to issue #3135 - Also handle 'pure' and 'elemental' type bound procedures
+    - Fix issue #3135 - Handle Fortran submodules and type bound procedures
+
   From Adam Gross:
     - Upgraded and improved Visual Studio solution/project generation code using the MSVSProject builder.
       - Added support for Visual Studio 2017 and 2019.
@@ -82,6 +79,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From Mathew Robinson:
     - Update cache debug output to include cache hit rate.
     - No longer unintentionally hide exceptions in Action.py
+    - Allow builders and pseudo-builders to inherit from OverrideEnvironments
 
   From Leonard de Ruijter:
     - Add logic to derive correct version argument to vswhere
@@ -116,10 +114,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix more re patterns that contain \ but not specified as raw strings
       (affects scanners for D, LaTeX, swig)
 
-  From Mathew Robinson:
-    - Update cache debug output to include cache hit rate.
-    - No longer unintentionally hide exceptions in Action.py
-    - Allow builders and pseudo-builders to inherit from OverrideEnvironments
 
 RELEASE 3.0.5 - Mon, 26 Mar 2019 15:04:42 -0700
 
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 17e698f..54cdfe3 100755
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -3,71 +3,15 @@
 
           https://scons.org/pages/download.html
 
-  XXX The primary purpose of this release ... XXX
-
-  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:
+  Here is a summary of the changes since 3.1.0:
 
   NEW FUNCTIONALITY
 
     - List new features (presumably why a checkpoint is being released)
 
-  DEPRECATED FUNCTIONALITY
-
-    - 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
 
   FIXES
-
-    - List fixes of outright bugs
-
-  IMPROVEMENTS
-
-    - 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
-
-  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)
-
-  DEVELOPMENT
-
-    - List visible changes in the way SCons is developed
-
-  Thanks to CURLY, LARRY, and MOE for their contributions to this release.
-  Contributors are listed alphabetically by their last name.
-
-__COPYRIGHT__
-__FILE__ __REVISION__ __DATE__ __DEVELOPER__