Release file updates for Release 3.0.53.0.5

8 files changed, 61 insertions, 82 deletions

diff --git a/README.rst b/README.rst
index 386bd65f9..ea7667c69 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.alpha.yyyymmdd.tar.gz
-        build/dist/scons-3.0.5.alpha.yyyymmdd.zip
-        build/dist/scons-doc-3.0.5.alpha.yyyymmdd.tar.gz
-        build/dist/scons-local-3.0.5.alpha.yyyymmdd.tar.gz
-        build/dist/scons-local-3.0.5.alpha.yyyymmdd.zip
-        build/dist/scons-src-3.0.5.alpha.yyyymmdd.tar.gz
-        build/dist/scons-src-3.0.5.alpha.yyyymmdd.zip
+        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
 
 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 32707c7e7..871324e01 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, 5, 'alpha', 0)
+version_tuple = (3, 0, 5)
 
 # 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 a832cdc64..590aedf32 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 = 'MONTH YEAR'
+month_year = 'March 2019'
 
 #
 # __COPYRIGHT__
@@ -49,7 +49,7 @@ import textwrap
 import bootstrap
 
 project = 'scons'
-default_version = '3.0.5.alpha.yyyymmdd'
+default_version = '3.0.5'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 SConsignFile()
diff --git a/debian/changelog b/debian/changelog
index 7698b1e89..8744ba445 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scons (3.0.5) unstable; urgency=low
+
+  * Maintenance Release
+
+ -- William Deegan <bill@baddogconsulting.com>  Mon, 26 Mar 2019 15:04:42 -0700
+
 scons (3.0.4) unstable; urgency=low
 
   * Maintenance Release
diff --git a/src/Announce.txt b/src/Announce.txt
index d181de543..324b9fc69 100755
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,12 +18,22 @@ 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 3.0.5.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+RELEASE 3.0.5 - Mon, 26 Mar 2019 15:04:42 -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
   since last release.  This announcement highlights only the important
   changes.
+    Please note the following important changes since release 3.0.4:
+      - Change the default for AppendENVPath to delete_existing=0, so path
+        order will not be changed, unless explicitly set (Issue #3276)
+      - Add lex construction variable LEXUNISTD for turning off unix headers on windows
+      - Update lex tool to use win_flex on windows if available
+      - Add the textfile tool to the default tool list
+      - The mingw tool now respects SHCCCOMSTR, SHLINKCOMSTR and LDMODULECOMSTR
+      - Add support for finding vswhere under 32 bit Windows installs
+
+
     Please note the following important changes since release 3.0.3:
        - Added TEMPFILESUFFIX to allow user to specify suffix for tempfiles used for long command lines
        - Initial support for ARM architectures with Microsoft Visual Studio 2017. You must set TARGET_ARCH
@@ -1305,6 +1315,3 @@ improve SCons for your needs.
 -- The SCons Development Team
    Gary Oberbrunner and Bill Deegan, maintainers
    Thanks to all the contributors for all your help!
-
-__COPYRIGHT__
-__FILE__ __REVISION__ __DATE__ __DEVELOPER__
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 085285612..c46a80436 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,7 +5,7 @@
                             Change Log
 
 
-RELEASE 3.0.5.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+RELEASE 3.0.5 - Mon, 26 Mar 2019 15:04:42 -0700
 
   From William Deegan:
 
@@ -6464,7 +6464,3 @@ A brief overview of important functionality available in release 0.01:
 
   - Windows installer available.
 
-
-
-__COPYRIGHT__
-__FILE__ __REVISION__ __DATE__ __DEVELOPER__
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 28376a623..90cc7454b 100755
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,73 +1,43 @@
-  A new SCons checkpoint release, 3.0.5.alpha.yyyymmdd, is now available
-  on the SCons download page:
+A new SCons release, 3.0.5, is now available on the SCons download page:
 
-          https://scons.org/pages/download.html
+        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.
+Here is a summary of the changes since 3.0.4:
 
-  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.
+CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-  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.
+  - Change the default for AppendENVPath to delete_existing=0, so path
+    order will not be changed, unless explicitly set (Issue #3276)
+  - Add lex construction variable LEXUNISTD for turning off unix headers on windows
+  - Update lex tool to use win_flex on windows if available
+  - Add the textfile tool to the default tool list
 
-  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.
+FIXES
 
-  Here is a summary of the changes since 1.3.0:
+  - Fix Issue #3283 - Handle using --config=force in combination with Decider('MD5-timestamp').
+    3.0.2 in fix for issue #2980 added that deciders can throw DeciderNeedsNode exception.
+    The Configure logic directly calls the decider when using --config=force but wasn't handling
+    that exception.  This would yield minimally configure tests using TryLink() not running and
+    leaving TypeError Nonetype exception in config.log
+  - Fix Issue #3303 - Handle --config=force overwriting the Environment passed into Configure()'s
+    Decider and not clearing it when the configure context is completed.
+  - Add default paths for yacc tool on windows to include cygwin, mingw, and chocolatey
+  - Fix issue #2799 - Fix mingw tool to respect SHCCCOMSTR, SHLINKCOMSTR and LDMODULECOMSTR
+  - Fix Issue #3329 - Add support for MS SDK V10.0A (which is commonly installed with VS2017)
+  - Fix Issue #3333 - Add support for finding vswhere under 32 bit windows installs.
+  - Update the MSVC tool to include the nologo flag by default in RCFLAGS
+  - Fixed bug which threw error when running SCons on windows system with no MSVC installed.
 
-  NEW FUNCTIONALITY
 
-    - List new features (presumably why a checkpoint is being released)
+IMPROVEMENTS
+  - Do not store build host+user name if reproducible builds are wanted
 
-  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__
+git shortlog --no-merges -ns 3.0.4..HEAD
+    34  William Deegan
+    33  Mats Wichmann
+    18  Daniel
+     4  Daniel Moody
+     3  Bernhard M. Wiedemann
+     2  Maciej Kumorek
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py
index ad197d70f..91a443ece 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.alpha.yyyymmdd'
+default_version = '3.0.5'
 
 python_version_unsupported = (2, 6, 0)
 python_version_deprecated = (2, 7, 0)