Initialize the new branch.

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

diff --git a/HOWTO/change.txt b/HOWTO/change.txt
index b13e1d53a3f76f33bb05d98b89faeff309d9b68f..066396e6ecc71210820fb25cec5687cc82a2a790 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.14 {cnum} > scons.0.14.C{cnum}.ae
-               pine -attach scons.0.14.C{cnum}.ae scons-aedist@lists.sourceforge.net
-                       Subject: scons.0.14 - {SUMMARY}
-                       Body:  aegis -l -p scons.0.14 -c {cnum} cd
+               aedist -s -p scons.0.15 {cnum} > scons.0.15.C{cnum}.ae
+               pine -attach scons.0.15.C{cnum}.ae scons-aedist@lists.sourceforge.net
+                       Subject: scons.0.15 - {SUMMARY}
+                       Body:  aegis -l -p scons.0.15 -c {cnum} cd
 
-               rm scons.0.14.C{cnum}.ae
+               rm scons.0.15.C{cnum}.ae
 
        [This will eventually be automated.]
 
     -- Update the aedist baseline on the web site:
 
-               aedist -s -bl -p scons.0.14 > scons.0.14.ae
-               scp scons.0.14.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.14.ae
-               rm scons.0.14.ae
+               aedist -s -bl -p scons.0.15 > scons.0.15.ae
+               scp scons.0.15.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.15.ae
+               rm scons.0.15.ae
 
        [This will eventually be automated.]
 
     -- Distribute the change to CVS:
 
                export CVS_RSH=ssh
-               ae2cvs -n -aegis -p scons.0.14 -c {cnum} -u ~/SCons/scons
-               ae2cvs -X -aegis -p scons.0.14 -c {cnum} -u ~/SCons/scons
+               ae2cvs -n -aegis -p scons.0.15 -c {cnum} -u ~/SCons/scons
+               ae2cvs -X -aegis -p scons.0.15 -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 38d27a684be1ed68b1f70fd1a47a104987633224..d9c0ae88b762b655bca8238780e3e9f603474370 100644 (file)
--- a/HOWTO/release.txt
+++ b/HOWTO/release.txt
@@ -65,11 +65,11 @@ Things to do to release a new version of SCons:
 
                ae_p scons.0
 
-               aede {14}
+               aede {15}
 
-               aerpass {14}
+               aerpass {15}
 
-               aeib {14}
+               aeib {15}
 
                aeb
 
@@ -94,16 +94,16 @@ Things to do to release a new version of SCons:
                <your email>
                cd incoming
                bin
-               put scons-0.14-1.noarch.rpm
-               put scons-0.14-1.src.rpm
-               put scons-0.14.tar.gz
-               put scons-0.14.win32.exe
-               put scons-0.14.zip
-               put scons-local-0.14.tar.gz
-               put scons-local-0.14.zip
-               put scons-src-0.14.tar.gz
-               put scons-src-0.14.zip
-               put scons_0.14-1_all.deb
+               put scons-0.15-1.noarch.rpm
+               put scons-0.15-1.src.rpm
+               put scons-0.15.tar.gz
+               put scons-0.15.win32.exe
+               put scons-0.15.zip
+               put scons-local-0.15.tar.gz
+               put scons-local-0.15.zip
+               put scons-src-0.15.tar.gz
+               put scons-src-0.15.zip
+               put scons_0.15-1_all.deb
 
        Create the new release at the SourceForge project page:
 
@@ -115,7 +115,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.14
+               New release name:  0.15
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -132,12 +132,12 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-0.14-1.noarch.rpm         Any     .rpm
-                       scons-0.14-1.src.rpm            Any     Source .rpm
-                       scons-0.14.tar.gz               Any     .gz
-                       scons-0.14.win32.exe            i386    .exe (32-bit Windows)
-                       scons-0.14.zip                  Any     .zip
-                       scons_0.14-1_all.deb            Any     .deb
+                       scons-0.15-1.noarch.rpm         Any     .rpm
+                       scons-0.15-1.src.rpm            Any     Source .rpm
+                       scons-0.15.tar.gz               Any     .gz
+                       scons-0.15.win32.exe            i386    .exe (32-bit Windows)
+                       scons-0.15.zip                  Any     .zip
+                       scons_0.15-1_all.deb            Any     .deb
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -154,7 +154,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.14
+               New release name:  0.15
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -171,8 +171,8 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-local-0.14.tar.gz         Any     .gz
-                       scons-local-0.14.zip            Any     .zip
+                       scons-local-0.15.tar.gz         Any     .gz
+                       scons-local-0.15.zip            Any     .zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -189,7 +189,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.14
+               New release name:  0.15
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -206,8 +206,8 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-src-0.14.tar.gz           Any     .gz
-                       scons-src-0.14.zip              Any     .zip
+                       scons-src-0.15.tar.gz           Any     .gz
+                       scons-src-0.15.zip              Any     .zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -216,7 +216,7 @@ Things to do to release a new version of SCons:
                Release Notice section.
 
 
-       Hide release {0.10} 2 at the SourceForge download page:
+       Hide release {0.13} at the SourceForge download page:
 
                Go to the Admin page
 
@@ -226,7 +226,7 @@ Things to do to release a new version of SCons:
 
                => Edit Releases
 
-               Release Name: {0.10}
+               Release Name: {0.13}
 
                => Edit This Release
 
@@ -243,7 +243,7 @@ Things to do to release a new version of SCons:
 
                => Edit Releases
 
-               Release Name: {0.10}
+               Release Name: {0.13}
 
                => Edit This Release
 
@@ -260,7 +260,7 @@ Things to do to release a new version of SCons:
 
                => Edit Releases
 
-               Release Name: {0.10}
+               Release Name: {0.13}
 
                => Edit This Release
 
@@ -270,7 +270,7 @@ Things to do to release a new version of SCons:
 
 
 
-       In the Bugs Tracker, add a Group for the new release (0.14)
+       In the Bugs Tracker, add a Group for the new release (0.15)
 
 
 
@@ -343,15 +343,15 @@ Things to do to release a new version of SCons:
 
        START THE NEW BRANCH
 
-               aenbr -p scons.0 {14}
+               aenbr -p scons.0 {16}
 
-               aenc -p scons.0.{14}
+               aenc -p scons.0.{16}
 
                         Call it something like, "Initialize the new
                         branch."  Cause = internal_enhancement.  Exempt
                         it from all tests (*_exempt = true).
 
-               ae_p scons.0.{14}
+               ae_p scons.0.{16}
 
                aedb 100
 
@@ -390,7 +390,7 @@ Things to do to release a new version of SCons:
 =======================
 Template describe-the-release section:
 
-IMPORTANT:  Release 0.14 contains the following interface changes:
+IMPORTANT:  Release 0.15 contains the following interface changes:
   - XXX
 
   See the release notes for more information about these changes.
@@ -414,7 +414,7 @@ Template scons-devel announcement:
 
 SConspirators--
 
-SCons alpha release 0.14 is now available for download.
+SCons alpha release 0.15 is now available for download.
 
 XXX Template describe-the-release section goes here XXX
 
@@ -425,7 +425,7 @@ release.
 =======================
 Template scons-users + scons-announce announcement:
 
-Version 0.14 of SCons has been released and is available for download
+Version 0.15 of SCons has been released and is available for download
 from the SCons web site:
 
        http://www.scons.org/
@@ -458,7 +458,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.14 of SCons has been released and is available for download
+Version 0.15 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 7a6c85f090a22f7f1ea3f97b8d3b6c8aa63db94c..47c90906c8138c2618eeca5106c32e4e3dfe80f9 100644 (file)
--- a/README
+++ b/README
@@ -66,12 +66,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.14-1.noarch.rpm
+            Red Hat Linux       scons-0.15-1.noarch.rpm
 
-            Debian GNU/Linux    scons_0.14-1_all.deb
+            Debian GNU/Linux    scons_0.15-1_all.deb
                                 (or use apt-get)
 
-            Windows             scons-0.14.win32.exe
+            Windows             scons-0.15.win32.exe
 
     --  (Recommended.)  Download the latest distutils package from the
         following URL:
@@ -218,18 +218,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.14-1.noarch.rpm
-        build/dist/scons-0.14-1.src.rpm
-        build/dist/scons-0.14.linux-i686.tar.gz
-        build/dist/scons-0.14.tar.gz
-        build/dist/scons-0.14.win32.exe
-        build/dist/scons-0.14.zip
-        build/dist/scons-doc-0.14.tar.gz
-        build/dist/scons-local-0.14.tar.gz
-        build/dist/scons-local-0.14.zip
-        build/dist/scons-src-0.14.tar.gz
-        build/dist/scons-src-0.14.zip
-        build/dist/scons_0.14-1_all.deb
+        build/dist/scons-0.15-1.noarch.rpm
+        build/dist/scons-0.15-1.src.rpm
+        build/dist/scons-0.15.linux-i686.tar.gz
+        build/dist/scons-0.15.tar.gz
+        build/dist/scons-0.15.win32.exe
+        build/dist/scons-0.15.zip
+        build/dist/scons-doc-0.15.tar.gz
+        build/dist/scons-local-0.15.tar.gz
+        build/dist/scons-local-0.15.zip
+        build/dist/scons-src-0.15.tar.gz
+        build/dist/scons-src-0.15.zip
+        build/dist/scons_0.15-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 b1af6918d7d47dc6591fe9f56a8f4cbc51a7ab7b..59f70881a24230fe728d086e59abba6576d96b07 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -39,7 +39,7 @@ import sys
 import time
 
 project = 'scons'
-default_version = '0.14'
+default_version = '0.15'
 copyright = "Copyright (c) %s Steven Knight" % copyright_years
 
 Default('.')

diff --git a/debian/changelog b/debian/changelog
index 6c24dfe0713676f7ca6884d742bc0b9cfe460829..b9915deb50a138bfa0bd141170a1feb4fa8663b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scons (0.15-1) unstable; urgency=low
+
+  * Ninth post-official-Debian build cycle
+
+ -- Steven Knight <knight@baldmt.com>  Wed, 21 May 2003 05:16:32 -0500
+
+
 scons (0.14-1) unstable; urgency=low
 
   * Eighth post-official-Debian build cycle

diff --git a/rpm/scons.spec.in b/rpm/scons.spec.in
index 484c6ea08f2152106c3b7c7960326cb603dc3767..b68c156bf210c85c80f8836e75319e75b70dde9c 100644 (file)
--- a/rpm/scons.spec.in
+++ b/rpm/scons.spec.in
@@ -1,5 +1,5 @@
 %define name scons
-%define version 0.14
+%define version 0.15
 %define release 1
 
 Summary: an Open Source software construction tool

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 99013705bb70d87cfb65367561642445657d610c..0cbe2c3d30ffdf0e2ba474251f5dc3fa837861b7 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,12 @@
 
 
 
+RELEASE 0.15 - XXX
+
+  From Steven Knight:
+
+
+
 RELEASE 0.14 - Wed, 21 May 2003 05:16:32 -0500
 
   From Chad Austin:

diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 030a642133837a1a3b437178ff9ebe0a03b992a0..6d7916c39fecd44375750dfbf5141e5c9d0f8f04 100644 (file)
--- 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.14 - Wed, 21 May 2003 05:16:32 -0500
+RELEASE 0.15 - XXX
 
-  This is the fourteenth alpha release of SCons.  Please consult the
+  This is the fifteenth 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.14:
+
+  -
+
   Please note the following important changes since release 0.13:
 
   - Tool specifications no longer take a "platform" argument.  You
@@ -65,15 +69,6 @@ RELEASE 0.14 - Wed, 21 May 2003 05:16:32 -0500
     construction variables are set before calling the Builders that will
     use them.
 
-  Please note the following important changes since release 0.11:
-
-  - The default behavior of SCons is now to change to the directory in
-    which an SConscript file resides while reading the SConscript file.
-    To disable this and restore the previous behavior of staying in the
-    top-level directory, specify the following in your SConstruct file:
-
-        SConscriptChdir(0)
-
   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

diff --git a/src/setupTests.py b/src/setupTests.py
index 6457fff8313333250df566000ce14dc0ab1f8e5c..6f73e5ead486e2435885b9f459d57021b9713289 100644 (file)
--- a/src/setupTests.py
+++ b/src/setupTests.py
@@ -52,7 +52,7 @@ except KeyError:
 #    version = os.environ['SCONS_VERSION']
 #except KeyError:
 #    version = '__VERSION__'
-version = '0.14'
+version = '0.15'
 
 scons_version = 'scons-%s' % version