summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-11-07 10:39:07 -0800
committerWilliam Deegan <bill@baddogconsulting.com>2015-11-07 10:39:07 -0800
commit8df57e9584e2bec585d8d957520a5b627038966c (patch)
treeb36b2cbf4dd3e5601546ed008f6769309c417cda
parent0d9beac0b7795d1be0a31dd912dbdda015b8579e (diff)
downloadscons-git-8df57e9584e2bec585d8d957520a5b627038966c.tar.gz
updated version info via ReleaseConfig to 2.4.1 with appropriate datestamp
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--README.rst34
-rw-r--r--ReleaseConfig2
-rw-r--r--SConstruct4
-rw-r--r--src/Announce.txt2
-rw-r--r--src/CHANGES.txt2
6 files changed, 23 insertions, 23 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 75bf395b9..ef7026116 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.4.0'
+default_version = '2.4.1'
python_version_unsupported = (2, 3, 0)
python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index 05be71282..a2b15a6d3 100644
--- a/README.rst
+++ b/README.rst
@@ -156,7 +156,7 @@ Or on Windows::
By default, the above commands will do the following:
-- Install the version-numbered "scons-2.4.0" and "sconsign-2.4.0" scripts in
+- Install the version-numbered "scons-2.4.1" and "sconsign-2.4.1" scripts in
the default system script directory (/usr/bin or C:\\Python\*\\Scripts, for
example). This can be disabled by specifying the "--no-version-script"
option on the command line.
@@ -168,16 +168,16 @@ By default, the above commands will do the following:
before making it the default on your system.
On UNIX or Linux systems, you can have the "scons" and "sconsign" scripts be
- hard links or symbolic links to the "scons-2.4.0" and "sconsign-2.4.0"
+ hard links or symbolic links to the "scons-2.4.1" and "sconsign-2.4.1"
scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
the command line.
-- Install "scons-2.4.0.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-2.4.1.bat" and "scons.bat" wrapper scripts in the Python
prefix directory on Windows (C:\\Python\*, for example). This can be disabled
by specifying the "--no-install-bat" option on the command line.
On UNIX or Linux systems, the "--install-bat" option may be specified to
- have "scons-2.4.0.bat" and "scons.bat" files installed in the default system
+ have "scons-2.4.1.bat" and "scons.bat" files installed in the default system
script directory, which is useful if you want to install SCons in a shared
file system directory that can be used to execute SCons from both UNIX/Linux
and Windows systems.
@@ -462,7 +462,7 @@ running all of "runtest.py -a".
Building Packages
=================
-We use SCons (version 2.4.0 or later) to build its own packages. If you
+We use SCons (version 2.4.1 or later) to build its own packages. If you
already have an appropriate version of SCons installed on your system, you can
build everything by simply running it::
@@ -477,18 +477,18 @@ 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-2.4.0-1.noarch.rpm
- build/dist/scons-2.4.0-1.src.rpm
- build/dist/scons-2.4.0.linux-i686.tar.gz
- build/dist/scons-2.4.0.tar.gz
- build/dist/scons-2.4.0.win32.exe
- build/dist/scons-2.4.0.zip
- build/dist/scons-doc-2.4.0.tar.gz
- build/dist/scons-local-2.4.0.tar.gz
- build/dist/scons-local-2.4.0.zip
- build/dist/scons-src-2.4.0.tar.gz
- build/dist/scons-src-2.4.0.zip
- build/dist/scons_2.4.0-1_all.deb
+ build/dist/scons-2.4.1-1.noarch.rpm
+ build/dist/scons-2.4.1-1.src.rpm
+ build/dist/scons-2.4.1.linux-i686.tar.gz
+ build/dist/scons-2.4.1.tar.gz
+ build/dist/scons-2.4.1.win32.exe
+ build/dist/scons-2.4.1.zip
+ build/dist/scons-doc-2.4.1.tar.gz
+ build/dist/scons-local-2.4.1.tar.gz
+ build/dist/scons-local-2.4.1.zip
+ build/dist/scons-src-2.4.1.tar.gz
+ build/dist/scons-src-2.4.1.zip
+ build/dist/scons_2.4.1-1_all.deb
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 619443864..439624887 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, 4, 1, 'alpha', 0)
+version_tuple = (2, 4, 1)
# 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 4bff134f2..79249e927 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 = 'September 2015'
+month_year = 'November 2015'
#
# __COPYRIGHT__
@@ -43,7 +43,7 @@ import tempfile
import bootstrap
project = 'scons'
-default_version = '2.4.0'
+default_version = '2.4.1'
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 c20d7dfd8..719b4d7b1 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -48,7 +48,7 @@ Notes:
+=================================================================
-RELEASE VERSION/DATE TO BE FILLED IN LATER
+RELEASE 2.4.1 - Mon, 07 Nov 2015 10:37:21 -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 085cd29d8..40245a84a 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,7 +4,7 @@
Change Log
-RELEASE VERSION/DATE TO BE FILLED IN LATER
+RELEASE 2.4.1 - Mon, 07 Nov 2015 10:37:21 -0700
From Arfrever Frehtes Taifersar Arahesis:
- Fix for Bug # 2791 - Setup.py fails unnecessarily under Jython.