Prep the branch for the work towards the next release.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@776 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/HOWTO/change.txt b/HOWTO/change.txt
index 9179f67980850bd9b694b5fe89025f0b93dfd1bb..ff949883c509739a43c83478dea44739755f0a03 100644 (file)
--- 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.91 {cnum} > scons.0.91.C{cnum}.ae
-               pine -attach scons.0.91.C{cnum}.ae scons-aedist@lists.sourceforge.net
-                       Subject: scons.0.91 - {SUMMARY}
-                       Body:  aegis -l -p scons.0.91 -c {cnum} cd
+               aedist -s -p scons.0.92 {cnum} > scons.0.92.C{cnum}.ae
+               pine -attach scons.0.92.C{cnum}.ae scons-aedist@lists.sourceforge.net
+                       Subject: scons.0.92 - {SUMMARY}
+                       Body:  aegis -l -p scons.0.92 -c {cnum} cd
 
-               rm scons.0.91.C{cnum}.ae
+               rm scons.0.92.C{cnum}.ae
 
        [This will eventually be automated.]
 
     -- Update the aedist baseline on the web site:
 
-               aedist -s -bl -p scons.0.91 > scons.0.91.ae
-               scp scons.0.91.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.91.ae
-               rm scons.0.91.ae
+               aedist -s -bl -p scons.0.92 > scons.0.92.ae
+               scp scons.0.92.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.92.ae
+               rm scons.0.92.ae
 
        [This will eventually be automated.]
 
     -- Distribute the change to CVS:
 
                export CVS_RSH=ssh
-               ae2cvs -n -aegis -p scons.0.91 -c {cnum} -u ~/SCons/scons
-               ae2cvs -X -aegis -p scons.0.91 -c {cnum} -u ~/SCons/scons
+               ae2cvs -n -aegis -p scons.0.92 -c {cnum} -u ~/SCons/scons
+               ae2cvs -X -aegis -p scons.0.92 -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 348f2bf1707f81d28d944b2afcc165514f16a073..f93c5a8a9bca34a69c306496e0af2eb420fa1622 100644 (file)
--- a/HOWTO/release.txt
+++ b/HOWTO/release.txt
@@ -41,11 +41,11 @@ Things to do to release a new version of SCons:
 
                ae_p scons.0
 
-               aede {91}
+               aede {92}
 
-               aerpass {91}
+               aerpass {92}
 
-               aeib {91}
+               aeib {92}
 
                aeb
 
@@ -59,16 +59,16 @@ Things to do to release a new version of SCons:
 
        START THE NEW BRANCH FOR RELEASE
 
-               aenbr -p scons.0 {92}
+               aenbr -p scons.0 {93}
 
-               aenc -p scons.0.{92}
+               aenc -p scons.0.{93}
 
                         Call it something like,
                         "Initialize the new branch for release."
                         Cause = internal_enhancement.
                         Exempt it from all tests (*_exempt = true).
 
-               ae_p scons.0.{92}
+               ae_p scons.0.{93}
 
                aedb 100
 
@@ -146,16 +146,16 @@ Things to do to release a new version of SCons:
                <your email>
                cd incoming
                bin
-               put scons-0.{92}-1.noarch.rpm
-               put scons-0.{92}-1.src.rpm
-               put scons-0.{92}.tar.gz
-               put scons-0.{92}.win32.exe
-               put scons-0.{92}.zip
-               put scons-local-0.{92}.tar.gz
-               put scons-local-0.{92}.zip
-               put scons-src-0.{92}.tar.gz
-               put scons-src-0.{92}.zip
-               put scons_0.{92}-1_all.deb
+               put scons-0.{93}-1.noarch.rpm
+               put scons-0.{93}-1.src.rpm
+               put scons-0.{93}.tar.gz
+               put scons-0.{93}.win32.exe
+               put scons-0.{93}.zip
+               put scons-local-0.{93}.tar.gz
+               put scons-local-0.{93}.zip
+               put scons-src-0.{93}.tar.gz
+               put scons-src-0.{93}.zip
+               put scons_0.{93}-1_all.deb
 
        Create the new release at the SourceForge project page:
 
@@ -167,7 +167,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.{92}
+               New release name:  0.{93}
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -184,12 +184,12 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-0.{92}-1.noarch.rpm       Any     .rpm
-                       scons-0.{92}-1.src.rpm          Any     Source .rpm
-                       scons-0.{92}.tar.gz             Any     .gz
-                       scons-0.{92}.win32.exe          i386    .exe (32-bit Windows)
-                       scons-0.{92}.zip                Any     .zip
-                       scons_0.{92}-1_all.deb          Any     .deb
+                       scons-0.{93}-1.noarch.rpm       Any     .rpm
+                       scons-0.{93}-1.src.rpm          Any     Source .rpm
+                       scons-0.{93}.tar.gz             Any     .gz
+                       scons-0.{93}.win32.exe          i386    .exe (32-bit Windows)
+                       scons-0.{93}.zip                Any     .zip
+                       scons_0.{93}-1_all.deb          Any     .deb
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -206,7 +206,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.{92}
+               New release name:  0.{93}
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -223,8 +223,8 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-local-0.{92}.tar.gz       Any     .gz
-                       scons-local-0.{92}.zip          Any     .zip
+                       scons-local-0.{93}.tar.gz       Any     .gz
+                       scons-local-0.{93}.zip          Any     .zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -241,7 +241,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.{92}
+               New release name:  0.{93}
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -258,8 +258,8 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-src-0.{92}.tar.gz         Any     .gz
-                       scons-src-0.{92}.zip            Any     .zip
+                       scons-src-0.{93}.tar.gz         Any     .gz
+                       scons-src-0.{93}.zip            Any     .zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -268,7 +268,7 @@ Things to do to release a new version of SCons:
                Release Notice section.
 
 
-       Hide release {0.14} at the SourceForge download page:
+       Hide release {0.90} at the SourceForge download page:
 
                Go to the Admin page
 
@@ -278,7 +278,7 @@ Things to do to release a new version of SCons:
 
                => Edit Releases
 
-               Release Name: {0.14}
+               Release Name: {0.90}
 
                => Edit This Release
 
@@ -295,7 +295,7 @@ Things to do to release a new version of SCons:
 
                => Edit Releases
 
-               Release Name: {0.14}
+               Release Name: {0.90}
 
                => Edit This Release
 
@@ -312,7 +312,7 @@ Things to do to release a new version of SCons:
 
                => Edit Releases
 
-               Release Name: {0.14}
+               Release Name: {0.90}
 
                => Edit This Release
 

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 5aaac8272bd4326159e5c42999544184b5a908a6..f8cbfcddd982f10a5b4e1dadbad05abf241cee5a 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,12 @@
 
 
 
+RELEASE X.XX - XXX
+
+  From Steven Knight:
+
+
+
 RELEASE 0.92 - Wed, 20 Aug 2003 03:45:28 -0500
 
   From Charles Crain and Gary Oberbrunner:

diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index a7f8a9df1020b66666b2642eedc1cb26b27591c1..36b9f00d22d0ad33d2fa8ced1c91e78f41037d28 100644 (file)
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -20,36 +20,18 @@ more effectively, please sign up for the scons-users mailing list at:
 
 
 
-RELEASE 0.92 - Wed, 20 Aug 2003 03:45:28 -0500
+RELEASE X.XX - XXX
 
-  This is the third beta release of SCons.  Please consult the
+  This is the fourth beta 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.92:
+
   Please note the following important changes since release 0.91:
 
   - The Debian package available from the SCons web site now
     uses Python version 2.2.
 
-  Please note the following important changes since release 0.90:
-
-  - The spelling of the 'validater' keyword argument to the
-    Options.Add() method has been corrected to 'validator'.  The old
-    spelling still works but has been deprecated and generates a
-    warning.
-
-  - The SConscript() function no longer splits its first argument on
-    white space into a list of SConscript file names.  You must now
-    explicitly enclose the file names in a list:
-
-        SConscript(['sub1/SConscript', 'sub2/SConscript'])
-
-    Or use the Split() function (or something similar) to create a list:
-
-        SConscript(Split('sub1/SConscript sub2/SConscript'))
-
-    This makes the SConscript() function's handling of file names
-    consistent with the rest of SCons.
-
   SCons is developed with an extensive regression test suite, and a
   rigorous development methodology for continually improving that suite.
   Because of this, SCons is of sufficient quality that you can use it