merged with diverged head in branch rel_2.5.0

15 files changed, 153 insertions, 138 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 43832e8..b71ee62 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -34,9 +34,9 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.4.2.alpha.yyyymmdd'
+default_version = '2.5.0'
 
-python_version_unsupported = (2, 3, 0)
+python_version_unsupported = (2, 6, 0)
 python_version_deprecated = (2, 7, 0)
 
 # In the checked-in source, the value of SConsVersion in the following
diff --git a/README.rst b/README.rst
index b4b24b7..ba1755f 100644
--- a/README.rst
+++ b/README.rst
@@ -168,7 +168,7 @@ Or on Windows::
 
 By default, the above commands will do the following:
 
-- Install the version-numbered "scons-2.4.1" and "sconsign-2.4.1" scripts in
+- Install the version-numbered "scons-2.5.0" and "sconsign-2.5.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.
@@ -180,23 +180,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.4.1" and "sconsign-2.4.1"
+  hard links or symbolic links to the "scons-2.5.0" and "sconsign-2.5.0"
   scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
   the command line.
 
-- Install "scons-2.4.1.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-2.5.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.4.1.bat" and "scons.bat" files installed in the default system
+  have "scons-2.5.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.4.0 or
-  C:\\Python\*\\scons-2.4.0, for example).  See below for more options related to
+  version-numbered SCons library directory (/usr/lib/scons-2.5.0 or
+  C:\\Python\*\\scons-2.5.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
@@ -474,7 +474,7 @@ running all of "runtest.py -a".
 Building Packages
 =================
 
-We use SCons (version 2.4.1 or later) to build its own packages.  If you
+We use SCons (version 2.5.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::
 
@@ -489,18 +489,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.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.2.alpha.yyyymmdd.tar.gz
-        build/dist/scons-2.4.2.alpha.yyyymmdd.win32.exe
-        build/dist/scons-2.4.2.alpha.yyyymmdd.zip
-        build/dist/scons-doc-2.4.2.alpha.yyyymmdd.tar.gz
-        build/dist/scons-local-2.4.2.alpha.yyyymmdd.tar.gz
-        build/dist/scons-local-2.4.2.alpha.yyyymmdd.zip
-        build/dist/scons-src-2.4.2.alpha.yyyymmdd.tar.gz
-        build/dist/scons-src-2.4.2.alpha.yyyymmdd.zip
-        build/dist/scons_2.4.1-1_all.deb
+        build/dist/scons-2.5.0-1.noarch.rpm
+        build/dist/scons-2.5.0-1.src.rpm
+        build/dist/scons-2.5.0.linux-i686.tar.gz
+        build/dist/scons-2.5.0.tar.gz
+        build/dist/scons-2.5.0.win32.exe
+        build/dist/scons-2.5.0.zip
+        build/dist/scons-doc-2.5.0.tar.gz
+        build/dist/scons-local-2.5.0.tar.gz
+        build/dist/scons-local-2.5.0.zip
+        build/dist/scons-src-2.5.0.tar.gz
+        build/dist/scons-src-2.5.0.zip
+        build/dist/scons_2.5.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/SConstruct b/SConstruct
index 6ad6dd9..33a8680 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3,10 +3,10 @@
 #
 # See the README.rst file for an overview of how SCons is built and tested.
 
-copyright_years = '2001 - 2015'
+copyright_years = '2001 - 2016'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'MONTH YEAR'
+month_year = 'April 2016'
 
 #
 # __COPYRIGHT__
@@ -43,7 +43,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.4.2.alpha.yyyymmdd'
+default_version = '2.5.0'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
diff --git a/debian/changelog b/debian/changelog
index df47e95..7cc42fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ scons (2.5.0-1) unstable; urgency=low
 
  -- William Deegan <bill@baddogconsulting.com>  Sat, 07 Nov 2015 08:56:00 -0700
 
+scons (2.5.0) unstable; urgency=low
+
+  * Feature Release
+
+ -- William Deegan <bill@baddogconsulting.com>  Sat, 09 Apr 2016 08:56:00 -0700
+
 scons (2.4.1) unstable; urgency=low
 
   * Maintenance release.
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 6decbd3..232e96f 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f3.o -c f3.c
-cc -o f5.o -c f5.c
 cc -o f4.o -c f4.c
-cc -o f1.o -c f1.c
 cc -o f2.o -c f2.c
+cc -o f1.o -c f1.c
+cc -o f5.o -c f5.c
+cc -o f3.o -c f3.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index cc7ee2a..3d8592d 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -3,5 +3,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/home/bdbaddog/devel/scons/bootstrap/src/script/scons.py", line 199, in &lt;module&gt;
+File "/scons/as_scons/bootstrap/src/script/scons.py", line 199, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index 1ab65ee..add59ff 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -8,6 +8,6 @@ scons: internal stack trace:
     return SCons.Taskmaster.OutOfDateTask.prepare(self)
   File "bootstrap/src/engine/SCons/Taskmaster.py", line 191, in prepare
     executor.prepare()
-  File "bootstrap/src/engine/SCons/Executor.py", line 396, in prepare
+  File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare
     raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0]))
 </screen>
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index fcb7587..ba12966 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -780,19 +780,19 @@ Sets construction variables for the
 </para>
 <para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;.</para></listitem>
   </varlistentry>
-  <varlistentry id="t-packaging">
-    <term>packaging</term>
+  <varlistentry id="t-Packaging">
+    <term>Packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-A framework for building binary and source packages.
+Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="t-Packaging">
-    <term>Packaging</term>
+  <varlistentry id="t-packaging">
+    <term>packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
+A framework for building binary and source packages.
 </para>
 </listitem>
   </varlistentry>
diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod
index 1191e6a..2ee2270 100644
--- a/doc/generated/tools.mod
+++ b/doc/generated/tools.mod
@@ -78,8 +78,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-mwcc "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwcc</literal>">
 <!ENTITY t-mwld "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwld</literal>">
 <!ENTITY t-nasm "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>nasm</literal>">
-<!ENTITY t-packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>packaging</literal>">
 <!ENTITY t-Packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>Packaging</literal>">
+<!ENTITY t-packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>packaging</literal>">
 <!ENTITY t-pdf "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdf</literal>">
 <!ENTITY t-pdflatex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdflatex</literal>">
 <!ENTITY t-pdftex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdftex</literal>">
@@ -189,8 +189,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-link-mwcc "<link linkend='t-mwcc' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwcc</literal></link>">
 <!ENTITY t-link-mwld "<link linkend='t-mwld' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwld</literal></link>">
 <!ENTITY t-link-nasm "<link linkend='t-nasm' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>nasm</literal></link>">
-<!ENTITY t-link-packaging "<link linkend='t-packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>packaging</literal></link>">
 <!ENTITY t-link-Packaging "<link linkend='t-Packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>Packaging</literal></link>">
+<!ENTITY t-link-packaging "<link linkend='t-packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>packaging</literal></link>">
 <!ENTITY t-link-pdf "<link linkend='t-pdf' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdf</literal></link>">
 <!ENTITY t-link-pdflatex "<link linkend='t-pdflatex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdflatex</literal></link>">
 <!ENTITY t-link-pdftex "<link linkend='t-pdftex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdftex</literal></link>">
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 064ddef..a155d75 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -2838,6 +2838,15 @@ is <quote><literal>-dNOPAUSE -dBATCH -sDEVICE=pdfwrite</literal></quote>
     <term>HOST_ARCH</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The name of the host hardware architecture used to create the Environment.
+        If a platform is specified when creating the Environment, then
+        that Platform's logic will handle setting this value.
+        This value is immutable, and should not be changed by the user after
+        the Environment is initialized.
+        Currently only set for Win32.
+</para>
+    
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the host architecture for Visual Studio compiler. If not set,
 default to the detected host architecture: note that this may depend
 on the python you are using.
@@ -2853,16 +2862,7 @@ Valid values are the same as for <envar xmlns="http://www.scons.org/dbxsd/v1.0">
 This is currently only used on Windows, but in the future it will be
 used on other OSes as well.
 </para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-        The name of the host hardware architecture used to create the Environment.
-        If a platform is specified when creating the Environment, then
-        that Platform's logic will handle setting this value.
-        This value is immutable, and should not be changed by the user after
-        the Environment is initialized.
-        Currently only set for Win32.
-</para>
-    </listitem>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-HOST_OS">
     <term>HOST_OS</term>
@@ -7038,6 +7038,13 @@ that may not be set or used in a construction environment.
     <term>TARGET_ARCH</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
+        The name of the target hardware architecture for the compiled objects
+        created by this Environment.
+        This defaults to the value of HOST_ARCH, and the user can override it.
+        Currently only set for Win32.
+</para>
+    
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the target architecture for Visual Studio compiler (i.e. the arch
 of the binaries generated by the compiler). If not set, default to
 <envar xmlns="http://www.scons.org/dbxsd/v1.0">$HOST_ARCH</envar>, or, if that is unset, to the architecture of the
@@ -7062,14 +7069,7 @@ and <literal>ia64</literal> (Itanium).
 For example, if you want to compile 64-bit binaries, you would set
 <literal>TARGET_ARCH='x86_64'</literal> in your SCons environment.
 </para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-        The name of the target hardware architecture for the compiled objects
-        created by this Environment.
-        This defaults to the value of HOST_ARCH, and the user can override it.
-        Currently only set for Win32.
-</para>
-    </listitem>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-TARGET_OS">
     <term>TARGET_OS</term>
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 4db5abb..41ef607 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -54,10 +54,10 @@
 
     <corpauthor>Steven Knight and the SCons Development Team</corpauthor>
 
-    <pubdate>2004 - 2015</pubdate>
+    <pubdate>2004 - 2016</pubdate>
 
     <copyright>
-      <year>2004 - 2015</year>
+      <year>2004 - 2016</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 
diff --git a/doc/user/main.xml b/doc/user/main.xml
index d2c4c18..451f87d 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -74,10 +74,10 @@
 
     <corpauthor>Steven Knight and the SCons Development Team</corpauthor>
 
-    <pubdate>2004 - 2015</pubdate>
+    <pubdate>2004 - 2016</pubdate>
 
     <copyright>
-      <year>2004 - 2015</year>
+      <year>2004 - 2016</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 
diff --git a/src/Announce.txt b/src/Announce.txt
index 0b58958..b16fb3b 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,52 +18,48 @@ So that everyone using SCons can help each other learn how to use it more
 effectively, please go to http://scons.org/lists.php#users to sign up for
 the scons-users mailing list.
 
-==============IMPORTANT NOTICE FOR NEXT VERSION V2.5.0==========
-PLEASE READ. CHANGES COMING IN NEXT MAJOR RELEASE V2.5.0
-
-We're enhancing implicit language scanning functionality to improve
-correctness.  SCons now honors scanner keys for implicit dependencies
-and correctly changes scanner type (if necessary) when traversing 
-implicit dependency trees.  
-
-This enhancement resolves missing dependencies
-with built-in scanners including SWIG (#2264) and QT:
-* http://scons.tigris.org/issues/show_bug.cgi?id=2264
-
-This enhancement broadens the horizon for handling heterogeneous
-data flow environments (E.G. software builds):
-* http://article.gmane.org/gmane.comp.programming.tools.scons.user/26596
-Notes:
-
-* SCons may find new (and correct) dependencies in cross-langauge contexts.
-** Update may cause rebuilds, especially in heterogeneous data environments.
-** Update may find previously missed dependencies errors (E.G. cycles).
-*** Discovered in some QT test cases.
-* SCons handles the SCANNERS variable differently.
-** Previously, the Install builder would scan implicit dependencies for
-   a scanner found in SCANNERS (but not for built-in scanners), but now
-   the Install builder will not scan recursively regardless in order
-   to optimize Install behaviour and bring orthogonality to previous behaviour.
-* SCons handles cache directories a bit differently/
-** Cache files are now stored in 256 subdirectories in the cache directory by 
-   default (this stresses NFS less). Existing cache directories will remain as
-   current, but SCons will prompt you to run scons-configure-cache which will
-   allow you to migrate to the new layout, or confirm you want to use the
-   existing layout.
-
-+=================================================================
-
-
-RELEASE VERSION/DATE TO BE FILLED IN LATER
+RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -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
   since last release.  This announcement highlights only the important
   changes.
 
-  Please note the following important changes since release 2.4.0:
+    -  Please note the following important changes since release 2.4.1:
+       We're enhancing implicit language scanning functionality to improve
+       correctness.  SCons now honors scanner keys for implicit dependencies
+       and correctly changes scanner type (if necessary) when traversing 
+       implicit dependency trees.  
+
+       This enhancement resolves missing dependencies
+       with built-in scanners including SWIG (#2264) and QT:
+       * http://scons.tigris.org/issues/show_bug.cgi?id=2264
+
+       -  This enhancement broadens the horizon for handling heterogeneous
+          data flow environments (E.G. software builds):
+          - http://article.gmane.org/gmane.comp.programming.tools.scons.user/26596
+
+       - SCons may find new (and correct) dependencies in cross-langauge contexts.
+         - Update may cause rebuilds, especially in heterogeneous data environments.
+         - Update may find previously missed dependencies errors (E.G. cycles).
+           - Discovered in some QT test cases.
+       - SCons handles the SCANNERS variable differently.
+         -  Previously, the Install builder would scan implicit dependencies for
+            a scanner found in SCANNERS (but not for built-in scanners), but now
+            the Install builder will not scan recursively regardless in order
+            to optimize Install behaviour and bring orthogonality to previous behaviour.
+
+    - SCons handles cache directories a bit differently/
+      - Cache files are now stored in 256 subdirectories in the cache directory by 
+        default (this stresses NFS less). Existing cache directories will remain as
+        current, but SCons will prompt you to run scons-configure-cache which will
+        allow you to migrate to the new layout, or confirm you want to use the
+        existing layout.
+
     - New external tool scons-configurecache which allows some configuration of
       how files in the cache are controlled.
+
+  Please note the following important changes since release 2.4.0:
     - Fix to swig tool - pick-up 'swig', 'swig3.0' and 'swig2.0' (in order).
     - Fix to swig tool - respect env['SWIG'] provided by user.
     - Fix for Bug # 2791 - Setup.py fails unnecessarily under Jython.
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0615130..fd34d35 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -25,6 +25,7 @@ RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
       you build until you co this.
     - Fix a bunch of unit tests on windows
 
+
   From Dirk Baechle:
     - Removed a lot of compatibility methods and workarounds
       for Python versions < 2.7, in order to prepare the work
@@ -59,12 +60,20 @@ RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
     - Fix posix platform escaping logic to properly handle paths
       with parens in them "()".  (Bug #2225)
 
-
   From Jakub Pola:
     - Intel Compiler 2016 (Linux/Mac) update for tool directories.
 
   From Adarsh Sanjeev:
-  	- Fix for issue #2494: Added string support for Chmod function.
+    - Fix for issue #2494: Added string support for Chmod function.
+
+  From Tom Tanner:
+    - change cache to use 2 character subdirectories, rather than one character,
+      so as not to give huge directories for large caches, a situation which
+      causes issues for NFS.
+      For existing caches, you will need to run the scons-configure-cache.py
+      script to update them to the new format. You will get a warning every time
+      you build until you co this.
+    - Fix a bunch of unit tests on windows
 
 RELEASE 2.4.1 - Mon, 07 Nov 2015 10:37:21 -0700
 
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 3bff366..32d5a08 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,72 +1,76 @@
-  A new SCons checkpoint release, 2.4.3.alpha.yyyymmdd, is now available
+  A new SCons checkpoint release, 2.5.0, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php
 
   XXX The primary purpose of this release ... XXX
 
-  A SCons "checkpoint release" is intended to provide early access to
-  new features so they can be tested in the field before being released
-  for adoption by other software distributions.
-
-  Note that a checkpoint release is developed using the same test-driven
-  development methodology as all SCons releases.  Existing SCons
-  functionality should all work as it does in previous releases (except
-  for any changes identified in the release notes) and early adopters
-  should be able to use a checkpoint release safely for production work
-  with existing SConscript files.  If not, it represents not only a bug
-  in SCons but also a hole in the regression test suite, and we want to
-  hear about it.
-
-  New features may be more lightly tested than in past releases,
-  especially as concerns their interaction with all of the other
-  functionality in SCons.  We are especially interested in hearing bug
-  reports about new functionality.
-
-  We do not recommend that downstream distributions (Debian, Fedora,
-  etc.) package a checkpoint release, mainly to avoid confusing the
-  "public" release numbering with the long checkpoint release names.
-
-  Here is a summary of the changes since 1.3.0:
+  Here is a summary of the changes since 2.4.1:
 
   NEW FUNCTIONALITY
-
-    - List new features (presumably why a checkpoint is being released)
+    -  We're enhancing implicit language scanning functionality to improve
+       correctness.  SCons now honors scanner keys for implicit dependencies
+       and correctly changes scanner type (if necessary) when traversing 
+       implicit dependency trees.  
+
+       This enhancement resolves missing dependencies
+       with built-in scanners including SWIG (#2264) and QT:
+       * http://scons.tigris.org/issues/show_bug.cgi?id=2264
+
+       -  This enhancement broadens the horizon for handling heterogeneous
+          data flow environments (E.G. software builds):
+          - http://article.gmane.org/gmane.comp.programming.tools.scons.user/26596
+
+       - SCons may find new (and correct) dependencies in cross-langauge contexts.
+         - Update may cause rebuilds, especially in heterogeneous data environments.
+         - Update may find previously missed dependencies errors (E.G. cycles).
+           - Discovered in some QT test cases.
+       - SCons handles the SCANNERS variable differently.
+         -  Previously, the Install builder would scan implicit dependencies for
+            a scanner found in SCANNERS (but not for built-in scanners), but now
+            the Install builder will not scan recursively regardless in order
+            to optimize Install behaviour and bring orthogonality to previous behaviour.
+
+    - New external tool scons-configurecache which allows some configuration of
+      how files in the cache are controlled.
 
   DEPRECATED FUNCTIONALITY
 
-    - List anything that's been deprecated since the last release
+    - None
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-    - List modifications to existing features, where the previous behavior
-      wouldn't actually be considered a bug
+    - SCons handles cache directories a bit differently/
+      - Cache files are now stored in 256 subdirectories in the cache directory by 
+        default (this stresses NFS less). Existing cache directories will remain as
+        current, but SCons will prompt you to run scons-configure-cache which will
+        allow you to migrate to the new layout, or confirm you want to use the
+        existing layout.
 
   FIXES
 
-    - List fixes of outright bugs
+    - This enhancement resolves missing dependencies with built-in scanners including
+      SWIG (#2264) and QT - See New Features above
+       * http://scons.tigris.org/issues/show_bug.cgi?id=2264
 
   IMPROVEMENTS
 
-    - List improvements that wouldn't be visible to the user in the
-      documentation:  performance improvements (describe the circumstances
-      under which they would be observed), or major code cleanups
+    - None
 
   PACKAGING
 
-    - List changes in the way SCons is packaged and/or released
+    - None
 
   DOCUMENTATION
 
-    - List any significant changes to the documentation (not individual
-      typo fixes, even if they're mentioned in src/CHANGES.txt to give
-      the contributor credit)
+    - None
 
   DEVELOPMENT
 
-    - List visible changes in the way SCons is developed
+    - None
 
-  Thanks to CURLY, LARRY, and MOE for their contributions to this release.
+  Thanks to Dirk Baechle, William Blevins, William Deegan, Jakub Pola, Adarsh Sanjeev, Tom Tanner
+  for their contributions to this release.
   Contributors are listed alphabetically by their last name.
 
 __COPYRIGHT__