Prepare for next development cycle.

4 files changed, 73 insertions, 87 deletions

diff --git a/HOWTO/change.txt b/HOWTO/change.txt
index 86e854d9..f2950030 100644
--- a/HOWTO/change.txt
+++ b/HOWTO/change.txt
@@ -32,28 +32,28 @@ Handling a change set:
 
     --	Distribute the change to scons-aedist:
 
-		aedist -s -p scons.0.95 {cnum} > scons.0.95.C{cnum}.ae
-		pine -attach scons.0.95.C{cnum}.ae scons-aedist@lists.sourceforge.net
-			Subject: scons.0.95 - {SUMMARY}
-			Body:  aegis -l -p scons.0.95 -c {cnum} cd
+		aedist -s -p scons.0.96 {cnum} > scons.0.96.C{cnum}.ae
+		pine -attach scons.0.96.C{cnum}.ae scons-aedist@lists.sourceforge.net
+			Subject: scons.0.96 - {SUMMARY}
+			Body:  aegis -l -p scons.0.96 -c {cnum} cd
 
-		rm scons.0.95.C{cnum}.ae
+		rm scons.0.96.C{cnum}.ae
 
 	[This will eventually be automated.]
 
     --	Update the aedist baseline on the web site:
 
-		aedist -s -bl -p scons.0.95 > scons.0.95.ae
-		scp scons.0.95.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.95.ae
-		rm scons.0.95.ae
+		aedist -s -bl -p scons.0.96 > scons.0.96.ae
+		scp scons.0.96.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.96.ae
+		rm scons.0.96.ae
 
 	[This will eventually be automated.]
 
     --	Distribute the change to CVS:
 
 		export CVS_RSH=ssh
-    		ae2cvs -n -aegis -p scons.0.95 -c {cnum} -u ~/SCons/scons
-    		ae2cvs -X -aegis -p scons.0.95 -c {cnum} -u ~/SCons/scons
+    		ae2cvs -n -aegis -p scons.0.96 -c {cnum} -u ~/SCons/scons
+    		ae2cvs -X -aegis -p scons.0.96 -c {cnum} -u ~/SCons/scons
 
         If you need the "ae2cvs" Perl script, you can find a copy
         checked in to the bin/subdirectory.
diff --git a/HOWTO/release.txt b/HOWTO/release.txt
index dac4c0c8..397033a1 100644
--- a/HOWTO/release.txt
+++ b/HOWTO/release.txt
@@ -49,11 +49,11 @@ Things to do to release a new X.Y version of SCons:
 
 		ae_p scons.0
 
-		aede {95}
+		aede {96}
 
-		aerpass {95}
+		aerpass {96}
 
-		aeib {95}
+		aeib {96}
 
 		aed
 
@@ -67,16 +67,16 @@ Things to do to release a new X.Y version of SCons:
 
 	START THE NEW BRANCH FOR RELEASE
 
-		aenbr -p scons.0 {96}
+		aenbr -p scons.0 {97}
 
-		aenc -p scons.0.{96}
+		aenc -p scons.0.{97}
 
                         Call it something like,
                         "Initialize the new branch for release."
                         Cause = internal_enhancement.
                         Exempt it from all tests (*_exempt = true).
 
-		ae_p scons.0.{96}
+		ae_p scons.0.{97}
 
 		aedb 100
 
@@ -154,28 +154,26 @@ Things to do to release a new X.Y version of SCons:
 		<your email>
 		cd incoming
 		bin
-		put scons-0.{96}-1.noarch.rpm
-		put scons-0.{96}-1.src.rpm
-		put scons-0.{96}.tar.gz
-		put scons-0.{96}.win32.exe
-		put scons-0.{96}.zip
-		put scons-local-0.{96}.tar.gz
-		put scons-local-0.{96}.zip
-		put scons-src-0.{96}.tar.gz
-		put scons-src-0.{96}.zip
-		put scons_0.{96}-1_all.deb
+		put scons-0.{97}-1.noarch.rpm
+		put scons-0.{97}-1.src.rpm
+		put scons-0.{97}.tar.gz
+		put scons-0.{97}.win32.exe
+		put scons-0.{97}.zip
+		put scons-local-0.{97}.tar.gz
+		put scons-local-0.{97}.zip
+		put scons-src-0.{97}.tar.gz
+		put scons-src-0.{97}.zip
+		put scons_0.{97}-1_all.deb
 
 	Create the new release at the SourceForge project page:
 
-		Go to the Admin page
-
-		=> Edit/Add File Releases
+		Go to the File Release page
 
 		Package Name:  scons
 
 		=> Add Release
 
-		New release name:  0.{96}
+		New release name:  0.{97}
 
 		Cut-and-paste or upload the RELEASE.txt file.
 
@@ -192,12 +190,12 @@ Things to do to release a new X.Y version of SCons:
 
 		Edit the file info:
 
-			scons-0.{96}-1.noarch.rpm	Any	.rpm
-			scons-0.{96}-1.src.rpm		Any	Source .rpm
-			scons-0.{96}.tar.gz		Any	.gz
-			scons-0.{96}.win32.exe		i386	.exe (32-bit Windows)
-			scons-0.{96}.zip		Any	.zip
-			scons_0.{96}-1_all.deb		Any	.deb
+			scons-0.{97}-1.noarch.rpm	Any	.rpm
+			scons-0.{97}-1.src.rpm		Any	Source .rpm
+			scons-0.{97}.tar.gz		Any	.gz
+			scons-0.{97}.win32.exe		i386	.exe (32-bit Windows)
+			scons-0.{97}.zip		Any	.zip
+			scons_0.{97}-1_all.deb		Any	.deb
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -206,15 +204,13 @@ Things to do to release a new X.Y version of SCons:
 		Release Notice section.
 
 
-		Go to the Admin page
-
-		=> Edit/Add File Releases
+		Go to the File Release page
 
 		Package Name:  scons-local
 
 		=> Add Release
 
-		New release name:  0.{96}
+		New release name:  0.{97}
 
 		Cut-and-paste or upload the RELEASE.txt file.
 
@@ -231,8 +227,8 @@ Things to do to release a new X.Y version of SCons:
 
 		Edit the file info:
 
-			scons-local-0.{96}.tar.gz	Any	.gz
-			scons-local-0.{96}.zip   	Any	.zip
+			scons-local-0.{97}.tar.gz	Any	.gz
+			scons-local-0.{97}.zip   	Any	.zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -241,15 +237,13 @@ Things to do to release a new X.Y version of SCons:
 		Release Notice section.
 
 
-		Go to the Admin page
-
-		=> Edit/Add File Releases
+		Go to the File Release page
 
 		Package Name:  scons-src
 
 		=> Add Release
 
-		New release name:  0.{96}
+		New release name:  0.{97}
 
 		Cut-and-paste or upload the RELEASE.txt file.
 
@@ -266,8 +260,8 @@ Things to do to release a new X.Y version of SCons:
 
 		Edit the file info:
 
-			scons-src-0.{96}.tar.gz		Any	.gz
-			scons-src-0.{96}.zip   		Any	.zip
+			scons-src-0.{97}.tar.gz		Any	.gz
+			scons-src-0.{97}.zip   		Any	.zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -276,7 +270,7 @@ Things to do to release a new X.Y version of SCons:
 		Release Notice section.
 
 
-	Hide release 0.{94} at the SourceForge download page:
+	Hide release 0.{95} at the SourceForge download page:
 
 		Go to the Admin page
 
@@ -286,7 +280,7 @@ Things to do to release a new X.Y version of SCons:
 
 		=> Edit Releases
 
-		Release Name: 0.{94}
+		Release Name: 0.{95}
 
 		=> Edit This Release
 
@@ -303,7 +297,7 @@ Things to do to release a new X.Y version of SCons:
 
 		=> Edit Releases
 
-		Release Name: 0.{94}
+		Release Name: 0.{95}
 
 		=> Edit This Release
 
@@ -320,7 +314,7 @@ Things to do to release a new X.Y version of SCons:
 
 		=> Edit Releases
 
-		Release Name: 0.{94}
+		Release Name: 0.{95}
 
 		=> Edit This Release
 
@@ -330,7 +324,7 @@ Things to do to release a new X.Y version of SCons:
 
 
 
-	In the Bugs Tracker, add a Group for the new release 0.{94}
+	In the Bugs Tracker, add a Group for the new release 0.{97}
 
 
 
@@ -345,7 +339,11 @@ Things to do to release a new X.Y version of SCons:
 
 		template:  new version number
 
-		src/index.in:  announcement on the home page
+                src/doc.py:  new version number
+
+                src/download.py:  new version number
+
+		src/index.py:  announcement on the home page
 
 		src/scons-doc.tar.gz:  update
 
@@ -439,23 +437,33 @@ Things to do to release a new X.Y version of SCons:
 Template describe-the-release section:
 
 IMPORTANT:  Release 0.95 contains the following interface changes:
+
   - XXX
 
   See the release notes for more information about these changes.
 
 This release adds the following features:
+
+  - XXX
+
+This release enhances the following existing features:
+
   - XXX
 
 The following fixes have been added:
+
   - XXX
 
 Performance has been improved as follows:
+
   - XXX
 
 The following changes have been made to the SCons packaging:
+
   - XXX
 
 The documentation has been improved:
+
   - XXX
 =======================
 Template scons-devel announcement:
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index f3d5d012..3bf91ce9 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -1,4 +1,4 @@
-r __COPYRIGHT__
+# __COPYRIGHT__
 # __FILE__ __REVISION__ __DATE__ __DEVELOPER__
 
 
@@ -8,6 +8,14 @@ r __COPYRIGHT__
 
 
 
+RELEASE 0.97 - XXX
+
+  From Steven Knight
+
+  - XXX
+
+
+
 RELEASE 0.96 - Wed, 18 Aug 2004 13:36:40 +0000
 
   From Chad Austin:
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 6760d94d..e689f67d 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -20,9 +20,9 @@ more effectively, please sign up for the scons-users mailing list at:
 
 
 
-RELEASE 0.96 - Wed, 18 Aug 2004 13:36:40 +0000
+RELEASE 0.97 - XXX
 
-  This is a pre-release for testing the seventh beta release of SCons.
+  This is a pre-release for testing the eighth beta release of SCons.
   Please consult the CHANGES.txt file for a list of specific changes
   since last release.
 
@@ -125,36 +125,6 @@ RELEASE 0.96 - Wed, 18 Aug 2004 13:36:40 +0000
       changed.  This change *only* affects any cases where you explicitly
       use UserList objects to initialize or append to a variable.
 
-  Please note the following important changes since release 0.94:
-
-    - The internal Python function used by the Zip Builder in Python
-      releases 1.6 or later now compresses the resulting .zip file
-      by default.  The old behavior of creating an uncompressed file
-      may be preserved by setting the new ZIPCOMPRESSION construction
-      variable to 0 (or zipfile.ZIP_STORED, if you import the
-      underlying zipfile module).
-
-    - The "overrides" keyword argument to calls to the Builder() function
-      used to create new Builder objects has been deprecated and will
-      be removed in a future release.  The items in an "overrides"
-      dictionary should now be specified as keyword arguments:
-
-          # Old way, "overrides" is a dictionary:
-          Builder(action = 'cp $TDIR/$TARGET $SDIR/$SOURCE',
-                  overrides = {'TDIR' : dir1, 'SDIR' : dir2})
-
-          # New way, items are specified as keyword arguments:
-          Builder(action = 'cp $TDIR/$TARGET $SDIR/$SOURCE',
-                  TDIR = dir1, SDIR = dir2)
-
-    - The meaning of some of the values of the "mode" argument to
-      the SCons.Util.scons_subst() and SCons.Util.scons_subst_list()
-      functions have been swapped.  The wrapper Environment.subst() and
-      Environment.subst_list() methods remain completely unchanged, so
-      this should have no external effect.  (We've listed the change here
-      because it might cause a problem if you're reaching into the SCons
-      internals and calling either of these SCons.Util functions directly.)
-
   Please note the following FUTURE changes that you may wish to prepare
   for: