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

8 files changed, 150 insertions, 151 deletions

diff --git a/HOWTO/change.txt b/HOWTO/change.txt
index 8824e87..81b56b4 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 6ae4226..3ba1724 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/
diff --git a/README b/README
index 13888aa..a45ce92 100644
--- a/README
+++ b/README
@@ -60,12 +60,12 @@ In this case, your options are:
     --  (Optional.)  Install from a pre-packaged SCons package that
         does not require distutils:
 
-            Red Hat Linux       scons-0.09-1.noarch.rpm
+            Red Hat Linux       scons-0.10-1.noarch.rpm
 
-            Debian GNU/Linux    scons_0.09-1_all.deb
+            Debian GNU/Linux    scons_0.10-1_all.deb
                                 (or use apt-get)
 
-            Windows             scons-0.09.win32.exe
+            Windows             scons-0.10.win32.exe
 
     --  (Recommended.)  Download the latest distutils package from the
         following URL:
@@ -178,18 +178,18 @@ more typing:
 Depending on the utilities installed on your system, any or all of the
 following packages will be built:
 
-        build/dist/scons-0.09-1.noarch.rpm
-        build/dist/scons-0.09-1.src.rpm
-        build/dist/scons-0.09.linux-i686.tar.gz
-        build/dist/scons-0.09.tar.gz
-        build/dist/scons-0.09.win32.exe
-        build/dist/scons-0.09.zip
-        build/dist/scons-doc-0.09.tar.gz
-        build/dist/scons-local-0.09.tar.gz
-        build/dist/scons-local-0.09.zip
-        build/dist/scons-src-0.09.tar.gz
-        build/dist/scons-src-0.09.zip
-        build/dist/scons_0.09-1_all.deb
+        build/dist/scons-0.10-1.noarch.rpm
+        build/dist/scons-0.10-1.src.rpm
+        build/dist/scons-0.10.linux-i686.tar.gz
+        build/dist/scons-0.10.tar.gz
+        build/dist/scons-0.10.win32.exe
+        build/dist/scons-0.10.zip
+        build/dist/scons-doc-0.10.tar.gz
+        build/dist/scons-local-0.10.tar.gz
+        build/dist/scons-local-0.10.zip
+        build/dist/scons-src-0.10.tar.gz
+        build/dist/scons-src-0.10.zip
+        build/dist/scons_0.10-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.
diff --git a/SConstruct b/SConstruct
index 47aa8e2..9b9ce95 100644
--- a/SConstruct
+++ b/SConstruct
@@ -37,7 +37,7 @@ import sys
 import time
 
 project = 'scons'
-default_version = '0.09'
+default_version = '0.10'
 
 Default('.')
 
@@ -187,9 +187,10 @@ try:
                 if os.path.isfile(path):
                     arg.write(path)
         zf = zipfile.ZipFile(str(target[0]), 'w')
+        olddir = os.getcwd()
         os.chdir(env['CD'])
-        os.path.walk(env['PSV'], visit, zf)
-        os.chdir('..')
+        try: os.path.walk(env['PSV'], visit, zf)
+        finally: os.chdir(olddir)
         zf.close()
 
     def unzipit(env, target, source):
diff --git a/debian/changelog b/debian/changelog
index 44c7d9c..57394bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scons (0.10-1) unstable; urgency=low
+
+  * Fourth post-official-Debian build cycle
+
+ -- Steven Knight <knight@baldmt.com>  Thu,  5 Dec 2002 04:48:25 -0600
+
+
 scons (0.09-1) unstable; urgency=low
 
   * Third post-official-Debian build cycle
diff --git a/rpm/scons.spec b/rpm/scons.spec
index 423e073..01bc67e 100644
--- a/rpm/scons.spec
+++ b/rpm/scons.spec
@@ -1,5 +1,5 @@
 %define name scons
-%define version 0.09
+%define version 0.10
 %define release 1
 
 Summary: an Open Source software construction tool
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 487b1d6..056eee2 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,10 @@
 
 
 
+RELEASE 0.10 - XXX
+
+
+
 RELEASE 0.09 - Thu,  5 Dec 2002 04:48:25 -0600
 
   From Chad Austin:
@@ -146,6 +150,9 @@ RELEASE 0.09 - Thu,  5 Dec 2002 04:48:25 -0600
   - Allow the command handler to be selected via the SPAWN, SHELL
     and ESCAPE construction variables.
 
+  - Allow construction variables to be overridden when a Builder
+    is called.
+
   From sam th:
 
   - Dynamically check for the existence of utilities with which to
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 93d9a87..3647944 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -20,11 +20,15 @@ more effectively, please sign up for the scons-users mailing list at:
 
 
 
-RELEASE 0.09 - Thu,  5 Dec 2002 04:48:25 -0600
+RELEASE 0.10 - XXX
 
-  This is the ninth alpha release of SCons.  Please consult the
+  This is the tenth alpha release of SCons.  Please consult the
   CHANGES.txt file for a list of specific changes since last release.
 
+  Please note the following important changes since release 0.09:
+
+    - XXX
+
   Please note the following important changes since release 0.08:
 
     - The SetCommandHandler() function has been superceded
@@ -55,45 +59,10 @@ RELEASE 0.09 - Thu,  5 Dec 2002 04:48:25 -0600
       These message might interfere with scripts that examine SCons
       output.  These messages may be suppressed with the new -Q option.
 
-  Please note the following important changes since release 0.07:
-
-    - Builder objects no longer automatically split target and source
-      file strings on white space.  SCons will interpret the string
-      arguments for the target or source files as the complete name of
-      the file, even if the name contains white space.
-
-      Consequently, any builder calls that you have defined which supply
-      multiple file names in a single string, such as:
-
-          env.Program(target = 'foo', source = 'f1.c f2.c')
-
-      These calls must be changed.  You may either split up the string
-      into an array of individual file name strings by hand:
-
-          env.Program(target = 'foo', source = ['f1.c', 'f2.c'])
-
-      Or you may use the newly-provided Split() function to turn a
-      string of white-space separated file names into an array:
-
-          env.Program(target = 'foo', source = Split('f1.c f2.c'))
-
-      The Split() function preserves the functionality that the builder
-      objects currently invoke internally: if the argument is a string,
-      it will be split on white space; if the argument is already a list,
-      the list will be returned.
-
-      (You may, of course, also use the string.split() function from
-      the standard Python library to convert your strings.)
-
-    - The Object and Library builders no longer use the "shared" keyword
-      argument to specify if the target object or library is a
-      shared library.  Instead, separate StaticObject, SharedObject,
-      StaticLibrary and SharedLibrary builders exist to build the
-      appropriate target explicitly.  The Object and Library builders
-      are now synonyms for StaticObject and StaticLibrary, respecitvely.
-
-    - The prefix, suffix, and src_suffix keyword arguments to the
-      Builder() function may no longer be callable functions.
+    - User defined build arguments passed into builder calls are no
+      longer given to emitters, generators, and function actions as
+      keyword arguments, but are instead passed as construction 
+      variables.
 
   Owing to an extensive test suite, the SCons team believes that this
   release is of sufficient quality that you can use it for real work,
@@ -108,8 +77,8 @@ RELEASE 0.09 - Thu,  5 Dec 2002 04:48:25 -0600
 
       http://sourceforge.net/tracker/?func=add&group_id=30337&atid=398971
 
-      We have a reliable bug-fixing methodology already in place and aim
-      to respond to problems relatively quickly.
+      We have a reliable bug-fixing methodology already in place and
+      strive to respond to problems relatively quickly.
 
     - It is possible that interfaces will change in future releases.  We
       will strive to hold this to a minimum, but you may need to modify
@@ -126,7 +95,7 @@ RELEASE 0.09 - Thu,  5 Dec 2002 04:48:25 -0600
       In particular, the "SCons Design" documentation on the SCons web
       site is currently out of date, as we made significant changes to
       portions of the interface as we figured out what worked and what
-      didn't during implementation.L
+      didn't during implementation.
 
     - There may be performance issues.  Improving SCons performance
       is an ongoing priority.  If you still find the performance