merging 2.3.5 changes

11 files changed, 80 insertions, 21 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 923e319..bae96e6 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.4'
+default_version = '2.3.5'
 
 python_version_unsupported = (2, 3, 0)
 python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index 599abaf..5e9dcb8 100644
--- a/README.rst
+++ b/README.rst
@@ -480,14 +480,14 @@ 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.4.tar.gz
-        build/dist/scons-2.3.4.win32.exe
-        build/dist/scons-2.3.4.zip
-        build/dist/scons-doc-2.3.4.tar.gz
-        build/dist/scons-local-2.3.4.tar.gz
-        build/dist/scons-local-2.3.4.zip
-        build/dist/scons-src-2.3.4.tar.gz
-        build/dist/scons-src-2.3.4.zip
+        build/dist/scons-2.3.5.tar.gz
+        build/dist/scons-2.3.5.win32.exe
+        build/dist/scons-2.3.5.zip
+        build/dist/scons-doc-2.3.5.tar.gz
+        build/dist/scons-local-2.3.5.tar.gz
+        build/dist/scons-local-2.3.5.zip
+        build/dist/scons-src-2.3.5.tar.gz
+        build/dist/scons-src-2.3.5.zip
         build/dist/scons_2.3.3-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to build
diff --git a/ReleaseConfig b/ReleaseConfig
index 0735012..44fe657 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, 5, 'alpha', 0)
+version_tuple = (2, 3, 5)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version
@@ -51,7 +51,7 @@ deprecated_python_version = (2, 7, 0)
 #month_year = 'December 2012'
 
 # If copyright years is not given, the release year is used as the end.
-copyright_years = '2001 - 2014'
+copyright_years = '2001 - 2015'
 
 # Local Variables:
 # tab-width:4
diff --git a/SConstruct b/SConstruct
index abf5fa8..bbddd98 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 - 2014'
+copyright_years = '2001 - 2015'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'September 2014'
+month_year = 'June 2015'
 
 #
 # __COPYRIGHT__
@@ -43,7 +43,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.3.4'
+default_version = '2.3.5'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
diff --git a/bin/scp-sourceforge b/bin/scp-sourceforge
index ad761d1..07df3ea 100755
--- a/bin/scp-sourceforge
+++ b/bin/scp-sourceforge
@@ -19,10 +19,14 @@ do
       sf/$p/$VERSION
 done
 
+cp -p build/scons/README.txt \
+      sf/.
+
 cp -p   build/dist/scons-$VERSION-1.noarch.rpm \
     build/dist/scons-$VERSION-1.src.rpm \
     build/dist/scons-$VERSION.tar.gz \
     build/dist/scons-$VERSION.win32.exe \
+    build/dist/scons-$VERSION.win-amd64.exe \
     build/dist/scons-$VERSION.zip \
     sf/scons/$VERSION
 cp -p   build/dist/scons-local-$VERSION.tar.gz \
@@ -35,4 +39,8 @@ cp -p   build/dist/scons-src-$VERSION.tar.gz \
 # Transmit them in this order, since the most-recent is displayed at the top
 scp -r sf/scons-local/ sf/scons-src/ sf/scons/ \
     $SF_USER,scons@frs.sourceforge.net:/home/pfs/project/s/sc/scons
+
+scp  sf/README.txt \
+    $SF_USER,scons@frs.sourceforge.net:/home/pfs/project/s/sc/scons
+
 rm -rf sf
diff --git a/debian/changelog b/debian/changelog
index a39a73b..9dbb1b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scons (2.3.5) unstable; urgency=low
+
+  * Maintenance release.
+
+ -- William Deegan <bill@baddogconsulting.com>  Mon, 17 Jun 2015 21:07:32 -0700
+
 scons (2.3.4) unstable; urgency=low
 
   * Maintenance release.
diff --git a/doc/user/main.xml b/doc/user/main.xml
index a165777..d2c4c18 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 - 2014</pubdate>
+    <pubdate>2004 - 2015</pubdate>
 
     <copyright>
-      <year>2004 - 2014</year>
+      <year>2004 - 2015</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 
diff --git a/doc/version.xml b/doc/version.xml
index f6eba1f..172a9ec 100644
--- a/doc/version.xml
+++ b/doc/version.xml
@@ -2,6 +2,6 @@
 <!--
 THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 -->
-<!ENTITY builddate "2013-03-23">
-<!ENTITY buildversion "2.3.0">
+<!ENTITY builddate "2015-06-17">
+<!ENTITY buildversion "2.3.5">
 <!ENTITY buildrevision "1">
diff --git a/src/Announce.txt b/src/Announce.txt
index 7c6fdd5..e8b7fd5 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,14 +18,59 @@ 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.4.0===========
 
-RELEASE VERSION/DATE TO BE FILLED IN LATER
+PLEASE READ. CHANGES COMING IN NEXT MAJOR RELEASE V2.4.0
+As has been pre-announced in SCons's mailing lists:
+
+* 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
+
+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 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.
+
+=================================================================
+
+
+RELEASE 2.3.5 - Mon, 17 Jun 2015 21:07:32 -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.3.4:
+    - Documentation fixes for libraries.xml and
+      builders-writing.xml (#2989 and #2990)
+    - Extended docs for InstallVersionedLib/SharedLibrary,
+      and added SKIP_WIN_PACKAGES argument to build script
+      bootstrap.py (PR #230, #3002).
+    - Fixed symlink support (PR #227, #2395).
+    - Updated debug-count test case (PR #229).
+    - Fixed incomplete LIBS flattening and substitution in
+      Program scanner(PR #205, #2954).
+    - Added new method rentry_exists_on_disk to Node.FS (PR #193).
+    - Fixed several D tests under the different OS.
+    - Add support for f08 file extensions for Fortran 2008 code.
+    - Show --config choices if no argument is specified (PR #202).
+    - Fixed build crash when XML toolchain isn't installed, and
+      activated compression for ZIP archives.
+    - Fix for VersionedSharedLibrary under 'sunos' platform.
+    - Fixed dll link with precompiled headers on MSVC 2012
+    - Added an 'exclude' parameter to Glob()
+    - Support for multiple cmdargs (one per variant) in VS project files.
+    - Various improvements for TempFileMunge class.
+    - Added an implementation for Visual Studio users files (PR #209).
+    - Added support for the 'PlatformToolset' tag in VS project files (#2978).
+    - Added support for '-isystem' to ParseFlags.
+
+
   Please note the following important changes since release 2.3.3:
 
     -- Fix for EnsureSConsVersion regression in 2.3.3.
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index ef4e016..8c764c1 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,7 +4,7 @@
 
                             Change Log
 
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
+RELEASE 2.3.5 - Mon, 17 Jun 2015 21:07:32 -0700
 
   From Stephen Pollard:
     - Documentation fixes for libraries.xml and
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 1fa033b..587c01e 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
-  A new SCons checkpoint release, 2.3.5.alpha.yyyymmdd, is now available
+  A new SCons checkpoint release, 2.3.5, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php