diff options
| -rw-r--r-- | QMTest/TestSCons.py | 2 | ||||
| -rw-r--r-- | README | 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 4f04a486..9b62158a 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -31,7 +31,7 @@ from TestCommon import __all__ # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.1.0.alpha.yyyymmdd' +default_version = '2.2.0' copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012' @@ -493,14 +493,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.1.0.alpha.yyyymmdd.tar.gz - build/dist/scons-2.1.0.alpha.yyyymmdd.win32.exe - build/dist/scons-2.1.0.alpha.yyyymmdd.zip - build/dist/scons-doc-2.1.0.alpha.yyyymmdd.tar.gz - build/dist/scons-local-2.1.0.alpha.yyyymmdd.tar.gz - build/dist/scons-local-2.1.0.alpha.yyyymmdd.zip - build/dist/scons-src-2.1.0.alpha.yyyymmdd.tar.gz - build/dist/scons-src-2.1.0.alpha.yyyymmdd.zip + build/dist/scons-2.2.0.tar.gz + build/dist/scons-2.2.0.win32.exe + build/dist/scons-2.2.0.zip + build/dist/scons-doc-2.2.0.tar.gz + build/dist/scons-local-2.2.0.tar.gz + build/dist/scons-local-2.2.0.zip + build/dist/scons-src-2.2.0.tar.gz + build/dist/scons-src-2.2.0.zip build/dist/scons_1.3.0-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to diff --git a/ReleaseConfig b/ReleaseConfig index 0a5e606f..a3e30fc6 100644 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -31,7 +31,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" # 'alpha', 'beta', 'candidate', or 'final'. If the release type is not # 'final', the patchlevel is set to the release date. This value is # manatory and must be present in this file. -version_tuple = (2, 2, 0, 'final', 0) +#version_tuple = (2, 2, 0, 'final', 0) +version_tuple = (2, 2, 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' # This gets inserted into the man pages to reflect the month of release. -month_year = 'MONTH YEAR' +month_year = 'August 2012' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import sys import tempfile project = 'scons' -default_version = '2.1.0.alpha.yyyymmdd' +default_version = '2.2.0' 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 e2b40019..a2197a17 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.2.0 - Mon, 09 Sep 2011 20:54:57 -0700 +RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000 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 b8207273..72c58e2d 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,7 +4,7 @@ Change Log -RELEASE 2.X.X - +RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000 From dubcanada on Bitbucket: - Fix 32-bit Visual Express C++ on 64-bit Windows (generate 32-bit code) diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 2ec92198..b9094cf4 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,4 +1,4 @@ - A new SCons release, 2.1.0.alpha.yyyymmdd, is now available + A new SCons release, 2.2.0, is now available on the SCons download page: http://www.scons.org/download.php |