Merged in rel_2.4.0 (pull request #250)

Rel_2.4.0

8 files changed, 67 insertions, 53 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index a9b4e3e..06fa575 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 9ed0ccc..05be712 100644
--- a/README.rst
+++ b/README.rst
@@ -47,7 +47,7 @@ version at the SCons download page:
 Execution Requirements
 ======================
 
-Running SCons requires Python version 2.6 or later (Python 3 is not
+Running SCons requires Python version 2.7 or later (Python 3 is not
 yet supported).  There should be no other dependencies or requirements
 to run SCons.
 
@@ -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
@@ -748,5 +748,5 @@ many contributors, including but not at all limited to:
 
 \... and many others.
 
-__COPYRIGHT__
+Copyright (c) 2001 - 2015 The SCons Foundation
 
diff --git a/ReleaseConfig b/ReleaseConfig
index 5a191ba..1026c58 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 e8b6c9a..4bff134 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/bin/upload-release-files.sh b/bin/upload-release-files.sh
index 735f143..c853bda 100755
--- a/bin/upload-release-files.sh
+++ b/bin/upload-release-files.sh
@@ -17,9 +17,10 @@ SF_TOPDIR='/home/frs/project/scons'
 
 # the build products are here:
 cd build/dist
-cp -f ../../src/CHANGES.txt ../../src/RELEASE.txt ../../src/Announce.txt .
+cp -f ../../src/CHANGES.txt ../../src/RELEASE.txt ../../src/Announce.txt ../../src/README.txt .
 
 cp scons-$VERSION.win32.exe scons-$VERSION-setup.exe
+cp scons-$VERSION.win-amd64.exe scons-$VERSION-amd64-setup.exe
 
 set -x
 
@@ -28,7 +29,7 @@ $RSYNC $RSYNCOPTS \
   scons-$VERSION-1.noarch.rpm \
   scons-$VERSION-1.src.rpm \
   scons-$VERSION-setup.exe \
-  scons-$VERSION.win-amd64.exe \
+  scons-$VERSION-amd64-setup.exe \
   scons-$VERSION.tar.gz \
   scons-$VERSION.zip \
   Announce.txt CHANGES.txt RELEASE.txt \
@@ -48,6 +49,12 @@ $RSYNC $RSYNCOPTS \
   Announce.txt CHANGES.txt RELEASE.txt \
   $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-src/$VERSION/
 
+# Readme
+$RSYNC $RSYNCOPTS \
+  README.txt  \
+  $SF_USER@$SF_MACHINE:$SF_TOPDIR/
+
+
 
 #
 # scons.org stuff:
diff --git a/src/Announce.txt b/src/Announce.txt
index 1d59702..25f6b15 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 0299718..8e25e37 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
diff --git a/src/README.txt b/src/README.txt
index 5d880c2..d16433e 100644
--- a/src/README.txt
+++ b/src/README.txt
@@ -2,7 +2,7 @@
 
                  SCons - a software construction tool
 
-                         Version __VERSION__
+                         Version 2.4.0
 
 
 This is SCons, a tool for building software (and other files).  SCons is
@@ -28,7 +28,8 @@ the latest version by checking the SCons download page at:
 EXECUTION REQUIREMENTS
 ======================
 
-Running SCons requires Python version 2.4 or later.  There should be
+Running SCons requires Python version 2.7.*.  Currently it does not 
+run on the Python 3.x release.  There should be
 no other dependencies or requirements to run SCons.  (There is, however,
 an additional requirement to *install* SCons from this particular
 package; see the next section.)
@@ -70,17 +71,17 @@ By default, the above command will do the following:
         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-__VERSION__" and
-        "sconsign-__VERSION__" scripts by specifying the "--hardlink-scons"
+        scripts be 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-__VERSION__.bat" and "scons.bat" wrapper scripts in the
+    --  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-__VERSION__.bat" and "scons.bat" files
+        specified to 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
@@ -88,7 +89,7 @@ By default, the above command will do the following:
 
     --  Install the SCons build engine (a Python module) in an
         appropriate version-numbered SCons library directory
-        (/usr/lib/scons-__VERSION__ or C:\Python*\scons-__VERSION__, for example).
+        (/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.
 
@@ -224,20 +225,26 @@ Check the SCons web site at:
 
 AUTHOR INFO
 ===========
-
-Steven Knight
-knight at baldmt dot com
-http://www.baldmt.com/~knight/
-
-With plenty of help from the SCons Development team:
-        Chad Austin
-        Charles Crain
-        Steve Leblanc
-        Greg Noel
-        Gary Oberbrunner
-        Anthony Roach
-        Greg Spencer
-        Christoph Wiedemann
-
-__COPYRIGHT__
-__FILE__ __REVISION__ __DATE__ __DEVELOPER__
+SCons was originally written by Steven Knight, knight at baldmt dot com.
+Since around 2010 it has been maintained by the SCons
+development team, co-managed by Bill Deegan and Gary Oberbrunner, with
+many contributors, including but not at all limited to:
+
+- Chad Austin
+- Dirk Baechle
+- Charles Crain
+- William Deegan
+- Steve Leblanc
+- Rob Managan
+- Greg Noel
+- Gary Oberbrunner
+- Anthony Roach
+- Greg Spencer
+- Tom Tanner
+- Anatoly Techtonik
+- Christoph Wiedemann
+- Russel Winder
+
+\... and many others.
+
+Copyright (c) 2001 - 2015 The SCons Foundation