Merged in bdbaddog/scons (pull requests #68 and #69)

3 files changed, 68 insertions, 42 deletions

diff --git a/src/Announce.txt b/src/Announce.txt
index a2197a17..7d80e792 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -19,13 +19,29 @@ effectively, please go to http://scons.org/lists.php#users to sign up for
 the scons-users mailing list.
 
 
-RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000
+RELEASE 2.3.0 - FEB XXX 2013
 
   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.2.0:
+
+    -- A lot of python pre-2.4 compatibility code was removed
+       in this release.  2.4 is the official floor for SCons,
+       but this release will likely enforce it more rigidly.
+
+    -- Spawning subprocesses on Windows should now be more reliable with -jN
+
+    -- MSVC10 and MSVC11 support improved, and fixed MSVS11 solution generation.
+
+    -- Various TeX/LaTeX builder improvements
+
+    -- Support for versioned shared libs on Linux and Mac, via
+       SHLIBVERSION and InstallVersionedLib.
+
+    -- WiX builder updates
 
   Please note the following important changes since release 2.1.0:
 
@@ -43,7 +59,7 @@ RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000
 
     --  SCons now searches sitewide dirs for site_scons
 
-    --  Support for Latex bibunits package has been added along with 
+    --  Support for Latex bibunits package has been added along with
         support for tex files generated by other builders
 
 
@@ -106,7 +122,7 @@ RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000
 	the same version as MSVC_VERSION.
 
         Support for HOST_OS,HOST_ARCH,TARGET_OS, TARGET_ARCH has been
-        added to allow specifying different target arch than the host 
+        added to allow specifying different target arch than the host
         system. This is only supported for Visual Studio/Visual C++
         at this time.
 
@@ -261,7 +277,7 @@ RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000
         initializing construction environments with the 'g77' Tool module:
 
             env = Environment(tools = ['g77', 'default'])
-        
+
         The above code is backwards compatible to older versions of SCons.
 
         If you notice any other changes in the behavior of default
@@ -521,7 +537,7 @@ RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000
         non-True value:
 
             env = Environment(IMPLICIT_COMMAND_DEPENDENCIES = 0)
-        
+
         or by adding Ignore() calls for any targets where the behavior
         is desired:
 
@@ -618,7 +634,7 @@ RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000
 
                 env.Foo('tgt1', 'src1')
                 env.Bar('tgt2', 'src2')
-        
+
         SCons would have expected to find a source file 'src1.foo' for the
         env.Foo() call, but a source file 'src2' for the env.Bar() call.
 
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 16cfa3ae..a33c75da 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,7 +4,7 @@
 
                             Change Log
 
-RELEASE 2.X.X - 
+RELEASE 2.3 -
 
   From Anatoly Techtonik:
     - Added ability to run scripts/scons.py directly from source checkout
@@ -48,7 +48,7 @@ RELEASE 2.X.X -
       * provided a new module rpmutils.py, wrapping the RPM naming rules
         for target files and further hardware-dependent info (compatibility,
         compiler flags, ...),
-      * added new test methods must_exist_one_of() and 
+      * added new test methods must_exist_one_of() and
         must_not_exist_any_of() and
       * removed Aegis support from runtest.py. (#2872)
 
@@ -60,11 +60,11 @@ RELEASE 2.X.X -
   From Rob Managan:
     - Updated the TeX builder to support the \newglossary command
       in LaTeX's glossaries package and the files it creates.
-    - Improve support for new versions of biblatex in the TeX builder 
+    - Improve support for new versions of biblatex in the TeX builder
       so biber is called automatically if biblatex requires it.
     - Add SHLIBVERSION as an option that tells SharedLibrary to build
       a versioned shared library and create the required symlinks.
-      Add builder InstallVersionedLib to create the required symlinks 
+      Add builder InstallVersionedLib to create the required symlinks
       installing a versioned shared library.
 
 RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000
@@ -97,11 +97,11 @@ RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000
   From Alexey Petruchik:
     - Support for Microsoft Visual Studio 11 (both using it
       and generating MSVS11 solution files).
-    
+
   From Alexey Klimkin:
     - Fixed the Taskmaster, curing spurious build failures in
       multi-threaded runs (#2720).
-    
+
   From Dirk Baechle:
     - Improved documentation of command-line variables (#2809).
     - Fixed scons-doc.py to properly convert main XML files (#2812).
@@ -155,18 +155,18 @@ RELEASE 2.1.0 - Mon, 09 Sep 2011 20:54:57 -0700
     - Fix Intel compiler to sort versions >9 correctly (esp. on Linux)
     - Fix Install() when the source and target are directories and the
       target directory exists.
-    
+
   From David Garcia Garzon:
     - Fix Delete to be able to delete broken symlinks and dir
       symlinks.
-  
+
   From Robert Lehr:
     - Handle .output file generated by bison/yacc properly. Cleaning it
       when necessary.
 
   From Antoine Dechaume:
     - Handle SWIG file where there is whitespace after the module name
-      properly. Previously the generated files would include 
+      properly. Previously the generated files would include
       the whitespace.
 
   From Dmitry R.:
@@ -189,7 +189,7 @@ RELEASE 2.1.0 - Mon, 09 Sep 2011 20:54:57 -0700
 
   From Evgeny Podjachev and Alexey Petruchick:
 
-    - Support generation of Microsoft Visual Studio 2008 (9.0) 
+    - Support generation of Microsoft Visual Studio 2008 (9.0)
       and 2010 (10.0) project and solution files.
 
   From Ken Deeter:
@@ -291,13 +291,13 @@ RELEASE 2.1.0 - Mon, 09 Sep 2011 20:54:57 -0700
     - The TeX builders should now work with tex files that are generated
       by another program. Thanks to Hans-Martin von Gaudecker for
       isolating the cause of this bug.
-      
+
     - Added support for INDEXSTYLE environment variable so makeindex can
       find style files.
 
     - Added support for the bibunits package so we call bibtex on all
       the bu*.aux files.
-      
+
     - Add support of finding path information on OSX for TeX applications
       MacPorts and Fink paths need to be added by the user
 
@@ -381,7 +381,7 @@ RELEASE 2.0.0.final.0 - Mon, 14 Jun 2010 22:01:37 -0700
     - Fix "Ignoring corrupt sconsign entry" warnings when building
       in a tree with a pre-2.0 .sconsign file.
 
-    - Fix propagation from environment of VS*COMNTOOLS to resolve issues 
+    - Fix propagation from environment of VS*COMNTOOLS to resolve issues
       initializing MSVC/MSVS/SDK issues.
 
     - Handle detecting Visual C++ on Python verions with upper-case
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 2ec92198..db886fa8 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,46 +1,47 @@
-  A new SCons release, 2.1.0.alpha.yyyymmdd, is now available
+  A new SCons release, 2.3.0, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php
 
   This release adds several new features and fixes many issues.
 
-  Here is a summary of the changes since 2.1:
+  Here is a summary of the changes since 2.2:
 
   NEW FUNCTIONALITY
 
-    - New gettext toolset for internationalization
-    - Support for Visual Studio 11 (both using it and generating solution files)
-    - Support for Intel C/C++ compiler v12 on Linux and Mac
-    - LaTeX support for multibib, biblatex and biber
+    - Versioned shared library support for Linux and Mac:
+      Add SHLIBVERSION as an option that tells SharedLibrary to build
+      a versioned shared library and create the required symlinks.
+      Add builder InstallVersionedLib to create the required symlinks
+      installing a versioned shared library.
 
   DEPRECATED FUNCTIONALITY
 
-    - None
+    - Removed a lot of Python 2.3 and older support code
+    - Hide deprecated --debug={dtree,stree,tree} from --help output
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-    - 32-bit Visual Express C++ on 64-bit Windows now generates 32-bit code instead of giving errors
+    - No changes
 
   FIXES
 
-    - Fixed FindSourceFiles to find final sources (leaf nodes).
-    - Make Windows not redefine builtin file as un-inheritable (#2857)
-    - Fix WINDOWS_INSERT_DEF on MinGW (Windows) (#2856)
-    - Fix LINKCOMSTR, SHLINKCOMSTR, and LDMODULECOMSTR on Windows (#2833).
-    - Make -s (silent mode) be silent about entering subdirs (#2976).
-    - Fix cloning of builders when cloning environment (#2821).
-    - Fixed the Taskmaster, curing spurious build failures in
-      multi-threaded runs (#2720).
-    - Fixed scons-doc.py to properly convert main XML files (#2812).
-
+    - Fix subprocess spawning on Windows.  Work around a Windows
+      bug that can crash python occasionally when using -jN. (#2449)
+    - Fix nested LIBPATH expansion by flattening sequences in subst_path.
+    - Fix WiX Tool to use .wixobj rather than .wxiobj for compiler output
+    - Add MSVC10 and MSVC11 support to get_output low-level bat script runner.
+    - Fix MSVS solution generation for VS11, and fixed tests.
 
   IMPROVEMENTS
 
-    - Improved documentation of command-line variables (#2809).
-    - Show valid Visual Studio architectures in error message
-       when user passes invalid arch.
-    - Allow Node objects in Java path (#2825)
+    - Error messages from option parser now include hints about valid choices
+    - Support building with WiX releases after 2.0
+    - Print target name with command execution time with --debug=time
+    - Updated the TeX builder to support the \newglossary command
+      in LaTeX's glossaries package and the files it creates.
+    - Improve support for new versions of biblatex in the TeX builder
+      so biber is called automatically if biblatex requires it.
 
   PACKAGING
 
@@ -48,11 +49,19 @@
 
   DEVELOPMENT
 
-    - No changes
+    - Updated test framework to support dir and file fixtures and
+      added ability to test external (out-of-tree) tools.
+      See doc in QMTest/test-framework.rst.
+    - Added ability to run scripts/scons.py directly from source checkout
+    - Several fixes for runtest.py
+    - Fixed several errors in the test suite.
+    - Add -jN support to runtest.py to run tests in parallel
+
 
 Thanks to:
   Dirk Baechle,
   Vincent Beffar,
+  Thomas Berg,
   Jean-François Colson,
   Bauke Conijn,
   Bill Deegan,
@@ -66,6 +75,7 @@ Thanks to:
   Steven Knight,
   Arve Knudsen,
   Jean-Baptiste Lab,
+  Juan Lang,
   Rob Managan,
   Mortoray,
   Gary Oberbrunner,