Updates to Changes, Release, Announce

3 files changed, 85 insertions, 86 deletions

diff --git a/src/Announce.txt b/src/Announce.txt
index 0b58958..266988f 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,42 +18,6 @@ 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
 
   Please consult the RELEASE.txt file for a summary of changes since the last
@@ -61,9 +25,41 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
   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 3d2cf1c..7f8da6c 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,15 +6,6 @@
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
-  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
-
   From Dirk Baechle:
     - Removed a lot of compatibility methods and workarounds
       for Python versions < 2.7, in order to prepare the work
@@ -49,12 +40,20 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - 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..2c99cca 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -5,68 +5,72 @@
 
   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__