Initialize the 0.12 branch

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

diff --git a/HOWTO/change.txt b/HOWTO/change.txt
index 5fe9c00c05f54c05156d9c8a335d3348fe8b4e46..169123c6dc8cb046e07210a9eb6000de160ded25 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.11 {cnum} > scons.0.11.C{cnum}.ae
-               pine -attach scons.0.11.C{cnum}.ae scons-aedist@lists.sourceforge.net
-                       Subject: scons.0.11 - {SUMMARY}
-                       Body:  aegis -l -p scons.0.11 -c {cnum} cd
+               aedist -s -p scons.0.12 {cnum} > scons.0.12.C{cnum}.ae
+               pine -attach scons.0.12.C{cnum}.ae scons-aedist@lists.sourceforge.net
+                       Subject: scons.0.12 - {SUMMARY}
+                       Body:  aegis -l -p scons.0.12 -c {cnum} cd
 
-               rm scons.0.11.C{cnum}.ae
+               rm scons.0.12.C{cnum}.ae
 
        [This will eventually be automated.]
 
     -- Update the aedist baseline on the web site:
 
-               aedist -s -bl -p scons.0.11 > scons.0.11.ae
-               scp scons.0.11.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.11.ae
-               rm scons.0.11.ae
+               aedist -s -bl -p scons.0.12 > scons.0.12.ae
+               scp scons.0.12.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.12.ae
+               rm scons.0.12.ae
 
        [This will eventually be automated.]
 
     -- Distribute the change to CVS:
 
                export CVS_RSH=ssh
-               ae2cvs -n -aegis -p scons.0.11 -c {cnum} -u ~/SCons/scons
-               ae2cvs -X -aegis -p scons.0.11 -c {cnum} -u ~/SCons/scons
+               ae2cvs -n -aegis -p scons.0.12 -c {cnum} -u ~/SCons/scons
+               ae2cvs -X -aegis -p scons.0.12 -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 15739d8af84d7a6e0cf4bd0740213232b5da5087..83e5494bdebe496919a0cc634d37b736ec6526f6 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 {11}
+               aede {12}
 
-               aerpass {11}
+               aerpass {12}
 
-               aeib {11}
+               aeib {12}
 
                aeb
 
@@ -94,16 +94,16 @@ Things to do to release a new version of SCons:
                <your email>
                cd incoming
                bin
-               put scons-0.11-1.noarch.rpm
-               put scons-0.11-1.src.rpm
-               put scons-0.11.tar.gz
-               put scons-0.11.win32.exe
-               put scons-0.11.zip
-               put scons-local-0.11.tar.gz
-               put scons-local-0.11.zip
-               put scons-src-0.11.tar.gz
-               put scons-src-0.11.zip
-               put scons_0.11-1_all.deb
+               put scons-0.12-1.noarch.rpm
+               put scons-0.12-1.src.rpm
+               put scons-0.12.tar.gz
+               put scons-0.12.win32.exe
+               put scons-0.12.zip
+               put scons-local-0.12.tar.gz
+               put scons-local-0.12.zip
+               put scons-src-0.12.tar.gz
+               put scons-src-0.12.zip
+               put scons_0.12-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.11
+               New release name:  0.12
 
                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.11-1.noarch.rpm         Any     .rpm
-                       scons-0.11-1.src.rpm            Any     Source .rpm
-                       scons-0.11.tar.gz               Any     .gz
-                       scons-0.11.win32.exe            i386    .exe (32-bit Windows)
-                       scons-0.11.zip                  Any     .zip
-                       scons_0.11-1_all.deb            Any     .deb
+                       scons-0.12-1.noarch.rpm         Any     .rpm
+                       scons-0.12-1.src.rpm            Any     Source .rpm
+                       scons-0.12.tar.gz               Any     .gz
+                       scons-0.12.win32.exe            i386    .exe (32-bit Windows)
+                       scons-0.12.zip                  Any     .zip
+                       scons_0.12-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.11
+               New release name:  0.12
 
                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.11.tar.gz         Any     .gz
-                       scons-local-0.11.zip            Any     .zip
+                       scons-local-0.12.tar.gz         Any     .gz
+                       scons-local-0.12.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.11
+               New release name:  0.12
 
                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.11.tar.gz           Any     .gz
-                       scons-src-0.11.zip              Any     .zip
+                       scons-src-0.12.tar.gz           Any     .gz
+                       scons-src-0.12.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.08} 2 at the SourceForge download page:
+       Hide release {0.10} 2 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.08}
+               Release Name: {0.10}
 
                => Edit This Release
 
@@ -243,7 +243,7 @@ Things to do to release a new version of SCons:
 
                => Edit Releases
 
-               Release Name: {0.08}
+               Release Name: {0.10}
 
                => Edit This Release
 
@@ -260,7 +260,7 @@ Things to do to release a new version of SCons:
 
                => Edit Releases
 
-               Release Name: {0.08}
+               Release Name: {0.10}
 
                => 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.11)
+       In the Bugs Tracker, add a Group for the new release (0.12)
 
 
 
@@ -359,8 +359,8 @@ Things to do to release a new version of SCons:
 
                # 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
+               aecp README SConstruct debian/changelog rpm/scons.spec.in
+               vi README SConstruct debian/changelog rpm/scons.spec.in
 
                # Optionally, do the same in the following:
                [optional] aecp HOWTO/change.txt
@@ -390,7 +390,7 @@ Things to do to release a new version of SCons:
 =======================
 Template describe-the-release section:
 
-IMPORTANT:  Release 0.11 contains the following interface changes:
+IMPORTANT:  Release 0.12 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.11 is now available for download.
+SCons alpha release 0.12 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.11 of SCons has been released and is available for download
+Version 0.12 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.11 of SCons has been released and is available for download
+Version 0.12 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 63fcc07aeadac412844f6d439769b4b385839ca0..b20758491b51cb352b7667423f6cb7e787537f4b 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.11-1.noarch.rpm
+            Red Hat Linux       scons-0.12-1.noarch.rpm
 
-            Debian GNU/Linux    scons_0.11-1_all.deb
+            Debian GNU/Linux    scons_0.12-1_all.deb
                                 (or use apt-get)
 
-            Windows             scons-0.11.win32.exe
+            Windows             scons-0.12.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.11-1.noarch.rpm
-        build/dist/scons-0.11-1.src.rpm
-        build/dist/scons-0.11.linux-i686.tar.gz
-        build/dist/scons-0.11.tar.gz
-        build/dist/scons-0.11.win32.exe
-        build/dist/scons-0.11.zip
-        build/dist/scons-doc-0.11.tar.gz
-        build/dist/scons-local-0.11.tar.gz
-        build/dist/scons-local-0.11.zip
-        build/dist/scons-src-0.11.tar.gz
-        build/dist/scons-src-0.11.zip
-        build/dist/scons_0.11-1_all.deb
+        build/dist/scons-0.12-1.noarch.rpm
+        build/dist/scons-0.12-1.src.rpm
+        build/dist/scons-0.12.linux-i686.tar.gz
+        build/dist/scons-0.12.tar.gz
+        build/dist/scons-0.12.win32.exe
+        build/dist/scons-0.12.zip
+        build/dist/scons-doc-0.12.tar.gz
+        build/dist/scons-local-0.12.tar.gz
+        build/dist/scons-local-0.12.zip
+        build/dist/scons-src-0.12.tar.gz
+        build/dist/scons-src-0.12.zip
+        build/dist/scons_0.12-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 1a8fd29e4e6cf3bd21431f139fec3cb3773eb764..1edaff17b3ec9be4432bb302e3f71c56f4e21c08 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -39,7 +39,7 @@ import sys
 import time
 
 project = 'scons'
-default_version = '0.11'
+default_version = '0.12'
 copyright = "Copyright (c) %s Steven Knight" % copyright_years
 
 Default('.')

diff --git a/debian/changelog b/debian/changelog
index f2c7684522d53e8f4efe314d2a5f15843e3b32fc..0e9807744ed9059039c56a60bae23281627b4a2d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scons (0.12-1) unstable; urgency=low
+
+  * Sixth post-official-Debian build cycle
+
+ -- Steven Knight <knight@baldmt.com>  Tue, 11 Feb 2003 05:24:33 -0600
+
 scons (0.11-1) unstable; urgency=low
 
   * Fifth post-official-Debian build cycle

diff --git a/rpm/scons.spec.in b/rpm/scons.spec.in
index 57e69c3fe2f226c724a6dcedbdfa8136b8735618..37327a453bee5dd3ca89f0c358dd5b39d667231b 100644 (file)
--- a/rpm/scons.spec.in
+++ b/rpm/scons.spec.in
@@ -1,5 +1,5 @@
 %define name scons
-%define version 0.11
+%define version 0.12
 %define release 1
 
 Summary: an Open Source software construction tool

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 25e5d6732c73972a091211edfc84fd37546c3c27..a696a2dba9178b75dd05ae1ddaa08e5c66dda752 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,10 @@
 
 
 
+RELEASE 0.12 - XXX
+
+
+
 RELEASE 0.11 - Tue, 11 Feb 2003 05:24:33 -0600
 
   From Chad Austin:

diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index c896dca2316ee7bc8dea762f165f813e6a2e3881..535384d835ebb3016c1a26802ede172fd7b0b3c8 100644 (file)
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -20,9 +20,9 @@ more effectively, please sign up for the scons-users mailing list at:
 
 
 
-RELEASE 0.11 - Tue, 11 Feb 2003 05:24:33 -0600
+RELEASE 0.12 - XXX
 
-  This is the eleventh alpha release of SCons.  Please consult the
+  This is the twelfth 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.10:
@@ -78,48 +78,6 @@ RELEASE 0.11 - Tue, 11 Feb 2003 05:24:33 -0600
     If you have defined a strfunction() for a Python function Action,
     you will need to add a third "env" argument to your function call.
 
-  Please note the following important changes since release 0.09:
-
-    - The Scanner interface has been changed to make it easier to
-
-      write user-defined Scanners and to eliminate unnecessary Scanner
-      calls.  This required changing the meaning of the third argument
-      passed to your user-defined scanner functions.  The third argument
-      was formerly the target node whose build was causing a scan of the
-      current node specified as the first argument:
-
-        def scanner_function(node, env, target):
-
-      The third argument is now the path of directories that can be
-      searched for files found during the scan of the current node:
-
-        def scanner_function(node, env, path):
-
-      If you did not actually use the third argument in your scanner
-      function, which should be the case for most definitions, you do
-      not need to change your scanner function.  (You may, however, wish
-      to change the name of the third argument from "target" to "path"
-      to reflect the changed meaning and avoid misleading anyone who
-      looks at your SConscript files.)
-
-    - The .sconsign file format has been changed from ASCII to a pickled
-      Python data structure.  This improves performance and future
-      extensibility, but means that the first time you execute SCons
-      0.10 on an already-existing source tree built with SCons 0.09 or
-      earlier, SCons will report for every .sconsign file in the tree:
-
-       SCons warning: Ignoring corrupt .sconsign file: xxx
-
-      These warnings are normal in this situation and can be safely
-      ignored.
-
-    - The format of all error and warning messages has been made
-      consistent.  All error messages now begin with "scons: ***"
-      and all warning messages now begin with "scons: warning:".
-
-    - SCons now prints a description of Python functions that are
-      invoked to build a target.
-
   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/setup.py b/src/setup.py
index 33b4cbeb5bbaa89f386583209d07912a90beb387..bb6f0ab6005d72958b86582aa52a6525474f3955 100644 (file)
--- a/src/setup.py
+++ b/src/setup.py
@@ -149,7 +149,7 @@ class install_lib(_install_lib):
             is_win32 = sys.platform == "win32" or args[0] == 'bdist_wininst'
             prefix = get_scons_prefix(self.install_dir, is_win32)
             standard_dir = os.path.join(self.install_dir, "SCons")
-            version_dir = os.path.join(prefix, "scons-0.11")
+            version_dir = os.path.join(prefix, "scons-__VERSION__")
             standalone_dir = os.path.join(prefix, "scons")
             if self.version_lib:
                 # ...but they asked for a version-specific directory.
@@ -185,7 +185,7 @@ class install_scripts(_install_scripts):
 
 arguments = {
     'name'             : "scons",
-    'version'          : "0.11",
+    'version'          : "__VERSION__",
     'packages'         : ["SCons",
                           "SCons.Node",
                           "SCons.Optik",