merge changes from 2.4.1 release to default

3 files changed, 112 insertions, 63 deletions

diff --git a/src/Announce.txt b/src/Announce.txt
index 7a13b81..719b4d7 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,31 +18,86 @@ 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===========
+==============IMPORTANT NOTICE FOR NEXT VERSION V2.5.0==========
+PLEASE READ. CHANGES COMING IN NEXT MAJOR RELEASE V2.5.0
 
-As has been pre-announced in SCons's mailing lists:
+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.  
 
-* https://pairlist4.pair.net/pipermail/scons-users/2014-July/002734.html ,
-* https://pairlist2.pair.net/pipermail/scons-dev/2014-December/002107.html
-* https://pairlist4.pair.net/pipermail/scons-users/2015-February/003454.html
+This enhancement resolves missing dependencies
+with built-in scanners including SWIG (#2264) and QT:
+* http://scons.tigris.org/issues/show_bug.cgi?id=2264
 
-We're planning to switch the Node class to using "slots" in the core sources,
-mainly to reduce memory consumption by up to 35% in large build projects.
+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:
 
-This feature has been tested extensively and we don't expect any problems for you.
-However as with all major changes it would be wise to test V2.4.0 when it is
-released. Especially if you are directly using the Node class.
+* 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.
 
-=================================================================
++=================================================================
 
 
-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
   since last release.  This announcement highlights only the important
   changes.
 
+  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.
+    - Fixed license of SVG titlepage files in the context of Debian
+      packaging, such that they allow for commercial use too (#2985).
+    - InstallVersionedLib now available in the DefaultEnvironment context.
+    - Improves orthogonality of use cases between different Install functions.
+    - Added new configure check, CheckProg, to check for
+      existence of a program.
+    - Fix for issue #2840 - Fix for two environments specifying same target with different
+      actions not throwing hard error. Instead SCons was incorrectly issuing a warning
+      and continuing.
+    - Add support `Microsoft Visual C++ Compiler for Python 2.7' 
+      Compiler can be obtained at: https://www.microsoft.com/en-us/download/details.aspx?id=44266
+    - Fixed tigris issue #3011: Glob() excludes didn't work when used with VariantDir(duplicate=0)
+    - Fix bug 2831 and allow Help() text to be appended to AddOption() help.
+    - Reimplemented versioning for shared libraries, with the following effects
+    - Fixed tigris issues #3001, #3006.
+    - Fixed several other issues not reported to tigris, including:
+      issues with versioned libraries in subdirectories with tricky names,
+      issues with versioned libraries and variant directories,
+      issue with soname not being injected to library when using D linkers,
+    - Switched to direct symlinks instead of daisy-chained ones -- soname and
+      development symlinks point directly to the versioned shared library now),
+      for rationale see:
+      https://www.debian.org/doc/debian-policy/ch-sharedlibs.html
+      https://fedoraproject.org/wiki/Packaging:Guidelines#Devel_Packages
+      https://bitbucket.org/scons/scons/pull-requests/247/new-versioned-libraries-gnulink-cyglink/diff#comment-10063929
+    - New construction variables to allow override default behavior: SONAME,
+      SHLIBVERSIONFLAGS, _SHLIBVERSIONFLAGS, SHLIBNOVERSIONSYMLINKS,
+      LDMODULEVERSION, LDMODULEVERSIONFLAGS, _LDMODULEVERSIONFLAGS,
+      LDMODULENOVERSIONSYMLINKS.
+    - Changed logic used to configure the versioning machinery from
+      platform-centric to linker-oriented.
+    - The SHLIBVERSION/LDMODULEVERSION variables are no longer validated by
+      SCons (more freedom to users).
+    - InstallVersionedLib() doesn't use SHLIBVERSION anymore.
+    - Enchanced docs for the library versioning stuff.
+    - New tests for versioned libraries.
+    - Library versioning is currently implemented for the following linker
+      tools: 'cyglink', 'gnulink', 'sunlink'.
+
   Please note the following important changes since release 2.3.6:
     - Switch several core classes to use "slots" to reduce memory
       usage. (PR #2180, #2178, #2198)
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 823eb4b..40245a8 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,11 +4,7 @@
 
                             Change Log
 
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
-
-  From Paweł Tomulik:
-    - Fix to swig tool - pick-up 'swig', 'swig3.0' and 'swig2.0' (in order).
-    - Fix to swig tool - respect env['SWIG'] provided by user.
+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.
@@ -66,6 +62,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - New tests for versioned libraries.
     - Library versioning is currently implemented for the following linker
       tools: 'cyglink', 'gnulink', 'sunlink'.
+    - Fix to swig tool - pick-up 'swig', 'swig3.0' and 'swig2.0' (in order).
+    - Fix to swig tool - respect env['SWIG'] provided by user.
 
 
 
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 1bf2eb1..baf3283 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,72 +1,68 @@
-  A new SCons checkpoint release, 2.3.13.alpha.yyyymmdd, is now available
+  A new SCons release, 2.4.1, 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.0:
 
   NEW FUNCTIONALITY
-
-    - List new features (presumably why a checkpoint is being released)
+    - InstallVersionedLib now available in the DefaultEnvironment context.
+    - Added new configure check, CheckProg, to check for existence of a program.
+    - Add support `Microsoft Visual C++ Compiler for Python 2.7' 
+      Compiler can be obtained at: https://www.microsoft.com/en-us/download/details.aspx?id=44266
 
   DEPRECATED FUNCTIONALITY
 
-    - List anything that's been deprecated since the last release
-
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-    - List modifications to existing features, where the previous behavior
-      wouldn't actually be considered a bug
+    - Reimplemented versioning for shared libraries, with the following effects
+    - Fixed tigris issues #3001, #3006.
+    - Fixed several other issues not reported to tigris, including:
+      issues with versioned libraries in subdirectories with tricky names,
+      issues with versioned libraries and variant directories,
+      issue with soname not being injected to library when using D linkers,
+    - Switched to direct symlinks instead of daisy-chained ones -- soname and
+      development symlinks point directly to the versioned shared library now),
+      for rationale see:
+      https://www.debian.org/doc/debian-policy/ch-sharedlibs.html
+      https://fedoraproject.org/wiki/Packaging:Guidelines#Devel_Packages
+      https://bitbucket.org/scons/scons/pull-requests/247/new-versioned-libraries-gnulink-cyglink/diff#comment-10063929
+    - New construction variables to allow override default behavior: SONAME,
+      SHLIBVERSIONFLAGS, _SHLIBVERSIONFLAGS, SHLIBNOVERSIONSYMLINKS,
+      LDMODULEVERSION, LDMODULEVERSIONFLAGS, _LDMODULEVERSIONFLAGS,
+      LDMODULENOVERSIONSYMLINKS.
+    - Changed logic used to configure the versioning machinery from
+      platform-centric to linker-oriented.
+    - The SHLIBVERSION/LDMODULEVERSION variables are no longer validated by
+      SCons (more freedom to users).
+    - InstallVersionedLib() doesn't use SHLIBVERSION anymore.
+    - Enchanced docs for the library versioning stuff.
+    - New tests for versioned libraries.
+    - Library versioning is currently implemented for the following linker
+      tools: 'cyglink', 'gnulink', 'sunlink'.
 
   FIXES
 
-    - List fixes of outright bugs
+    - Fix for issue #2840 - Fix for two environments specifying same target with different
+      actions not throwing hard error. Instead SCons was incorrectly issuing a warning
+      and continuing.
+    - 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.
+    - Fixed license of SVG titlepage files in the context of Debian
+      packaging, such that they allow for commercial use too (#2985).
+    - Fixed tigris issue #3011: Glob() excludes didn't work when used with VariantDir(duplicate=0)
+    - Fix bug 2831 and allow Help() text to be appended to AddOption() help.
 
   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
-
   PACKAGING
 
-    - List changes in the way SCons is packaged and/or released
-
   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)
-
   DEVELOPMENT
 
-    - List visible changes in the way SCons is developed
-
-  Thanks to CURLY, LARRY, and MOE for their contributions to this release.
+  Thanks to Arfrever Frehtes Taifersar Arahesis, Dirk Baechle, William Blevins, Carnë Draug, Andrew Featherstone, Hiroaki Itoh, Florian Miedniak, William Roberts, Paweł Tomulik  for their contributions to this release.
   Contributors are listed alphabetically by their last name.
 
 __COPYRIGHT__