From 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 7 Aug 2019 20:11:27 -0500 Subject: Changes for 3.1.1 release --- README.rst | 14 +++++++------- ReleaseConfig | 2 +- SConstruct | 4 ++-- src/Announce.txt | 2 +- src/CHANGES.txt | 4 ++-- src/RELEASE.txt | 2 +- testing/framework/TestSCons.py | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.rst b/README.rst index 07be9a9..9589df7 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.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 + build/dist/scons-3.1.1.tar.gz + build/dist/scons-3.1.1.zip + build/dist/scons-doc-3.1.1.tar.gz + build/dist/scons-local-3.1.1.tar.gz + build/dist/scons-local-3.1.1.zip + build/dist/scons-src-3.1.1.tar.gz + build/dist/scons-src-3.1.1.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 b3893bd..2bddfa0 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, 1, 1, 'alpha', 0) +version_tuple = (3, 1, 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/SConstruct b/SConstruct index 40764dc..8db1657 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 = 'July 2019' +month_year = 'August 2019' # # __COPYRIGHT__ @@ -49,7 +49,7 @@ import textwrap import bootstrap project = 'scons' -default_version = '3.1.0' +default_version = '3.1.1' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years SConsignFile() diff --git a/src/Announce.txt b/src/Announce.txt index 1359696..425aaa1 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.1 - Mon, 07 Aug 2019 20:09:12 -0500 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 e33aa6a..953931b 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,13 +4,13 @@ Change Log -RELEASE VERSION/DATE TO BE FILLED IN LATER +RELEASE 3.1.1 - Mon, 07 Aug 2019 20:09:12 -0500 From William Deegan: - Remove obsoleted references to DeciderNeedsNode which could cause crash when using --debug=explain From Jason Kenny - - Add Fix and test for regression in 3.1.0 when using Decider('MD5-timestamp') and --debug=explain + - Add Fix and test for crash in 3.1.0 when using Decider('MD5-timestamp') and --debug=explain From Ben Reed: - Added -fmerge-all-constants to flags that get included in both CCFLAGS and LINKFLAGS. diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 17e698f..a2f7918 100755 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,4 +1,4 @@ - A new SCons checkpoint release, 3.1.2.alpha.yyyymmdd, is now available + A new SCons checkpoint release, 3.1.1, is now available on the SCons download page: https://scons.org/pages/download.html diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index 89ad43b..7dc9e74 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.1.0' +default_version = '3.1.1' python_version_unsupported = (2, 6, 0) python_version_deprecated = (2, 7, 0) -- cgit v0.12