diff options
-rw-r--r-- | QMTest/TestSCons.py | 2 | ||||
-rw-r--r-- | README.rst | 16 | ||||
-rw-r--r-- | ReleaseConfig | 3 | ||||
-rw-r--r-- | SConstruct | 4 | ||||
-rw-r--r-- | src/Announce.txt | 2 | ||||
-rw-r--r-- | src/CHANGES.txt | 2 | ||||
-rw-r--r-- | src/RELEASE.txt | 2 |
7 files changed, 16 insertions, 15 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index bae96e6ec..a9b4e3eb0 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -34,7 +34,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.3.5' +default_version = '2.3.6' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) diff --git a/README.rst b/README.rst index 64e874878..9ed0cccd8 100644 --- a/README.rst +++ b/README.rst @@ -480,14 +480,14 @@ following packages will be built:: build/dist/scons-2.3.3-1.noarch.rpm build/dist/scons-2.3.3-1.src.rpm build/dist/scons-2.3.3.linux-i686.tar.gz - build/dist/scons-2.3.5.tar.gz - build/dist/scons-2.3.5.win32.exe - build/dist/scons-2.3.5.zip - build/dist/scons-doc-2.3.5.tar.gz - build/dist/scons-local-2.3.5.tar.gz - build/dist/scons-local-2.3.5.zip - build/dist/scons-src-2.3.5.tar.gz - build/dist/scons-src-2.3.5.zip + build/dist/scons-2.3.6.tar.gz + build/dist/scons-2.3.6.win32.exe + build/dist/scons-2.3.6.zip + build/dist/scons-doc-2.3.6.tar.gz + build/dist/scons-local-2.3.6.tar.gz + build/dist/scons-local-2.3.6.zip + build/dist/scons-src-2.3.6.tar.gz + build/dist/scons-src-2.3.6.zip build/dist/scons_2.3.3-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to build diff --git a/ReleaseConfig b/ReleaseConfig index b5623be7b..284ffe839 100644 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -32,7 +32,8 @@ __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 = (2, 3, 6, 'alpha', 0) +version_tuple = (2, 3, 6, 'final', 0) +version_tuple = (2, 3, 6) # 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 bbddd9889..e8b6c9a0b 100644 --- a/SConstruct +++ b/SConstruct @@ -6,7 +6,7 @@ copyright_years = '2001 - 2015' # This gets inserted into the man pages to reflect the month of release. -month_year = 'June 2015' +month_year = 'July 2015' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import tempfile import bootstrap project = 'scons' -default_version = '2.3.5' +default_version = '2.3.6' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() diff --git a/src/Announce.txt b/src/Announce.txt index f96e703ce..bc683172a 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -37,7 +37,7 @@ released. Especially if you are directly using the Node class. ================================================================= -RELEASE VERSION/DATE TO BE FILLED IN LATER +RELEASE 2.3.6 - Mon, 31 Jul 2015 14:35:03 -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 906ccfc8e..198aae1b7 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,7 +4,7 @@ Change Log -RELEASE VERSION/DATE TO BE FILLED IN LATER +RELEASE 2.3.6 - Mon, 31 Jul 2015 14:35:03 -0700 From Rob Smith: - Added support for Visual Studio 2015 diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 303776c1a..6268b8ac9 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,4 +1,4 @@ - A new SCons checkpoint release, 2.3.6.alpha.yyyymmdd, is now available + A new SCons checkpoint release, 2.3.6, is now available on the SCons download page: http://www.scons.org/download.php |