changes for release 3.1.0

8 files changed, 48 insertions, 78 deletions

diff --git a/README.rst b/README.rst
index ea7667c..07be9a9 100755
--- a/README.rst
+++ b/README.rst
@@ -499,13 +499,13 @@ about `Executing SCons Without Installing`_)::
 Depending on the utilities installed on your system, any or all of the
 following packages will be built::
 
-        build/dist/scons-3.0.5.tar.gz
-        build/dist/scons-3.0.5.zip
-        build/dist/scons-doc-3.0.5.tar.gz
-        build/dist/scons-local-3.0.5.tar.gz
-        build/dist/scons-local-3.0.5.zip
-        build/dist/scons-src-3.0.5.tar.gz
-        build/dist/scons-src-3.0.5.zip
+        build/dist/scons-3.1.0.tar.gz
+        build/dist/scons-3.1.0.zip
+        build/dist/scons-doc-3.1.0.tar.gz
+        build/dist/scons-local-3.1.0.tar.gz
+        build/dist/scons-local-3.1.0.zip
+        build/dist/scons-src-3.1.0.tar.gz
+        build/dist/scons-src-3.1.0.zip
 
 The SConstruct file is supposed to be smart enough to avoid trying to build
 packages for which you don't have the proper utilities installed.  For
diff --git a/ReleaseConfig b/ReleaseConfig
index ca7e1cf..b553411 100755
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -32,7 +32,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 # 'final', the patchlevel is set to the release date.  This value is
 # mandatory and must be present in this file.
 #version_tuple = (2, 2, 0, 'final', 0)
-version_tuple = (3, 0, 6, 'alpha', 0)
+version_tuple = (3, 1, 0)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version
diff --git a/SConstruct b/SConstruct
index d4b3e00..40764dc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,7 +8,7 @@ from __future__ import print_function
 copyright_years = '2001 - 2019'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'March 2019'
+month_year = 'July 2019'
 
 #
 # __COPYRIGHT__
@@ -49,7 +49,7 @@ import textwrap
 import bootstrap
 
 project = 'scons'
-default_version = '3.0.5'
+default_version = '3.1.0'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 SConsignFile()
diff --git a/debian/changelog b/debian/changelog
index 8744ba4..77ac165 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-scons (3.0.5) unstable; urgency=low
+scons (3.1.0) unstable; urgency=low
 
   * Maintenance Release
 
- -- William Deegan <bill@baddogconsulting.com>  Mon, 26 Mar 2019 15:04:42 -0700
+ -- William Deegan <bill@baddogconsulting.com>  Sat, 20 Jul 2019 15:04:42 -0700
 
 scons (3.0.4) unstable; urgency=low
 
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 ce7e43a..a23140c 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,19 +4,12 @@
 
                             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 Joseph Brill:
     - 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:
@@ -52,6 +45,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.
@@ -68,6 +65,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
@@ -102,10 +100,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 9e4e314..bdf3a79 100755
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,43 +1,22 @@
-  A new SCons checkpoint release, 3.0.6.alpha.yyyymmdd, is now available
+  A new SCons checkpoint release, 3.1.0, is now available
   on the SCons download page:
 
           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.0.5:
 
   NEW FUNCTIONALITY
 
     - Added variable TEMPFILEARGJOIN to specify how to join arguments written
       to temp files used when command lines exceed MAXLINELENGTH when the
       command uses $TEMPFILE{...}
+    - Support for MSVC 2019
+    - Upgraded and improved Visual Studio solution/project generation code using the MSVSProject builder.
+      - Added support for Visual Studio 2017 and 2019.
+      - Added support for the following per-variant parameters to the builder:
+        - cpppaths: Provides per-variant include paths.
+        - cppdefines: Provides per-variant preprocessor definitions.
 
-  DEPRECATED FUNCTIONALITY
-
-    - List anything that's been deprecated since the last release
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
@@ -48,7 +27,6 @@
           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.
 
-
     - Enhanced --debug=explain output. Now the separate components of the dependency list are split up
       as follows:
 
@@ -62,7 +40,6 @@
            ->Implicit
            Old:/usr/bin/python	New:/usr/bin/python
 
-
     - Changed: Pseudo-builders now inherit OverrideEnvironments. For
       example when calling a pseudo-builder from another
       pseudo-builder the override variables passed to the first
@@ -71,29 +48,28 @@
       will automatically inherit these override values.
 
   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
+    - Fix Issue #3350 - SCons Exception EnvironmentError is conflicting with Python's EnvironmentError.
+    - Fix spurious rebuilds on second build for cases where builder has > 1 target and the source file
+      is generated. This was causing the > 1th target to not have it's implicit list cleared when the source
+      file was actually built, leaving an implicit list similar to follows for 2nd and higher target
+              ['/usr/bin/python', 'xxx', 'yyy', 'zzz']
+      This was getting persisted to SConsign and on rebuild it would be corrected to be similar to this
+              ['zzz', 'yyy', 'xxx', '/usr/bin/python']
+      Which would trigger a rebuild because the order changed.
+      The fix involved added logic to mark all shared targets as peers and then ensure they're implicit
+      list is all cleared together.
+    - Fix Issue #3349 - SCons Exception EnvironmentError is conflicting with Python's EnvironmentError.
+      Renamed to SConsEnvironmentError
+    - Fix Issue #3350 - mslink failing when too many objects.  This is resolved by adding TEMPFILEARGJOIN variable
+      which specifies what character to join all the argements output into the tempfile. The default remains a space
+      when mslink, msvc, or mslib tools are loaded they change the TEMPFILEARGJOIN to be a line separator (\r\n on win32)
+    - Additional fix to issue #3135 - Also handle 'pure' and 'elemental' type bound procedures
+
+    - Fix handling of Visual Studio Compilers to properly reject any unknown HOST_PLATFORM or TARGET_PLATFORM
+    - Enable LaTeX scanner to find more than one include per line
+    
       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.
 
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py
index 907eac7..89ad43b 100644
--- a/testing/framework/TestSCons.py
+++ b/testing/framework/TestSCons.py
@@ -35,7 +35,7 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '3.0.5'
+default_version = '3.1.0'
 
 python_version_unsupported = (2, 6, 0)
 python_version_deprecated = (2, 7, 0)