summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--README.rst16
-rw-r--r--ReleaseConfig2
-rw-r--r--SConstruct4
-rw-r--r--src/CHANGES.txt7
-rw-r--r--src/RELEASE.txt2
6 files changed, 20 insertions, 13 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index bae96e6..a9b4e3e 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 64e8748..9ed0ccc 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 b5623be..5a191ba 100644
--- 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 = (2, 3, 6, 'alpha', 0)
+version_tuple = (2, 3, 8, 'alpha', 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 bbddd98..e8b6c9a 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/CHANGES.txt b/src/CHANGES.txt
index 906ccfc..7cbfe8b 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,6 +6,13 @@
RELEASE VERSION/DATE TO BE FILLED IN LATER
+ From John Doe:
+
+ - Whatever John Doe did.
+
+
+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 303776c..83212a7 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.8.alpha.yyyymmdd, is now available
on the SCons download page:
http://www.scons.org/download.php