summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2011-09-09 23:51:16 +0000
committerWilliam Deegan <bill@baddogconsulting.com>2011-09-09 23:51:16 +0000
commitdbfb2f82f7cfe01261cb8ba110d6b99769710129 (patch)
tree4a2aba9c6bdf0710c39f1f9d4df1565ee7b9773e
parent947ec78ac9010b61cde2b9da6bf54792e99c69ba (diff)
downloadscons-git-dbfb2f82f7cfe01261cb8ba110d6b99769710129.tar.gz
Update files with 2.1.0.final.0 and proper dates
(transplanted from bf206727e2a9978eb3397c7ebc4719d1b00e7b1d)
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--README16
-rw-r--r--ReleaseConfig2
-rw-r--r--SConstruct4
-rw-r--r--src/Announce.txt2
-rw-r--r--src/CHANGES.txt2
-rw-r--r--src/RELEASE.txt2
7 files changed, 15 insertions, 15 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 27cfcb897..a228d35c8 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.1.0.final.0'
copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011'
diff --git a/README b/README
index 1f82c5859..2b92ca391 100644
--- a/README
+++ b/README
@@ -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.1.0.final.0.tar.gz
+ build/dist/scons-2.1.0.final.0.win32.exe
+ build/dist/scons-2.1.0.final.0.zip
+ build/dist/scons-doc-2.1.0.final.0.tar.gz
+ build/dist/scons-local-2.1.0.final.0.tar.gz
+ build/dist/scons-local-2.1.0.final.0.zip
+ build/dist/scons-src-2.1.0.final.0.tar.gz
+ build/dist/scons-src-2.1.0.final.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 c881b0fbf..996024741 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -27,7 +27,7 @@ __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, 1, 0, 'alpha', 0)
+version_tuple = (2, 1, 0, 'final', 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 1748b5bb4..de1aee0fd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,7 +8,7 @@
copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011'
# This gets inserted into the man pages to reflect the month of release.
-month_year = 'MONTH YEAR'
+month_year = 'September 2011'
#
# __COPYRIGHT__
@@ -43,7 +43,7 @@ import sys
import tempfile
project = 'scons'
-default_version = '2.1.0.alpha.yyyymmdd'
+default_version = '2.1.0.final.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 fd590f581..cdd1ad829 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.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+RELEASE 2.1.0.final.0 - Mon, 09 Sep 2011 16:49:58 -0700
Please consult the RELEASE.txt file for a summary 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 da185397e..61ff559b5 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,7 +5,7 @@
Change Log
-RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+RELEASE 2.1.0.final.0 - Mon, 09 Sep 2011 16:49:58 -0700
From Anton Lazarev:
- Fix Windows resource compiler scanner to accept DOS line endings.
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 6f71dcbba..4428cb233 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
- A new SCons checkpoint release, 2.1.0.alpha.yyyymmdd, is now available
+ A new SCons checkpoint release, 2.1.0.final.0, is now available
on the SCons download page:
http://www.scons.org/download.php