Merge pull request #3746 from SCons/rel_4.0.1

Rel 4.0.1

9 files changed, 51 insertions, 53 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 7c189f2..7e435c0 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,9 +4,9 @@
 
                             Change Log
 
-NOTE: The 4.0.0 Release of SCons will drops Python 2.7 Support
+NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
 
-RELEASE 4.1.0.devyyyymmdd - Mon, 04 Jul 2020 16:06:40 -0700
+RELEASE 4.0.1 - Thu, 16 Jul 2020 15:04:42 -0700
 
   From Rob Boehne:
     - Fix fortran tools to set SHFORTRAN variables to $FORTRAN, similarly SHF77, SHF90, SHF95,
diff --git a/RELEASE.txt b/RELEASE.txt
index 6d6f69e..1ad2e7e 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1,73 +1,54 @@
-  A new SCons checkpoint release, 4.1.0ayyyymmdd, is now available
+  A new SCons checkpoint release, 4.0.1, 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 4.0.1:
 
   NEW FUNCTIONALITY
 
-    - List new features (presumably why a checkpoint is being released)
+    - Added Environment() variable TEMPFILEDIR which allows setting the directory which temp
+      files createdby TEMPFILEMUNGE are created in.
 
   DEPRECATED FUNCTIONALITY
 
-    - List anything that's been deprecated since the last release
+    - N/A
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-    - List modifications to existing features, where the previous behavior
-      wouldn't actually be considered a bug
+    - N/A
 
   FIXES
 
-    - List fixes of outright bugs
+    - Fix fortran tools to set SHFORTRAN variables to $FORTRAN, similarly SHF77, SHF90, SHF95,
+      SHF03 and SHF08 will default to the variables $F77, $F90, $F95, $F03 and $F08 respectively.
+      If you were depending on changing the value of FORTRAN (or $F[0-9][0-9]) having no effect
+      on the value of SHFORTRAN, this change will break that.   The values of FORTRAN, F77, F90,
+      F95, F03, F08 and SHFORTRAN, SHF77 (etc.) now are not overridden in generate if alredy set
+      by the user.
+    - Fix subprocess execution of 'lslpp' on AIX to produce text standard i/o.
+    - Re-do the fix for suncxx tool (Oracle Studio compiler) now that only Python 3 is supported,
+      to avoid decoding errors.
 
   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
+    - N/A
 
   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 CURLY, LARRY, and MOE for their contributions to this release.
-  Contributors are listed alphabetically by their last name.
+  Thanks to the following contributors listed below for their contributions to this release.
 
-__COPYRIGHT__
-__FILE__ __REVISION__ __DATE__ __DEVELOPER__
+git shortlog --no-merges -ns 4.0.0..HEAD
+    12  William Deegan
+     2  Rob Boehne
+     1  Clemens Tolboom
diff --git a/ReleaseConfig b/ReleaseConfig
index 95466d2..35b60cf 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 = (4, 1, 0, 'a', 0)
+version_tuple = (4, 0, 1)
 
 # 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/SCons/__init__.py b/SCons/__init__.py
index 8bd6961..f3d3851 100644
--- a/SCons/__init__.py
+++ b/SCons/__init__.py
@@ -1,9 +1,9 @@
-__version__="4.0.0"
+__version__="4.0.1"
 __copyright__="Copyright (c) 2001 - 2020 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="2020-07-06 15:58:10"
+__date__="2020-07-17 01:50:03"
 __buildsys__="ProDog2020"
-__revision__="ad3f21fbf0667f5b654771176d29dbdf75d9b120"
-__build__="ad3f21fbf0667f5b654771176d29dbdf75d9b120"
+__revision__="c289977f8b34786ab6c334311e232886da7e8df1"
+__build__="c289977f8b34786ab6c334311e232886da7e8df1"
 # make sure compatibility is always in place
 import SCons.compat # noqa
\ No newline at end of file
diff --git a/SConstruct b/SConstruct
index 9fab012..2cd2fde 100644
--- a/SConstruct
+++ b/SConstruct
@@ -36,7 +36,7 @@ month_year = strftime('%B %Y')
 
 
 project = 'scons'
-default_version = '4.1.0.devyyyymmdd'
+default_version = '4.0.1'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 #
diff --git a/debian/changelog b/debian/changelog
index 427a551..d552150 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scons (4.0.1) unstable; urgency=low
+
+  * Maintenance Release
+
+ -- William Deegan <bill@baddogconsulting.com>  Thu, 16 Jul 2020 15:04:42 -0700
+
 scons (4.0.0) unstable; urgency=low
 
   * Maintenance Release
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index eb083df..1910505 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,8 +1,8 @@
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f2.o -c f2.c
 cc -o f5.o -c f5.c
-cc -o f4.o -c f4.c
 cc -o f1.o -c f1.c
+cc -o f2.o -c f2.c
 cc -o f3.o -c f3.c
+cc -o f4.o -c f4.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 5d1260f..f19c14c 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -7753,6 +7753,15 @@ Note this value is used literally and not expanded by the subst logic.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-TEMPFILEDIR">
+    <term>
+      <envar>TEMPFILEDIR</envar>
+    </term>
+    <listitem><para>
+The directory to create the tempfile in.
+</para>
+</listitem>
+  </varlistentry>
   <varlistentry id="cv-TEMPFILEPREFIX">
     <term>
       <envar>TEMPFILEPREFIX</envar>
diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod
index d6b92ed..4ef5e88 100644
--- a/doc/generated/variables.mod
+++ b/doc/generated/variables.mod
@@ -550,6 +550,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-TARGETS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TARGETS</envar>">
 <!ENTITY cv-TARSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TARSUFFIX</envar>">
 <!ENTITY cv-TEMPFILEARGJOIN "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEMPFILEARGJOIN</envar>">
+<!ENTITY cv-TEMPFILEDIR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEMPFILEDIR</envar>">
 <!ENTITY cv-TEMPFILEPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEMPFILEPREFIX</envar>">
 <!ENTITY cv-TEMPFILESUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEMPFILESUFFIX</envar>">
 <!ENTITY cv-TEX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$TEX</envar>">
@@ -1192,6 +1193,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-TARGETS "<link linkend='cv-TARGETS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TARGETS</envar></link>">
 <!ENTITY cv-link-TARSUFFIX "<link linkend='cv-TARSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TARSUFFIX</envar></link>">
 <!ENTITY cv-link-TEMPFILEARGJOIN "<link linkend='cv-TEMPFILEARGJOIN' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEMPFILEARGJOIN</envar></link>">
+<!ENTITY cv-link-TEMPFILEDIR "<link linkend='cv-TEMPFILEDIR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEMPFILEDIR</envar></link>">
 <!ENTITY cv-link-TEMPFILEPREFIX "<link linkend='cv-TEMPFILEPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEMPFILEPREFIX</envar></link>">
 <!ENTITY cv-link-TEMPFILESUFFIX "<link linkend='cv-TEMPFILESUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEMPFILESUFFIX</envar></link>">
 <!ENTITY cv-link-TEX "<link linkend='cv-TEX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$TEX</envar></link>">