This changeset increments the trunk to the next minor level, 2.1.0, and

updates the dates and other information in the files to have the right
base values.

With this changeset, 2.0.0 is history and a new era has begun.  It's
time to celebrate; anybody want a beer?

7 files changed, 42 insertions, 69 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 9269678..9919920 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -31,7 +31,7 @@ from TestCommon import __all__
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.0.0'
+default_version = '2.1.0.alpha.yyyymmdd'
 
 copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010'
 
diff --git a/README b/README
index 8bf919b..389c6d2 100644
--- a/README
+++ b/README
@@ -493,14 +493,14 @@ following packages will be built:
         build/dist/scons-2.0.0-1.noarch.rpm
         build/dist/scons-2.0.0-1.src.rpm
         build/dist/scons-2.0.0.linux-i686.tar.gz
-        build/dist/scons-2.0.0.tar.gz
-        build/dist/scons-2.0.0.win32.exe
-        build/dist/scons-2.0.0.zip
-        build/dist/scons-doc-2.0.0.tar.gz
-        build/dist/scons-local-2.0.0.tar.gz
-        build/dist/scons-local-2.0.0.zip
-        build/dist/scons-src-2.0.0.tar.gz
-        build/dist/scons-src-2.0.0.zip
+        build/dist/scons-2.1.0.alpha.yyyymmdd.tar.gz
+        build/dist/scons-2.1.0.alpha.yyyymmdd.win32.exe
+        build/dist/scons-2.1.0.alpha.yyyymmdd.zip
+        build/dist/scons-doc-2.1.0.alpha.yyyymmdd.tar.gz
+        build/dist/scons-local-2.1.0.alpha.yyyymmdd.tar.gz
+        build/dist/scons-local-2.1.0.alpha.yyyymmdd.zip
+        build/dist/scons-src-2.1.0.alpha.yyyymmdd.tar.gz
+        build/dist/scons-src-2.1.0.alpha.yyyymmdd.zip
         build/dist/scons_1.3.0-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to
diff --git a/ReleaseConfig b/ReleaseConfig
index a751126..c881b0f 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 # 'alpha', 'beta', 'candidate', or 'final'.  If the release type is not
 # 'final', the patchlevel is set to the release date.  This value is
 # manatory and must be present in this file.
-version_tuple = (2, 0, 0, 'alpha', 0)
+version_tuple = (2, 1, 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
diff --git a/SConstruct b/SConstruct
index 1db7a8f..3f6c44b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,7 +8,7 @@
 copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'June 2010'
+month_year = 'MONTH YEAR'
 
 #
 # __COPYRIGHT__
@@ -43,7 +43,7 @@ import sys
 import tempfile
 
 project = 'scons'
-default_version = '2.0.0'
+default_version = '2.1.0.alpha.yyyymmdd'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
diff --git a/src/Announce.txt b/src/Announce.txt
index b2eea5a..0aa98f0 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -19,7 +19,7 @@ effectively, please go to http://scons.org/lists.php#users to sign up for
 the scons-users mailing list.
 
 
-RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800
+RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
   Please consult the RELEASE.txt file for a summary changes since the last
   release and consult the CHANGES.txt file for complete a list of changes
@@ -40,6 +40,10 @@ RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800
 
     --  FEATURE THAT WILL CHANGE
 
+  Please note the following important changes since release 2.0.0:
+
+    --  NEW FEATURE
+
   Please note the following important changes since release 1.3.0:
 
     --  SUPPORT FOR PYTHON VERSIONS PRIOR TO 2.4 HAS BEEN REMOVED
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 72d7bdf..b30ba5c 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,6 +5,13 @@
                             Change Log
 
 
+RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+
+  From John Doe:
+
+    - Whatever John Doe did.
+
+
 RELEASE 2.0.0.beta.20100605 - Sat, 05 Jun 2010 21:02:48 -0700
 
   From Dirk Baechle:
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index eb80281..a60fbd9 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,20 +1,9 @@
-  A new SCons checkpoint release, 2.0.0.beta.20100605, is now available
+  A new SCons checkpoint release, 2.1.0.alpha.yyyymmdd, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php
 
-  The primary purpose of this release is to remove support for Python
-  versions prior to 2.4 and streamline the SCons code base using more
-  modern python idioms.
-
-  IMPORTANT:  In 1.3.0 and 2.0.0, explicit dependencies (configured via
-  the Depends() call) are ignored for any nodes that do not have builders.
-  This known issue[1] will typically only happen if you explicitly
-  configure a builder call to create multiple output files, some of which
-  are "hidden" from SCons by not being listed in the targets list, and then
-  use Depends() to establish an explicit dependency on a "hidden" file.
-
-  [1] See http://scons.tigris.org/issues/show_bug.cgi?id=2647 for details.
+  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
@@ -38,74 +27,47 @@
   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:
+  Here is a summary of the changes since 1.3.0:
 
   NEW FUNCTIONALITY
 
-  - There should be no new functionality or bug fixes in this checkpoint.
-    Bug fixes will be found in the 1.3.1 series of checkpoints.
+    - List new features (presumably why a checkpoint is being released)
 
   DEPRECATED FUNCTIONALITY
 
-  - All features or usages deprecated in 1.3 should have been removed.
-    Uses of formerly-deprecated features should get an error.
-
-  - The BuildDir() method and the build_dir option now get warnings.
-
-  - The SourceCode() function and its associated factory functions have
-    started their deprecation cycle and can have a warning enabled.
+    - List anything that's been deprecated since the last release
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-  - Any Command() or env.Command() calls that use the following Action
-    factory functions will have their targets rebuilt when upgrading
-    from any pre-2.0 release:
-
-        Chmod()
-        Copy()
-        Delete()
-        Mkdir()
-        Move()
-        Touch()
-
-    (The rebuild occurs because the underlying Python class that
-    implements these functions has been changed to a new-style Python
-    class, and that changes the Python byte code and therefore the
-    build signature of the functions.)
+    - List modifications to existing features, where the previous behavior
+      wouldn't actually be considered a bug
 
   FIXES
 
-  - MSVC/MSVS/SDK support has been improved. A number of issues with
-    determining the correct version and architecture have been resolved.
+    - List fixes of outright bugs
 
   IMPROVEMENTS
 
-  - Support for Python versions prior to 2.4 has been removed.  As of
-    this writing, we believe that SCons will still work with Python 2.3,
-    but this is not guaranteed.
-  - Code paths that included special cases for older Python versions have
-    been streamlined.
-  - The code base has been converted to use more modern idioms.  Although
-    we don't have any direct measurements (yet), we believe that SCons
-    startup time should be decreased and the overall code should run faster.
+    - 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
 
-  - No changes.
+    - List changes in the way SCons is packaged and/or released
 
   DOCUMENTATION
 
-  - The entries for SourceCode() and its associated factory functions now
-    state that the functions are deprecated.
+    - 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
 
-  - Code no longer has to be compatible with Python versions back to 1.5.2.
-    Although code is tested with Python 2.3 and is still believed to work,
-    the official new floor is Python 2.4.
+    - List visible changes in the way SCons is developed
 
-  Thanks to Greg Noel, Steven Knight, Dirk Baechle, William Deegan,and 
-  W. Trevor King for their contributions to this release.
+  Thanks to CURLY, LARRY, and MOE for their contributions to this release.
+  Contributors are listed alphabetically by their last name.
 
 __COPYRIGHT__
 __FILE__ __REVISION__ __DATE__ __DEVELOPER__