Initialize the new branch. (Includes an SConstruct fix from Anthony Roach.)

2 files changed, 103 insertions, 88 deletions

diff --git a/HOWTO/change.txt b/HOWTO/change.txt
index 8824e874..81b56b45 100644
--- a/HOWTO/change.txt
+++ b/HOWTO/change.txt
@@ -30,28 +30,28 @@ Handling a change set:
 
     --	Distribute the change to scons-aedist:
 
-		aedist -s -p scons.0.8 {cnum} > scons.0.8.C{cnum}.ae
-		pine -attach scons.0.8.C{cnum}.ae scons-aedist@lists.sourceforge.net
-			Subject: scons.0.8 - {SUMMARY}
-			Body:  aegis -l -p scons.0.8 -c {cnum} cd
+		aedist -s -p scons.0.10 {cnum} > scons.0.10.C{cnum}.ae
+		pine -attach scons.0.10.C{cnum}.ae scons-aedist@lists.sourceforge.net
+			Subject: scons.0.10 - {SUMMARY}
+			Body:  aegis -l -p scons.0.10 -c {cnum} cd
 
-		rm scons.0.8.C{cnum}.ae
+		rm scons.0.10.C{cnum}.ae
 
 	[This will eventually be automated.]
 
     --	Update the aedist baseline on the web site:
 
-		aedist -s -bl -p scons.0.8 > scons.0.8.ae
-		scp scons.0.8.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.8.ae
-		rm scons.0.8.ae
+		aedist -s -bl -p scons.0.10 > scons.0.10.ae
+		scp scons.0.10.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.10.ae
+		rm scons.0.10.ae
 
 	[This will eventually be automated.]
 
     --	Distribute the change to CVS:
 
 		export CVS_RSH=ssh
-    		ae2cvs -n -aegis -p scons.0.8 -c {cnum} -u ~/SCons/scons
-    		ae2cvs -X -aegis -p scons.0.8 -c {cnum} -u ~/SCons/scons
+    		ae2cvs -n -aegis -p scons.0.10 -c {cnum} -u ~/SCons/scons
+    		ae2cvs -X -aegis -p scons.0.10 -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 6ae42267..3ba17243 100644
--- a/HOWTO/release.txt
+++ b/HOWTO/release.txt
@@ -1,5 +1,14 @@
 Things to do to release a new version of SCons:
 
+	Prepare the describe-the-release section for the announcements
+
+		summarize changes from src/CHANGES.txt
+
+		template is below, search for "describe-the-release"
+
+		send this out for review while you get the rest of the
+		release ready!
+
 	Build and test candidate packages
 
 		test on Linux
@@ -24,7 +33,7 @@ Things to do to release a new version of SCons:
 			   cd temporary_directory
 			   tar zxf scons-local-{version}.tar.gz
 			   cd scons-src-{version}
-			   ptyhon runtest.py -a -x C:\temporary_directory\scons.py
+			   python runtest.py -a -x C:\temporary_directory\scons.py
 
 
 	Read through the README and src/README.txt files for any updates
@@ -56,11 +65,11 @@ Things to do to release a new version of SCons:
 
 		ae_p scons.0
 
-		aede {9}
+		aede {10}
 
-		aerpass {9}
+		aerpass {10}
 
-		aeib {9}
+		aeib {10}
 
 		aeb
 
@@ -72,45 +81,6 @@ Things to do to release a new version of SCons:
 
 		aeipass
 
-	START THE NEW BRANCH
-
-		aenbr -p scons.0 {10}
-
-		aenc -p scons.0.{10}
-
-                        Call it something like, "Initialize the new
-                        branch."  Cause = internal_enhancement.  Exempt
-                        it from all tests (*_exempt = true).
-
-		ae_p scons.0.{10}
-
-		aedb 100
-
-		aecd
-
-		# Change the hard-coded package version numbers
-		# in the following files.
-		aecp README SConstruct debian/changelog rpm/scons.spec
-
-		vi README SConstruct debian/changelog rpm/scons.spec
-
-		# Optionally, do the same in the following:
-		[optional] aecp HOWTO/change.txt
-		[optional] aecp HOWTO/release.txt
-
-		[optional] vi HOWTO/change.txt
-		[optional] vi HOWTO/release.txt
-
-		aeb
-
-		aet -reg
-
-		aed
-
-		aede
-
-		etc.
-
 
 
 	Read through the FAQ for any updates
@@ -124,16 +94,16 @@ Things to do to release a new version of SCons:
 		<your email>
 		cd incoming
 		bin
-		put scons-0.09-1.noarch.rpm
-		put scons-0.09-1.src.rpm
-		put scons-0.09.tar.gz
-		put scons-0.09.win32.exe
-		put scons-0.09.zip
-		put scons-local-0.09.tar.gz
-		put scons-local-0.09.zip
-		put scons-src-0.09.tar.gz
-		put scons-src-0.09.zip
-		put scons_0.09-1_all.deb
+		put scons-0.10-1.noarch.rpm
+		put scons-0.10-1.src.rpm
+		put scons-0.10.tar.gz
+		put scons-0.10.win32.exe
+		put scons-0.10.zip
+		put scons-local-0.10.tar.gz
+		put scons-local-0.10.zip
+		put scons-src-0.10.tar.gz
+		put scons-src-0.10.zip
+		put scons_0.10-1_all.deb
 
 	Create the new release at the SourceForge project page:
 
@@ -145,7 +115,7 @@ Things to do to release a new version of SCons:
 
 		=> Add Release
 
-		New release name:  0.09
+		New release name:  0.10
 
 		Cut-and-paste or upload the RELEASE.txt file.
 
@@ -162,12 +132,12 @@ Things to do to release a new version of SCons:
 
 		Edit the file info:
 
-			scons-0.09-1.noarch.rpm		Any	.rpm
-			scons-0.09-1.src.rpm		Any	Source .rpm
-			scons-0.09.tar.gz		Any	.gz
-			scons-0.09.win32.exe		i386	.exe (32-bit Windows)
-			scons-0.09.zip			Any	.zip
-			scons_0.09-1_all.deb		Any	.deb
+			scons-0.10-1.noarch.rpm		Any	.rpm
+			scons-0.10-1.src.rpm		Any	Source .rpm
+			scons-0.10.tar.gz		Any	.gz
+			scons-0.10.win32.exe		i386	.exe (32-bit Windows)
+			scons-0.10.zip			Any	.zip
+			scons_0.10-1_all.deb		Any	.deb
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -180,11 +150,11 @@ Things to do to release a new version of SCons:
 
 		=> Edit/Add File Releases
 
-		Package Name:  scons-src
+		Package Name:  scons-local
 
 		=> Add Release
 
-		New release name:  0.09
+		New release name:  0.10
 
 		Cut-and-paste or upload the RELEASE.txt file.
 
@@ -201,8 +171,8 @@ Things to do to release a new version of SCons:
 
 		Edit the file info:
 
-			scons-src-0.09.tar.gz		Any	.gz
-			scons-src-0.09.zip   		Any	.zip
+			scons-local-0.10.tar.gz		Any	.gz
+			scons-local-0.10.zip   		Any	.zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -215,11 +185,11 @@ Things to do to release a new version of SCons:
 
 		=> Edit/Add File Releases
 
-		Package Name:  scons-local
+		Package Name:  scons-src
 
 		=> Add Release
 
-		New release name:  0.09
+		New release name:  0.10
 
 		Cut-and-paste or upload the RELEASE.txt file.
 
@@ -236,8 +206,8 @@ Things to do to release a new version of SCons:
 
 		Edit the file info:
 
-			scons-local-0.09.tar.gz		Any	.gz
-			scons-local-0.09.zip   		Any	.zip
+			scons-src-0.10.tar.gz		Any	.gz
+			scons-src-0.10.zip   		Any	.zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -246,7 +216,7 @@ Things to do to release a new version of SCons:
 		Release Notice section.
 
 
-	Hide release {0.07} 2 at the SourceForge download page:
+	Hide release {0.08} 2 at the SourceForge download page:
 
 		Go to the Admin page
 
@@ -256,7 +226,7 @@ Things to do to release a new version of SCons:
 
 		=> Edit Releases
 
-		Release Name: {0.07}
+		Release Name: {0.08}
 
 		=> Edit This Release
 
@@ -269,11 +239,11 @@ Things to do to release a new version of SCons:
 
 		=> Edit/Add File Releases
 
-		Package Name:  scons-src
+		Package Name:  scons-local
 
 		=> Edit Releases
 
-		Release Name: {0.07}
+		Release Name: {0.08}
 
 		=> Edit This Release
 
@@ -286,11 +256,11 @@ Things to do to release a new version of SCons:
 
 		=> Edit/Add File Releases
 
-		Package Name:  scons-local
+		Package Name:  scons-src
 
 		=> Edit Releases
 
-		Release Name: {0.07}
+		Release Name: {0.08}
 
 		=> Edit This Release
 
@@ -371,11 +341,56 @@ Things to do to release a new version of SCons:
 
 
 
+	START THE NEW BRANCH
+
+		aenbr -p scons.0 {11}
+
+		aenc -p scons.0.{11}
+
+                        Call it something like, "Initialize the new
+                        branch."  Cause = internal_enhancement.  Exempt
+                        it from all tests (*_exempt = true).
+
+		ae_p scons.0.{11}
+
+		aedb 100
+
+		aecd
+
+		# Change the hard-coded package version numbers
+		# in the following files.
+		aecp README SConstruct debian/changelog rpm/scons.spec
+		vi README SConstruct debian/changelog rpm/scons.spec
+
+		# Optionally, do the same in the following:
+		[optional] aecp HOWTO/change.txt
+		[optional] aecp HOWTO/release.txt
+
+		[optional] vi HOWTO/change.txt
+		[optional] vi HOWTO/release.txt
+
+		# Prep the following files to track the changes
+		# made during the next development cycle
+		aecp src/CHANGES.txt src/RELEASE.txt
+		vi src/CHANGES.txt src/RELEASE.txt
+
+		aeb
+
+		aet -reg
+
+		aed
+
+		aede
+
+		etc.
+
+
+
 
 =======================
 Template describe-the-release section:
 
-IMPORTANT:  Release 0.09 contains the following interface changes:
+IMPORTANT:  Release 0.10 contains the following interface changes:
   - XXX
 
 This release adds the following features:
@@ -397,7 +412,7 @@ Template scons-devel announcement:
 
 SConspirators--
 
-SCons alpha release 0.09 is now available for download.
+SCons alpha release 0.10 is now available for download.
 
 XXX Template describe-the-release section goes here XXX
 
@@ -408,7 +423,7 @@ release.
 =======================
 Template scons-users + scons-announce announcement:
 
-Version 0.09 of SCons has been released and is available for download
+Version 0.10 of SCons has been released and is available for download
 from the SCons web site:
 
 	http://www.scons.org/
@@ -441,7 +456,7 @@ SCons is a software construction tool (build tool, or make tool) written
 in Python.  It is based on the design which won the Software Carpentry
 build tool competition in August 2000.
 
-Version 0.09 of SCons has been released and is available for download
+Version 0.10 of SCons has been released and is available for download
 from the SCons web site:
 
 	http://www.scons.org/