Merged revisions 1675-1736 via svnmerge from

http://scons.tigris.org/svn/scons/branches/core

........
  r1689 | stevenknight | 2006-11-06 20:56:29 -0600 (Mon, 06 Nov 2006) | 1 line

  0.96.D483 - Merge changes for 0.96.93 packaging from the subsidiary branch.
........
  r1690 | stevenknight | 2006-11-06 20:59:30 -0600 (Mon, 06 Nov 2006) | 1 line

  0.96.D484 - Update HOWTO for releases. Fix name type in src/CHANGES.txt.
........
  r1691 | stevenknight | 2006-11-08 13:55:36 -0600 (Wed, 08 Nov 2006) | 1 line

  0.96.D485 - Fix MergeFlags() handling of None values. (John Pye)
........
  r1692 | stevenknight | 2006-11-08 17:15:05 -0600 (Wed, 08 Nov 2006) | 1 line

  0.96.D486 - Directly execute commands on Windows when possible. (Jay Kint)
........
  r1693 | stevenknight | 2006-11-08 18:54:49 -0600 (Wed, 08 Nov 2006) | 1 line

  0.96.D487 - Remove the semi-colon from the list of characters that determine when we use cmd
........
  r1694 | stevenknight | 2006-11-09 01:34:06 -0600 (Thu, 09 Nov 2006) | 1 line

  0.96.D488 - Pick up latex/bibtex 'Rerun to get citations correct' messages. (Dmitry Mikhin)
........
  r1695 | stevenknight | 2006-11-11 08:36:33 -0600 (Sat, 11 Nov 2006) | 1 line

  0.96.D489 - Back out the direct-execution-on-Windows change until we solve a corner case.
........
  r1696 | stevenknight | 2006-11-15 10:33:10 -0600 (Wed, 15 Nov 2006) | 1 line

  0.96.D490 - Fix the sconsign script when the .sconsign.dblite file is specified with its suf
........
  r1697 | stevenknight | 2006-11-18 10:45:50 -0600 (Sat, 18 Nov 2006) | 4 lines

  Complete move of test/sconsign/script.py to underneath test/sconsign/script/.
  (This got left out of the previous checkin due to an error in the
  script that resubmits Aegis changes to Subversion.)
........
  r1698 | stevenknight | 2006-11-18 11:05:26 -0600 (Sat, 18 Nov 2006) | 1 line

  0.96.D491 - Allow an Options converter to take the construction environment as a parameter.
........
  r1699 | stevenknight | 2006-11-30 15:34:37 -0600 (Thu, 30 Nov 2006) | 1 line

  0.96.D492 - Reverse the order in which we try the arguments Options converters, first a sing
........
  r1700 | stevenknight | 2006-11-30 16:03:09 -0600 (Thu, 30 Nov 2006) | 1 line

  0.96.D493 - Speed up rel_path() by avoiding recomputation of intermediate directory relative
........
  r1701 | stevenknight | 2006-11-30 16:14:16 -0600 (Thu, 30 Nov 2006) | 1 line

  0.96.D494 - More efficient get_suffix(): compute it once when we set the name.
........
  r1702 | stevenknight | 2006-11-30 16:22:55 -0600 (Thu, 30 Nov 2006) | 1 line

  0.96.D495 - Fix missing XML end tags.
........
  r1703 | stevenknight | 2006-11-30 17:15:25 -0600 (Thu, 30 Nov 2006) | 1 line

  0.96.D496 - Turn Memoizer into a simple counter for --debug=memoizer, not something that doe
........
  r1704 | stevenknight | 2006-11-30 20:30:50 -0600 (Thu, 30 Nov 2006) | 1 line

  0.96.D497 - Add the scons-time script, with doc and tests.
........
  r1705 | stevenknight | 2006-11-30 23:28:20 -0600 (Thu, 30 Nov 2006) | 1 line

  0.96.D498 - Update the copyright years string.
........
  r1706 | stevenknight | 2006-12-01 11:54:22 -0600 (Fri, 01 Dec 2006) | 1 line

  0.96.D499 - Fix _do_Lookup => _doLookup value-caching misspellings. (Ben Leslie)
........
  r1707 | stevenknight | 2006-12-01 12:03:46 -0600 (Fri, 01 Dec 2006) | 1 line

  0.96.D500 - Fix copyright test against debian build. (Walter Franzini)
........
  r1708 | stevenknight | 2006-12-01 14:23:29 -0600 (Fri, 01 Dec 2006) | 1 line

  0.96.D501 - Add #include lines for test portability. (Gary Oberbrunner)
........
  r1709 | stevenknight | 2006-12-01 14:51:12 -0600 (Fri, 01 Dec 2006) | 1 line

  0.96.D502 - Fix tests under Python versions with no profiler (pstats module).
........
  r1710 | stevenknight | 2006-12-01 20:04:49 -0600 (Fri, 01 Dec 2006) | 1 line

  0.96.D503 - Remove unnecessary os.path.normpath() calls. (Gary Oberbrunner)
........
  r1711 | stevenknight | 2006-12-01 20:34:31 -0600 (Fri, 01 Dec 2006) | 1 line

  0.96.D504 - Accomodate arbitray white space after a SWIG %module keyword. (Anonymous)
........
  r1712 | stevenknight | 2006-12-05 14:49:54 -0600 (Tue, 05 Dec 2006) | 1 line

  0.96.D506 - Cache substitutions of of Builder source suffixes. Use a new PathList module, and a refactor Node.FS.Rfindalldirs() method, to cache calculations of values like CPPPATH.
........
  r1713 | stevenknight | 2006-12-05 18:43:36 -0600 (Tue, 05 Dec 2006) | 1 line

  0.96.D507 - Use cached stat() values in diskchecks.
........
  r1714 | stevenknight | 2006-12-05 21:11:24 -0600 (Tue, 05 Dec 2006) | 1 line

  0.96.D508 - Fix Memoizer hit counts for methods memoizing simple values. Clean up the code for memoizing return values in a dictionary. Fix comments.
........
  r1715 | stevenknight | 2006-12-06 07:23:18 -0600 (Wed, 06 Dec 2006) | 1 line

  0.96.D369 - More efficient Node.FS.Dir.current() check. Fix some Windows test portability issues.
........
  r1716 | stevenknight | 2006-12-06 12:24:32 -0600 (Wed, 06 Dec 2006) | 2 lines

  Undo previous checkin (distributed incorrect Aegis change number).
........
  r1717 | stevenknight | 2006-12-06 12:34:53 -0600 (Wed, 06 Dec 2006) | 1 line

  0.96.D505 - Update ae-{cvs,svn}-ci for newer versions of aetar, and to not truncate descriptions.
........
  r1718 | stevenknight | 2006-12-07 23:01:41 -0600 (Thu, 07 Dec 2006) | 1 line

  0.96.D509 - Only look for mslink on Windows systems. (Sohail Somani)
........
  r1719 | stevenknight | 2006-12-07 23:18:33 -0600 (Thu, 07 Dec 2006) | 1 line

  0.96.D510 - Have the D compiler Tool use the same  logic for shared libraries, too. (Paolo Invernizzi)
........
  r1720 | stevenknight | 2006-12-07 23:29:47 -0600 (Thu, 07 Dec 2006) | 1 line

  0.96.D511 - Generalize a JobTests.py test so it doesn't assume a specific order in which the operating system executes the threads.
........
  r1721 | stevenknight | 2006-12-07 23:39:37 -0600 (Thu, 07 Dec 2006) | 1 line

  0.96.D512 - Back out the Tool/dmd.py  change; it breaks shared library linking for other lanuages beside D in the construction environment.
........
  r1722 | stevenknight | 2006-12-07 23:47:11 -0600 (Thu, 07 Dec 2006) | 1 line

  0.96.D513 - Test fixes: Windows portability, handle changes to Python 2.5 messages.
........
  r1723 | stevenknight | 2006-12-08 00:00:13 -0600 (Fri, 08 Dec 2006) | 1 line

  0.96.D514 - Change how the 'as' Tool is imported to accomodate the Python 2.6 'as' keyword.
........
  r1724 | stevenknight | 2006-12-08 11:19:27 -0600 (Fri, 08 Dec 2006) | 1 line

  0.96.D515 - Cache both Node.FS.find_file() and Node.FS.Dri.srcdir_find_file().
........
  r1725 | stevenknight | 2006-12-08 17:27:35 -0600 (Fri, 08 Dec 2006) | 1 line

  0.96.D516 - Better error when we try to fetch contents from an Entry that doesn't exist. (Tom Parker)
........
  r1726 | stevenknight | 2006-12-08 23:28:55 -0600 (Fri, 08 Dec 2006) | 1 line

  0.96.D517 - Make sure we pick up the scons-local directory regardless of where we chdir internally.
........
  r1727 | stevenknight | 2006-12-11 16:25:53 -0600 (Mon, 11 Dec 2006) | 1 line

  0.96.D518 - Cache results of Executor.get_unignored_sources() and Executor.process_sources(). Eliminate some map() and disambiguate() calls when scanning for implicit dependencies.
........
  r1728 | stevenknight | 2006-12-12 14:32:22 -0600 (Tue, 12 Dec 2006) | 1 line

  0.96.D519 - Fix SideEffect() when -j is used.
........
  r1729 | stevenknight | 2006-12-12 16:58:15 -0600 (Tue, 12 Dec 2006) | 1 line

  0.96.D520 - Add a srcdir keyword to Builder calls.
........
  r1730 | stevenknight | 2006-12-12 21:40:59 -0600 (Tue, 12 Dec 2006) | 1 line

  0.96.D521 - TeX/LaTeX updates, including handling files in subdirectories. (Joel B. Mohler, Rob Managan, Dmitry Mikhin)
........
  r1731 | stevenknight | 2006-12-14 15:01:02 -0600 (Thu, 14 Dec 2006) | 1 line

  0.96.D522 - Propogate TypeErrors during variable substitution for display to the user.
........
  r1732 | stevenknight | 2006-12-14 20:01:49 -0600 (Thu, 14 Dec 2006) | 1 line

  0.96.D523 - Fix the os.path.join() calls in EnvironmentTests.py.
........
  r1733 | stevenknight | 2006-12-15 07:48:22 -0600 (Fri, 15 Dec 2006) | 1 line

  0.96.D524 - Fix source directories as dependencies of an Alias (0.96.93 problem found by LilyPond).
........
  r1735 | stevenknight | 2006-12-15 12:43:45 -0600 (Fri, 15 Dec 2006) | 1 line

  0.96.D525 - Allow printing Debug.caller() output (or other end-of-run debugging info) when using -h.
........
  r1736 | stevenknight | 2006-12-15 16:30:08 -0600 (Fri, 15 Dec 2006) | 1 line

  0.96.D526 - Add an option to debug IndexError and NameError exceptions during variable substitution.
........

2 files changed, 365 insertions, 315 deletions

diff --git a/HOWTO/release.txt b/HOWTO/release.txt
index 88f93521..57f38b77 100644
--- a/HOWTO/release.txt
+++ b/HOWTO/release.txt
@@ -8,427 +8,477 @@ then see the document HOWTO/subrelease.txt.
 
 Things to do to release a new X.Y version of SCons:
 
-	Prepare the describe-the-release section for the announcements
+    Prepare the describe-the-release section for the announcements
 
-		summarize changes from src/CHANGES.txt
+        summarize changes from src/CHANGES.txt
 
-		template is below, search for "describe-the-release"
+        template is below, search for "describe-the-release"
 
-		send this out for review while you get the rest of the
-		release ready!
+        send this out for review while you get the rest of the
+        release ready!
 
-	Build and test candidate packages
+    Build and test candidate packages
 
-		test on Linux
+        test on Linux
 
-		test on Windows NT
+        test on Windows NT
 
-			1) tar zxf scons-src-{version}.tar.gz
-			   cd scons-src-{version}
-			   python runtest.py -a
+            1) tar zxf scons-src-{version}.tar.gz
+               cd scons-src-{version}
+               python runtest.py -a
 
-			2) tar zxf scons-{version}.tar.gz
-			   cd scons-{version}
-			   python setup.py install
-			   cd scons-src-{version}
-			   python runtest.py -a -X -x C:\Python20\scons.bat
+            2) tar zxf scons-{version}.tar.gz
+               cd scons-{version}
+               python setup.py install
+               cd scons-src-{version}
+               python runtest.py -a -X -x C:\Python20\scons.bat
 
-			3) scons-{verson}.win32.exe
-			   cd scons-src-{version}
-			   python runtest.py -a -X -x C:\Python20\scons.bat
+            3) scons-{verson}.win32.exe
+               cd scons-src-{version}
+               python runtest.py -a -X -x C:\Python20\scons.bat
 
-			4) mkdir temporary_directory
-			   cd temporary_directory
-			   tar zxf scons-local-{version}.tar.gz
-			   cd scons-src-{version}
-			   python runtest.py -a -x C:\temporary_directory\scons.py
+            4) mkdir temporary_directory
+               cd temporary_directory
+               tar zxf scons-local-{version}.tar.gz
+               cd scons-src-{version}
+               python runtest.py -a -x C:\temporary_directory\scons.py
 
-                Checkin any changes necessary to make everything work
+        Check in any changes necessary to make everything work
 
-	END THE CURRENT DEVELOPMENT BRANCH
+    END THE CURRENT DEVELOPMENT BRANCH
 
-		ae_p scons.0
+        ae_p scons.0
 
-		aede {96}
+        aede {96}
 
-		aerpass {96}
+        aerpass {96}
 
-		aeib {96}
+        aeib {96}
 
-		aed
+        aed
 
-		aeb
+        aeb
 
-		aet
+        aet
 
-		aet -reg
+        aet -reg
 
-		aeipass
+        aeipass
 
-	START THE NEW BRANCH FOR RELEASE
+    START THE NEW BRANCH FOR RELEASE
 
-		aenbr -p scons.0 {97}
+        aenbr -p scons.0 {97}
 
-		aenc -p scons.0.{97}
+        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).
+            Call it something like,
+            "Initialize the new branch for release."
+            Cause = internal_enhancement.
+            Exempt it from all tests (*_exempt = true).
 
-		ae_p scons.0.{97}
+        ae_p scons.0.{97}
 
-		aedb 100
+        aedb 100
 
-		aecd
+        aecd
 
-		# Change the hard-coded package version numbers
-		# in the following files.
-		aecp README
-		vi README
+        # Change the hard-coded package version numbers
+        # in the following files.
+        aecp README
+        vi README
 
-                aecp SConstruct
-                vi SConstruct
+        aecp SConstruct
+        vi SConstruct
 
-                aecp rpm/scons.spec.in
-                vi rpm/scons.spec.in
+        aecp rpm/scons.spec.in
+        vi rpm/scons.spec.in
 
-                aecp QMTest/TestSCons.py
-                vi QMTest/TestSCons.py
+        aecp QMTest/TestSCons.py
+        vi QMTest/TestSCons.py
 
-                # Read through and update the README files if necessary
-		[optional] aecp README
-		[optional] vi README
+        # Read through and update the README files if necessary
+        [optional] aecp README
+        [optional] vi README
 
-		[optional] aecp src/README.txt
-		[optional] vi src/README.txt
+        [optional] aecp src/README.txt
+        [optional] vi src/README.txt
 
-                # Prepare src/CHANGES.txt
-		aecp src/CHANGES.txt
-		vi src/CHANGES.txt
+        # Prepare src/CHANGES.txt
+        aecp src/CHANGES.txt
+        vi src/CHANGES.txt
 
-		        date -R the latest release
+            date -R the latest release
 
-		        should be current if this has been updated
-                        as each change went in.
+            should be current if this has been updated
+            as each change went in.
 
-	        # Prepare src/RELEASE.txt
-                aecp src/RELEASE.txt
-                vi src/RELEASE.txt
+        # Prepare src/RELEASE.txt
+        aecp src/RELEASE.txt
+        vi src/RELEASE.txt
 
-		        date -R the latest release
+            date -R the latest release
 
-		        Read through and edit appropriately.
+            Read through and edit appropriately.
 
-		        Can probably keep most of the existing text
+            Can probably keep most of the existing text
 
-		        Add any new known problems
+            Add any new known problems
 
-	        # Prepare debian/changelog
-                aecp debian/changelog
-                vi debian/changelog
+        # Prepare debian/changelog
+        aecp debian/changelog
+        vi debian/changelog
 
-		        date -R the latest release
+            date -R the latest release
 
-                # Now build and prepare the release itself.
-                aeb
+        # Now build and prepare the release itself.
+        aeb
 
-		aed
+        aed
 
-		aet -reg
+        aet -reg
 
-		aede
+        aede
 
-		etc.
+        etc.
 
 
 
-	Read through the FAQ for any updates
+    Read through the FAQ for any updates
 
 
 
-	Upload the packages to the SourceForge incoming FTP:
+    Upload the packages to the SourceForge incoming FTP:
 
-		ftp upload.sourceforge.net
-		anonymous
-		<your email>
-		cd incoming
-		bin
-		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
+        ftp upload.sourceforge.net
+        anonymous
+        <your email>
+        cd incoming
+        bin
+        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:
+    Create the new release at the SourceForge project page:
 
-		Go to the File Release page
+        Pull down the "Admin" menu and select "File Releases"
 
-		Package Name:  scons
+        Package Name:  scons
 
-		=> Add Release
+        => Add Release
 
-		New release name:  0.{97}
+        New release name:  0.{97}
 
-		Cut-and-paste or upload the RELEASE.txt file.
+        Upload the RELEASE.txt file.
 
-		Cut-and-paste or upload the CHANGES.txt file.
+        Upload the CHANGES.txt file.
 
-		(If you cut-and-paste, check the "Preserve my
-		pre-formatted text." box!)
+        Check the "Preserve my pre-formatted text." box  (IMPORTANT!)
 
-		Click "Submit/Refresh"  (IMPORTANT!)
+        Click "Submit/Refresh"  (IMPORTANT!)
 
-		Check the SCons files you uploaded
+        Check the SCons files you uploaded
 
-		Click "Add Files and/or Refresh View"
+        Click "Add Files and/or Refresh View"
 
-		Edit the file info:
+        Edit the file info:
 
-			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
+            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.
+        Click "Update/Refresh" for each file; this must be done
+        one at a time.
 
-		Check "I'm sure." and click "Send Notice" in the Email
-		Release Notice section.
+        Check "I'm sure." and click "Send Notice" in the Email
+        Release Notice section.
 
 
-		Go to the File Release page
+        Pull down the "Admin" menu and select "File Releases"
 
-		Package Name:  scons-local
+        Package Name:  scons-local
 
-		=> Add Release
+        => Add Release
 
-		New release name:  0.{97}
+        New release name:  0.{97}
 
-		Cut-and-paste or upload the RELEASE.txt file.
+        Upload the RELEASE.txt file.
 
-		Cut-and-paste or upload the CHANGES.txt file.
+        Upload the CHANGES.txt file.
 
-		(If you cut-and-paste, check the "Preserve my
-		pre-formatted text." box!)
+        Check the "Preserve my pre-formatted text." box  (IMPORTANT!)
 
-		Click "Submit/Refresh"  (IMPORTANT!)
+        Click "Submit/Refresh"  (IMPORTANT!)
 
-		Check the SCons files you uploaded
+        Check the SCons files you uploaded
 
-		Click "Add Files and/or Refresh View"
+        Click "Add Files and/or Refresh View"
 
-		Edit the file info:
+        Edit the file info:
 
-			scons-local-0.{97}.tar.gz	Any	.gz
-			scons-local-0.{97}.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.
+        Click "Update/Refresh" for each file; this must be done
+        one at a time.
 
-		Check "I'm sure." and click "Send Notice" in the Email
-		Release Notice section.
+        Check "I'm sure." and click "Send Notice" in the Email
+        Release Notice section.
 
 
-		Go to the File Release page
+        Pull down the "Admin" menu and select "File Releases"
 
-		Package Name:  scons-src
+        Package Name:  scons-src
 
-		=> Add Release
+        => Add Release
 
-		New release name:  0.{97}
+        New release name:  0.{97}
 
-		Cut-and-paste or upload the RELEASE.txt file.
+        Upload the RELEASE.txt file.
 
-		Cut-and-paste or upload the CHANGES.txt file.
+        Upload the CHANGES.txt file.
 
-		(If you cut-and-paste, check the "Preserve my
-		pre-formatted text." box!)
+        Check the "Preserve my pre-formatted text." box  (IMPORTANT!)
 
-		Click "Submit/Refresh"  (IMPORTANT!)
+        Click "Submit/Refresh"  (IMPORTANT!)
 
-		Check the SCons files you uploaded
+        Check the SCons files you uploaded
 
-		Click "Add Files and/or Refresh View"
+        Click "Add Files and/or Refresh View"
 
-		Edit the file info:
+        Edit the file info:
 
-			scons-src-0.{97}.tar.gz		Any	.gz
-			scons-src-0.{97}.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.
+        Click "Update/Refresh" for each file; this must be done
+        one at a time.
 
-		Check "I'm sure." and click "Send Notice" in the Email
-		Release Notice section.
+        Check "I'm sure." and click "Send Notice" in the Email
+        Release Notice section.
 
 
-	Hide release 0.{95} at the SourceForge download page:
+    Hide release 0.{95} at the SourceForge download page:
 
-		Go to the Admin page
+        Pull down the "Admin" menu and select "File Releases"
 
-		=> Edit/Add File Releases
+        Package Name:  scons
 
-		Package Name:  scons
+        => Edit Releases
 
-		=> Edit Releases
+        Release Name: 0.{95}
 
-		Release Name: 0.{95}
+        => Edit This Release
 
-		=> Edit This Release
+        Status: => Hidden
 
-		Status: => Hidden
+        Click Submit/Refresh
 
-		Click Submit/Refresh
 
+        Pull down the "Admin" menu and select "File Releases"
 
-		Go to the Admin page
+        Package Name:  scons-local
 
-		=> Edit/Add File Releases
+        => Edit Releases
 
-		Package Name:  scons-local
+        Release Name: 0.{95}
 
-		=> Edit Releases
+        => Edit This Release
 
-		Release Name: 0.{95}
+        Status: => Hidden
 
-		=> Edit This Release
+        Click Submit/Refresh
 
-		Status: => Hidden
 
-		Click Submit/Refresh
+        Pull down the "Admin" menu and select "File Releases"
 
+        Package Name:  scons-src
 
-		Go to the Admin page
+        => Edit Releases
 
-		=> Edit/Add File Releases
+        Release Name: 0.{95}
 
-		Package Name:  scons-src
+        => Edit This Release
 
-		=> Edit Releases
+        Status: => Hidden
 
-		Release Name: 0.{95}
+        Click Submit/Refresh
 
-		=> Edit This Release
 
-		Status: => Hidden
 
-		Click Submit/Refresh
+    Add a new release for 0.{97} in the Issue Tracker at tigris.org:
 
+        Click "Issue Tracker" on the left-hand nav bar
 
+        Click "Configuration options"
 
-	In the Bugs Tracker, add a Group for the new release 0.{97}
+        Click "Add/edit components"
 
+        Under "scons"
+        To the right of "Add ..."
+        Click "Version"
 
+        At the bottom of the list click "Add"
 
-	Test downloading from the SourceForge project page
+        Fill in the "Version:" box with 0.{97}
 
-                You may need to wait a good bit; they seem to update
-                this on half-hour cycles.
+        Check "Add this version to *all* components."
 
+        Click the "Add" button
 
 
-	Update the web site:
 
-		template:  new version number
+    Update the scons.org web site:
 
-                src/doc.py:  new version number
+        svn co http://scons.tigris.org/svn/scons/scons.org
 
-                src/download.py:  new version number
+        cd scons.org
 
-		src/index.py:  announcement on the home page
+            CHANGES.txt:    copy new version from built source tree
 
-		src/scons-doc.tar.gz:  update
+            download.php:   new version number
 
-		src/CHANGES.txt:  update
+            versions.php:   add new version number do $docversions[],
+                            shift index numbers :-(
 
-	Test downloading from the web site download page
+            index.php:      announcement on the home page
+                            remove out-of-date announcements
 
+            news-raw.xhtml: add announcement to list (dup from home page)
 
+            RELEASE.txt:    copy new version from built source tree
 
-	Add news item to the SourceForge project page
+        mkdir doc/0.{97}
 
+        (cd doc/0.{97} && tar zxf scons-doc-0.{97}.tar.gz)
 
+        svn add doc/0.{97}
 
-	Announce to the following mailing lists (template below):
+        svn commit
 
-		scons-announce@lists.sourceforge.net
-		scons-users@lists.sourceforge.net
-		scons-devel@lists.sourceforge.net
+        ssh -l scons manam.pair.com
 
-			[right away]
+            cd public_html
 
-		python-announce@python.org
+            mkdir new
 
-			[right away, it's moderated and will take
-			some time to get through]
+            svn co http://scons.tigris.org/svn/scons/scons.org new
 
-		linux-announce@news.ornl.gov
+            mv production previous && mv new production
 
-			[right away, it's moderated and will take
-			some time to get through]
+        [point your browser to http://www.scons.org/]
 
-		[optional] cons-discuss@gnu.org
 
-			[only if it's a really big announcement,
-			I said we wouldn't bug this list]
+    Update the tigris.org web site:
 
-		python-list@python.org
+        svn co http://scons.tigris.org/svn/scons/trunk
 
-                        [wait until business hours so the announcement
-			hits mailboxes while U.S. workers are active]
+        cd trunk
 
-        Notify Gentoo Linux of the update
+            www/project_highlights.html
 
-                For now, we will do this by entering a bug report, and
-                attaching the files in build/gentoo to the report.  Go
-                to:
+            www/roadmap.html
 
-                        http://bugs.gentoo.org/
+        svn commit
 
-                This requires an account (based on your email address)
-                and a certain amount of Bugzilla-based navigation,
-                but nothing that's too difficult.
 
-                This is just my best stab at a process that will work
-                for Gentoo.  This process may change if the Gentoo
-                developers come back and want something submitted in
-                some other form.
 
-	Notify www.cmtoday.com/contribute.html
 
-                [This guy wants an announcement no more frequently than
-                once a month, so save it for a future release if it's
-                been too soon since the previous one.]
+    Test downloading from the SourceForge project page
 
-	Notify freshmeat.net
+        You may need to wait a good bit; they seem to update
+        this on half-hour cycles.
 
-                [Wait until the morning so the announcement hits the
-                main freshmeat.net page while people in the U.S. are
-                awake and working]
 
+    Test downloading from the web site download page
 
 
-	Checkin another change to prepare for development on this branch.
 
-		# 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
+    Add news item to the SourceForge project page
 
-		# Optionally, update release numbers in the following:
-		[optional] aecp HOWTO/change.txt
-		[optional] vi HOWTO/change.txt
 
-		[optional] aecp HOWTO/release.txt
-		[optional] vi HOWTO/release.txt
+
+    Announce to the following mailing lists (template below):
+
+        scons-announce@lists.sourceforge.net
+        scons-users@lists.sourceforge.net
+        scons-devel@lists.sourceforge.net
+
+            [right away]
+
+        python-announce@python.org
+
+            [right away, it's moderated and will take
+            some time to get through]
+
+        linux-announce@news.ornl.gov
+
+            [right away, it's moderated and will take
+            some time to get through]
+
+        [optional] cons-discuss@gnu.org
+
+            [only if it's a really big announcement,
+            I said we wouldn't bug this list]
+
+        python-list@python.org
+
+            [wait until business hours so the announcement
+            hits mailboxes while U.S. workers are active]
+
+    Notify Gentoo Linux of the update
+
+        For now, we will do this by entering a bug report, and
+        attaching the files in build/gentoo to the report.  Go
+        to:
+
+            http://bugs.gentoo.org/
+
+        This requires an account (based on your email address)
+        and a certain amount of Bugzilla-based navigation,
+        but nothing that's too difficult.
+
+        This is just my best stab at a process that will work
+        for Gentoo.  This process may change if the Gentoo
+        developers come back and want something submitted in
+        some other form.
+
+    Notify www.cmtoday.com/contribute.html
+
+        [This guy wants an announcement no more frequently than
+        once a month, so save it for a future release if it's
+        been too soon since the previous one.]
+
+    Notify freshmeat.net
+
+        [Wait until the morning so the announcement hits the
+        main freshmeat.net page while people in the U.S. are
+        awake and working]
+
+
+
+    Checkin another change to prepare for development on this branch.
+
+        # 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
+
+        # Optionally, update release numbers in the following:
+        [optional] aecp HOWTO/change.txt
+        [optional] vi HOWTO/change.txt
+
+        [optional] aecp HOWTO/release.txt
+        [optional] vi HOWTO/release.txt
 
 
 
@@ -477,18 +527,18 @@ XXX Template describe-the-release section goes here XXX
 Special thanks to XXX, XXX, and XXX for their contributions to this
 release.
 
-	--SK
+        --SK
 =======================
 Template scons-users + scons-announce announcement:
 
 Version 0.95 of SCons has been released and is available for download
 from the SCons web site:
 
-	http://www.scons.org/
+        http://www.scons.org/
 
 Or through the download link at the SCons project page at SourceForge:
 
-	http://sourceforge.net/projects/scons/
+        http://sourceforge.net/projects/scons/
 
 RPM and Debian packages and a Win32 installer are all available, in
 addition to the traditional .tar.gz and .zip files.
@@ -506,7 +556,7 @@ release.
 
 On behalf of the SCons team,
 
-	--SK
+        --SK
 =======================
 Template python-announce, linux-announce and python-list announcement:
 
@@ -517,11 +567,11 @@ build tool competition in August 2000.
 Version 0.95 of SCons has been released and is available for download
 from the SCons web site:
 
-	http://www.scons.org/
+        http://www.scons.org/
 
 Or through the download link at the SCons project page at SourceForge:
 
-	http://sourceforge.net/projects/scons/
+        http://sourceforge.net/projects/scons/
 
 RPM and Debian packages and a Win32 installer are all available, in
 addition to the traditional .tar.gz and .zip files.
@@ -553,13 +603,13 @@ Distinctive features of SCons include:
 An scons-users mailing list is available for those interested in getting
 started using SCons.  You can subscribe at:
 
-	http://lists.sourceforge.net/lists/listinfo/scons-users
+        http://lists.sourceforge.net/lists/listinfo/scons-users
 
 Alternatively, we invite you to subscribe to the low-volume
 scons-announce mailing list to receive notification when new versions of
 SCons become available:
 
-	http://lists.sourceforge.net/lists/listinfo/scons-announce
+        http://lists.sourceforge.net/lists/listinfo/scons-announce
 
 
 ACKNOWLEDGEMENTS
@@ -569,4 +619,4 @@ release.
 
 On behalf of the SCons team,
 
-	--SK
+        --SK
diff --git a/HOWTO/subrelease.txt b/HOWTO/subrelease.txt
index 6826c817..fbba52a2 100644
--- a/HOWTO/subrelease.txt
+++ b/HOWTO/subrelease.txt
@@ -8,105 +8,105 @@ see the document HOWTO/release.txt.
 
 Things to do to release a new X.Y.Z version of SCons:
 
-	START THE NEW SUB-BRANCH FOR SUBRELEASE
+    START THE NEW SUB-BRANCH FOR SUBRELEASE
 
-		aenbr -p scons.0{94} {1}
+        aenbr -p scons.0.{94} {1}
 
-		aenc -p scons.0.{94}.{1}
+        aenc -p scons.0.{94}.{1}
 
-                        Call it something like,
-                        "Prepare a new sub-release for XYZ."
-                        Cause = internal_enhancement.
-                        Exempt it from all tests (*_exempt = true).
+            Call it something like,
+            "Prepare a new sub-release for XYZ."
+            Cause = internal_enhancement.
+            Exempt it from all tests (*_exempt = true).
 
-		ae_p scons.0.{94}.{1}
+        ae_p scons.0.{94}.{1}
 
-		aedb 100
+        aedb 100
 
-		aecd
+        aecd
 
-		# Change the hard-coded package version numbers
-		# in the following files.
-		aecp README
-		vi README
+        # Change the hard-coded package version numbers
+        # in the following files.
+        aecp README
+        vi README
 
-                aecp SConstruct
-                vi SConstruct
+        aecp SConstruct
+        vi SConstruct
 
-                aecp rpm/scons.spec.in
-                vi rpm/scons.spec.in
+        aecp rpm/scons.spec.in
+        vi rpm/scons.spec.in
 
-                aecp src/setup.py
-                vi src/setup.py
+        aecp src/setup.py
+        vi src/setup.py
 
-                aecp QMTest/TestSCons.py
-                vi QMTest/TestSCons.py
+        aecp QMTest/TestSCons.py
+        vi QMTest/TestSCons.py
 
-                # Read through and update the README files if necessary
-		[optional] aecp README
-		[optional] vi README
+        # Read through and update the README files if necessary
+        [optional] aecp README
+        [optional] vi README
 
-		[optional] aecp src/README.txt
-		[optional] vi src/README.txt
+        [optional] aecp src/README.txt
+        [optional] vi src/README.txt
 
-                # Prepare src/CHANGES.txt
-		aecp src/CHANGES.txt
-		vi src/CHANGES.txt
+        # Prepare src/CHANGES.txt
+        aecp src/CHANGES.txt
+        vi src/CHANGES.txt
 
-                        change the release line to reflect
-                        the new subrelease
+            change the release line to reflect
+            the new subrelease
 
-		        date -R the new subrelease
+            date -R the new subrelease
 
-                        add an explanatory not after the subrelease line:
+            add an explanatory not after the subrelease line:
 
-                                NOTE:  This is a pre-release of 0.{95}
-                                for testing purposes.  When 0.{95} is
-                                released, all these changes will show
-                                up as 0.95 changes.
+                    NOTE:  This is a pre-release of 0.{95}
+                    for testing purposes.  When 0.{95} is
+                    released, all these changes will show
+                    up as 0.95 changes.
 
-	        # Prepare src/RELEASE.txt
-                aecp src/RELEASE.txt
-                vi src/RELEASE.txt
+        # Prepare src/RELEASE.txt
+        aecp src/RELEASE.txt
+        vi src/RELEASE.txt
 
-		        date -R the release only if necessary
+            date -R the release only if necessary
 
-		        Read through and edit appropriately.
+            Read through and edit appropriately.
 
-		        Can probably keep most of the existing text
+            Can probably keep most of the existing text
 
-		        Add any new known problems
+            Add any new known problems
 
-	        # Prepare debian/changelog
-                aecp debian/changelog
-                vi debian/changelog
+        # Prepare debian/changelog
+        aecp debian/changelog
+        vi debian/changelog
 
-                        add the new subrelease
+            add the new subrelease
 
-		        date -R the new subrelease
+            date -R the new subrelease
 
-                # Now build and prepare the release itself.
-                aeb
+        # Now build and prepare the release itself.
+        aeb
 
-		aet -reg
+        aet -reg
 
-		aed
+        aed
 
-		aede
+        aede
 
-		etc.
+        etc.
 
 
 
-	Make the relevant packages available for by-hand pickup directly
-	off the web site:
+    Make the relevant packages available for by-hand pickup directly
+    off the web site:
 
-		scp scons-0.{94}.{1}.tar.gz stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs
-		scp scons-0.{94}.{1}.zip stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs
+        scp scons-0.{94}.{1}.tar.gz stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs
+        scp scons-0.{94}.{1}.zip stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs
 
 
-	Test downloading from the web site.
+    Test downloading from the web site.
 
 
 
-	Announce to dev@scons.tigris.org.
+    Announce to dev@scons.tigris.org.