diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-03-03 22:04:41 -0500 |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-03-03 22:04:41 -0500 |
commit | 7a2957207183b2c7366c7a62ce5e52bc15af1172 (patch) | |
tree | 06127b2cfebbcfadcd90b10af718aeb21b250cdf | |
parent | cf9e7190325c01a3dfd76a6a59d4eb29cb8dc490 (diff) | |
download | scons-7a2957207183b2c7366c7a62ce5e52bc15af1172.tar.gz |
Move back to 'develop' mode after rel_2.3.0.
-rw-r--r-- | QMTest/TestSCons.py | 2 | ||||
-rw-r--r-- | README.rst | 16 | ||||
-rw-r--r-- | ReleaseConfig | 2 | ||||
-rw-r--r-- | SConstruct | 4 | ||||
-rw-r--r-- | src/Announce.txt | 2 | ||||
-rw-r--r-- | src/CHANGES.txt | 5 |
6 files changed, 18 insertions, 13 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 6f6beb15..84cc60f0 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.0' +default_version = '2.3.1.alpha.yyyymmdd' copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013' @@ -480,14 +480,14 @@ following packages will be built:: build/dist/scons-2.0.0-1.noarch.rpm build/dist/scons-2.0.0-1.src.rpm build/dist/scons-2.0.0.linux-i686.tar.gz - build/dist/scons-2.3.0.tar.gz - build/dist/scons-2.3.0.win32.exe - build/dist/scons-2.3.0.zip - build/dist/scons-doc-2.3.0.tar.gz - build/dist/scons-local-2.3.0.tar.gz - build/dist/scons-local-2.3.0.zip - build/dist/scons-src-2.3.0.tar.gz - build/dist/scons-src-2.3.0.zip + build/dist/scons-2.3.1.alpha.yyyymmdd.tar.gz + build/dist/scons-2.3.1.alpha.yyyymmdd.win32.exe + build/dist/scons-2.3.1.alpha.yyyymmdd.zip + build/dist/scons-doc-2.3.1.alpha.yyyymmdd.tar.gz + build/dist/scons-local-2.3.1.alpha.yyyymmdd.tar.gz + build/dist/scons-local-2.3.1.alpha.yyyymmdd.zip + build/dist/scons-src-2.3.1.alpha.yyyymmdd.tar.gz + build/dist/scons-src-2.3.1.alpha.yyyymmdd.zip build/dist/scons_1.3.0-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to build diff --git a/ReleaseConfig b/ReleaseConfig index b64ebc04..2beab023 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, 0) +version_tuple = (2, 3, 1, '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 @@ -8,7 +8,7 @@ copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013' # This gets inserted into the man pages to reflect the month of release. -month_year = 'March 2013' +month_year = 'MONTH YEAR' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import sys import tempfile project = 'scons' -default_version = '2.3.0' +default_version = '2.3.1.alpha.yyyymmdd' 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 4f7558b2..7bc62ab7 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -19,7 +19,7 @@ effectively, please go to http://scons.org/lists.php#users to sign up for the scons-users mailing list. -RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400 +RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE 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 e0a4fb5f..267c7ace 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,6 +4,11 @@ Change Log +RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + + From XXX: + - first change here + RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400 From Anatoly Techtonik: |