summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2019-01-01 09:49:23 -0800
committerWilliam Deegan <bill@baddogconsulting.com>2019-01-01 09:49:23 -0800
commit16778d084120c7c20e2ff6a5fe05145a2ad68441 (patch)
treeb150aac0c95efaf07056e5c03922f6558074e18b
parent8bcbf788a94dd8067ab0e5bccf1c0f0e9bc62a76 (diff)
downloadscons-git-16778d084120c7c20e2ff6a5fe05145a2ad68441.tar.gz
Updates for 3.0.2 release
-rwxr-xr-x[-rw-r--r--]README.rst16
-rwxr-xr-xReleaseConfig2
-rw-r--r--SConstruct6
-rwxr-xr-xsrc/Announce.txt2
-rw-r--r--src/CHANGES.txt2
-rw-r--r--testing/framework/TestSCons.py2
6 files changed, 14 insertions, 16 deletions
diff --git a/README.rst b/README.rst
index d63c8a4da..3c84ce683 100644..100755
--- a/README.rst
+++ b/README.rst
@@ -499,15 +499,13 @@ about `Executing SCons Without Installing`_)::
Depending on the utilities installed on your system, any or all of the
following packages will be built::
- build/dist/scons-3.1.0.linux-i686.tar.gz
- build/dist/scons-3.1.0.alpha.yyyymmdd.tar.gz
- build/dist/scons-3.1.0.alpha.yyyymmdd.win32.exe
- build/dist/scons-3.1.0.alpha.yyyymmdd.zip
- build/dist/scons-doc-3.1.0.alpha.yyyymmdd.tar.gz
- build/dist/scons-local-3.1.0.alpha.yyyymmdd.tar.gz
- build/dist/scons-local-3.1.0.alpha.yyyymmdd.zip
- build/dist/scons-src-3.1.0.alpha.yyyymmdd.tar.gz
- build/dist/scons-src-3.1.0.alpha.yyyymmdd.zip
+ build/dist/scons-3.0.2.tar.gz
+ build/dist/scons-3.0.2.zip
+ build/dist/scons-doc-3.0.2.tar.gz
+ build/dist/scons-local-3.0.2.tar.gz
+ build/dist/scons-local-3.0.2.zip
+ build/dist/scons-src-3.0.2.tar.gz
+ build/dist/scons-src-3.0.2.zip
The SConstruct file is supposed to be smart enough to avoid trying to build
packages for which you don't have the proper utilities installed. For
diff --git a/ReleaseConfig b/ReleaseConfig
index 2e2e1e7d7..16d50e03c 100755
--- 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 = (3, 0, 2, 'final', 0)
+version_tuple = (3, 0, 2)
# 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 773bacb30..86e971184 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,10 +5,10 @@
from __future__ import print_function
-copyright_years = '2001 - 2017'
+copyright_years = '2001 - 2018'
# This gets inserted into the man pages to reflect the month of release.
-month_year = 'MONTH YEAR'
+month_year = 'December 2018'
#
# __COPYRIGHT__
@@ -51,7 +51,7 @@ import textwrap
import bootstrap
project = 'scons'
-default_version = '3.1.0.alpha.yyyymmdd'
+default_version = '3.0.2'
copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
SConsignFile()
diff --git a/src/Announce.txt b/src/Announce.txt
index 16560a2f7..c013328db 100755
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,7 +18,7 @@ So that everyone using SCons can help each other learn how to use it more
effectively, please go to http://scons.org/lists.html#users to sign up for
the scons-users mailing list.
-RELEASE 3.0.2 - Mon, 31 Dec 2018 15:14:21 -0700
+RELEASE 3.0.2 - Mon, 31 Dec 2018 16:00:12 -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 d8d566b6a..3b55ea5e0 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,7 +5,7 @@
Change Log
-RELEASE 3.0.2 - Mon, 31 Dec 2018 15:14:21 -0700
+RELEASE 3.0.2 - Mon, 31 Dec 2018 16:00:12 -0700
From Bernard Blackham:
- Fixed handling of side-effects in task master (fixes #3013).
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py
index a874e5acd..ee8f0ecc4 100644
--- a/testing/framework/TestSCons.py
+++ b/testing/framework/TestSCons.py
@@ -35,7 +35,7 @@ from TestCmd import PIPE
# here provides some independent verification that what we packaged
# conforms to what we expect.
-default_version = '3.1.0.alpha.yyyymmdd'
+default_version = '3.0.2'
python_version_unsupported = (2, 6, 0)
python_version_deprecated = (2, 7, 0)