From 040376d70bb3492301c850c673b91e4ee6ee21cd Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 21 Sep 2015 10:03:12 -0700 Subject: release 2.4.0 --- QMTest/TestSCons.py | 2 +- README.rst | 38 +++++++++++++++++++------------------- ReleaseConfig | 2 +- SConstruct | 4 ++-- src/Announce.txt | 2 +- src/CHANGES.txt | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index a9b4e3eb..06fa5750 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.6' +default_version = '2.4.0' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) diff --git a/README.rst b/README.rst index 9ed0cccd..4f515237 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.3.3" and "sconsign-2.3.3" scripts in +- Install the version-numbered "scons-2.4.0" and "sconsign-2.4.0" 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,23 +168,23 @@ 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.3.3" and "sconsign-2.3.3" + hard links or symbolic links to the "scons-2.4.0" and "sconsign-2.4.0" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. -- Install "scons-2.3.3.bat" and "scons.bat" wrapper scripts in the Python +- Install "scons-2.4.0.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.3.3.bat" and "scons.bat" files installed in the default system + have "scons-2.4.0.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. - Install the SCons build engine (a Python module) in an appropriate - version-numbered SCons library directory (/usr/lib/scons-2.3.3 or - C:\\Python\*\\scons-2.3.3, for example). See below for more options related to + version-numbered SCons library directory (/usr/lib/scons-2.4.0 or + C:\\Python\*\\scons-2.4.0, for example). See below for more options related to installing the build engine library. - Install the troff-format man pages in an appropriate directory on UNIX or @@ -462,7 +462,7 @@ running all of "runtest.py -a". Building Packages ================= -We use SCons (version 2.3.3 or later) to build its own packages. If you +We use SCons (version 2.4.0 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.3.3-1.noarch.rpm - build/dist/scons-2.3.3-1.src.rpm - build/dist/scons-2.3.3.linux-i686.tar.gz - build/dist/scons-2.3.6.tar.gz - build/dist/scons-2.3.6.win32.exe - build/dist/scons-2.3.6.zip - build/dist/scons-doc-2.3.6.tar.gz - build/dist/scons-local-2.3.6.tar.gz - build/dist/scons-local-2.3.6.zip - build/dist/scons-src-2.3.6.tar.gz - build/dist/scons-src-2.3.6.zip - build/dist/scons_2.3.3-1_all.deb + 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 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 5a191baf..1026c584 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, 8, 'alpha', 0) +version_tuple = (2, 4, 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 e8b6c9a0..4bff134f 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 = 'July 2015' +month_year = 'September 2015' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import tempfile import bootstrap project = 'scons' -default_version = '2.3.6' +default_version = '2.4.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 1d597021..25f6b15a 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -36,7 +36,7 @@ released. Especially if you are directly using the Node class. ================================================================= -RELEASE 2.4.0 - Mon, 21 Sep 2015 08:56:00 -0700 +RELEASE 2.4.0 - Mon, 21 Sep 2015 09:07:51 -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 0299718c..8e25e377 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,7 +4,7 @@ Change Log -RELEASE 2.4.0 - Mon, 21 Sep 2015 08:56:00 -0700 +RELEASE 2.4.0 - Mon, 21 Sep 2015 09:07:51 -0700 From Dirk Baechle: - Switched several core classes to use "slots", to -- cgit v1.2.1