merge

8 files changed, 71 insertions, 81 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index bd23ce65..66d6b23a 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -35,7 +35,7 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.5.0'
+default_version = '3.0.0.alpha.20170614'
 
 python_version_unsupported = (2, 6, 0)
 python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index ba1755fd..dfbf117f 100644
--- a/README.rst
+++ b/README.rst
@@ -492,15 +492,15 @@ following packages will be built::
         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
+        build/dist/scons-3.0.0.alpha.20170614.tar.gz
+        build/dist/scons-3.0.0.alpha.20170614.win32.exe
+        build/dist/scons-3.0.0.alpha.20170614.zip
+        build/dist/scons-doc-3.0.0.alpha.20170614.tar.gz
+        build/dist/scons-local-3.0.0.alpha.20170614.tar.gz
+        build/dist/scons-local-3.0.0.alpha.20170614.zip
+        build/dist/scons-src-3.0.0.alpha.20170614.tar.gz
+        build/dist/scons-src-3.0.0.alpha.20170614.zip
+        build/dist/scons_3.0.0.alpha.20170614-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/ReleaseConfig b/ReleaseConfig
index 517b5dbf..331380a9 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, 7, 0, 'alpha', 0)
+version_tuple = (3, 0, 0, 'alpha', 0)
 
 # 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 - 2016'
+copyright_years = '2001 - 2017'
 
 # Local Variables:
 # tab-width:4
diff --git a/SConstruct b/SConstruct
index bd43f191..f30b4c4b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,10 +5,10 @@
 
 from __future__ import print_function
 
-copyright_years = '2001 - 2016'
+copyright_years = '2001 - 2017'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'November 2016'
+month_year = 'MONTH YEAR'
 
 #
 # __COPYRIGHT__
@@ -45,7 +45,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.5.1'
+default_version = '3.0.0.alpha.20170614'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
diff --git a/doc/user/main.xml b/doc/user/main.xml
index 451f87da..9bb15268 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 - 2016</pubdate>
+    <pubdate>2004 - 2017</pubdate>
 
     <copyright>
-      <year>2004 - 2016</year>
+      <year>2004 - 2017</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 
diff --git a/src/Announce.txt b/src/Announce.txt
index a7b172d2..112d6f07 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,14 +18,44 @@ So that everyone using SCons can help each other learn how to use it more
 effectively, please go to http://scons.org/lists.html#users to sign up for
 the scons-users mailing list.
 
-RELEASE VERSION/DATE TO BE FILLED IN LATER
+RELEASE 3.0.0.alpha.20170614 - Mon, 14 Jun 2017 12:23:56 -0400
 
   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.1:
+    Please note the following important changes since release 2.5.1:
+       *IT IS NOT READY FOR PRODUCTION USE*
+
+       This is the initial release supporting both python 3.5+ and 2.7.x and pypy
+       There are some important changes:
+
+       - Any print statements must now use python 3 syntax of "print()"
+       - All node content should be in bytes. This is the default in python 2.7.x,
+         in Python 3 all strings are by default unicode. byte and/or bytearray
+         should be used if you construct content for return by a custom node type's
+         get_content() method.
+       - This is some (as yet unresolved issue) using Literal()'s in some context with
+         Python 3
+       - pypy should be supported, please report any issues to the user's mailing list.
+       - Currently if you switch back and forth between python 2.7.x and 3.5+ you will
+         need to remove your sconsign file.  This should be resolves shortly, but
+         regardless switching between python 2.7.x and 3.5+ will not use compatible
+         sconsigns and as such incremental builds should be expected to rebuild
+         anything changed since the previous scons run with the same version of python.
+       - It is likely that migrating from 2.5.1 -> 3.0.0 alpha will cause rebuilds due
+         to the significant number of changes in the codebase.
+
+       - Removed deprecated tools CVS, Perforce, BitKeeper, RCS, SCCS, Subversion.
+       - Removed deprecated module SCons.Sig
+       - See CHANGES.txt for more details on other changes
+       - 3.0.0 should be slightly faster than 2.5.1.  Changes yielded a 15% speed up for
+         null incremental builds.
+       - Updated D language scanner support to latest: 2.071.1.
+       - python -m SCons should now run SCons if it's installed PYTHONPATH
+
+
+    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 
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index ada66b0a..5d670fd2 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,36 +4,8 @@
 
                             Change Log
 
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
-  From John Doe:
-
-    - Whatever John Doe did.
-
-
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
-
-  From Daniel Moody:
-    - Updated the QMTest/TestCmd.py so when using the
-      preserve option, it will be able to print unicode directories.
-    - Also updated test/scons-time/run/option/verbose.py that was
-      not taking into account the output when PRESERVE was enabled
-
-  From Gaurav Juvekar:
-    - Fix issue #2832: Expand construction variables in 'chdir' argument of builders. (PR #463)
-    - Fix issue #2910: Make --tree=all handle Unicode. (PR #427)
-    - Fix issue #2788: Fix typo in documentation example for sconf. (PR #388)
-
-  From Manish Vachharajani:
-    - Update debian rules, compat, and control to not use features
-      deprecated or obsolete in later versions of debhelpers
-    - Update python version to 2.7 in debian/control
-
-  From Russel Winder:
-    - Reordered the default D tools from "dmd, gdc, ldc" to "dmd, ldc, gdc".
-    - Add a ProgramAllAtOnce builder to the dmd, ldc, and gdc tools. (PR #448)
-    - Deprecate a file name exception for very old Fedora LDC installation.
-    - gdc can now handle building shared objects (tested for version 6.3.0).
+RELEASE 3.0.0.alpha.20170614 - Mon, 14 Jun 2017 12:23:56 -0400
 
   From William Blevins:
     - Updated D language scanner support to latest: 2.071.1. (PR #1924)
@@ -57,10 +29,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fixed MSVSProject example code (http://scons.tigris.org/issues/show_bug.cgi?id=2979)
     - Defined MS SDK 10.0 and Changed VS 2015 to use SDK 10.0
 
-  From Daniel Moody:
-    - Fixed msvs.py for Visual Studio generated projects which were
-      creating invalid xml for greater than and less than symbols.
-
   From Daniel Holth:
     - Add basic support for PyPy (by deleting __slots__ from Node with a
       metaclass on PyPy); wrap most-used open() calls in 'with' statements to
@@ -68,6 +36,11 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Add __main__.py for `python -m SCons` in case it is on PYTHONPATH.
     - Always use highest available pickle protocol for efficiency.
 
+  From Gaurav Juvekar:
+    - Fix issue #2832: Expand construction variables in 'chdir' argument of builders. (PR #463)
+    - Fix issue #2910: Make --tree=all handle Unicode. (PR #427)
+    - Fix issue #2788: Fix typo in documentation example for sconf. (PR #388)
+
   From Alexey Klimkin:
     - Use memoization to optimize PATH evaluation across all dependencies per
       node. (PR #345)
@@ -76,6 +49,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fixed msvs.py for Visual Studio Express editions that would report
       "Error  : ValueError: invalid literal for float(): 10.0Exp".
 
+  From Rick Lupton:
+    - Update LaTeX scanner to understand \import and related commands
 
   From Paweł Tomulik:
     - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jennes
@@ -86,13 +61,20 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Added LoadableModule to the list of global functions (DefaultEnvironment
       builders).
 
-  From Rick Lupton:
-    - Update LaTeX scanner to understand \import and related commands
+  From Manish Vachharajani:
+    - Update debian rules, compat, and control to not use features
+      deprecated or obsolete in later versions of debhelpers
+    - Update python version to 2.7 in debian/control
 
   From Richard Viney:
     - Fixed PCHPDBFLAGS causing a deprecation warning on MSVC v8 and later when
       using PCHs and PDBs together.
 
+  From Russel Winder:
+    - Reordered the default D tools from "dmd, gdc, ldc" to "dmd, ldc, gdc".
+    - Add a ProgramAllAtOnce builder to the dmd, ldc, and gdc tools. (PR #448)
+    - Deprecate a file name exception for very old Fedora LDC installation.
+    - gdc can now handle building shared objects (tested for version 6.3.0).
 
 RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400
 
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 07eaaf4d..b08b3f75 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,37 +1,15 @@
-  A new SCons checkpoint release, 3.0.0.alpha.yyyymmdd, is now available
+  A new SCons checkpoint release, 3.0.0.alpha.20170614, 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.5.1:
 
   NEW FUNCTIONALITY
 
-    - List new features (presumably why a checkpoint is being released)
+    - Initial support for Python 3.5+
+    - I
 
   DEPRECATED FUNCTIONALITY