Update from defaulttest_bb

10 files changed, 40 insertions, 40 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 9c89249f..f9f94de4 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -35,7 +35,7 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.5.0'
+default_version = '2.5.1'
 
 python_version_unsupported = (2, 6, 0)
 python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index ba1755fd..ca1b081e 100644
--- a/README.rst
+++ b/README.rst
@@ -168,7 +168,7 @@ Or on Windows::
 
 By default, the above commands will do the following:
 
-- Install the version-numbered "scons-2.5.0" and "sconsign-2.5.0" scripts in
+- Install the version-numbered "scons-2.5.1" and "sconsign-2.5.1" scripts in
   the default system script directory (/usr/bin or C:\\Python\*\\Scripts, for
   example).  This can be disabled by specifying the "--no-version-script"
   option on the command line.
@@ -180,23 +180,23 @@ By default, the above commands will do the following:
   before making it the default on your system.
 
   On UNIX or Linux systems, you can have the "scons" and "sconsign" scripts be
-  hard links or symbolic links to the "scons-2.5.0" and "sconsign-2.5.0"
+  hard links or symbolic links to the "scons-2.5.1" and "sconsign-2.5.1"
   scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
   the command line.
 
-- Install "scons-2.5.0.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-2.5.1.bat" and "scons.bat" wrapper scripts in the Python
   prefix directory on Windows (C:\\Python\*, for example).  This can be disabled
   by specifying the "--no-install-bat" option on the command line.
 
   On UNIX or Linux systems, the "--install-bat" option may be specified to
-  have "scons-2.5.0.bat" and "scons.bat" files installed in the default system
+  have "scons-2.5.1.bat" and "scons.bat" files installed in the default system
   script directory, which is useful if you want to install SCons in a shared
   file system directory that can be used to execute SCons from both UNIX/Linux
   and Windows systems.
 
 - Install the SCons build engine (a Python module) in an appropriate
-  version-numbered SCons library directory (/usr/lib/scons-2.5.0 or
-  C:\\Python\*\\scons-2.5.0, for example).  See below for more options related to
+  version-numbered SCons library directory (/usr/lib/scons-2.5.1 or
+  C:\\Python\*\\scons-2.5.1, for example).  See below for more options related to
   installing the build engine library.
 
 - Install the troff-format man pages in an appropriate directory on UNIX or
@@ -474,7 +474,7 @@ running all of "runtest.py -a".
 Building Packages
 =================
 
-We use SCons (version 2.5.0 or later) to build its own packages.  If you
+We use SCons (version 2.5.1 or later) to build its own packages.  If you
 already have an appropriate version of SCons installed on your system, you can
 build everything by simply running it::
 
@@ -489,18 +489,18 @@ about `Executing SCons Without Installing`_)::
 Depending on the utilities installed on your system, any or all of the
 following packages will be built::
 
-        build/dist/scons-2.5.0-1.noarch.rpm
-        build/dist/scons-2.5.0-1.src.rpm
-        build/dist/scons-2.5.0.linux-i686.tar.gz
-        build/dist/scons-2.5.0.tar.gz
-        build/dist/scons-2.5.0.win32.exe
-        build/dist/scons-2.5.0.zip
-        build/dist/scons-doc-2.5.0.tar.gz
-        build/dist/scons-local-2.5.0.tar.gz
-        build/dist/scons-local-2.5.0.zip
-        build/dist/scons-src-2.5.0.tar.gz
-        build/dist/scons-src-2.5.0.zip
-        build/dist/scons_2.5.0-1_all.deb
+        build/dist/scons-2.5.1-1.noarch.rpm
+        build/dist/scons-2.5.1-1.src.rpm
+        build/dist/scons-2.5.1.linux-i686.tar.gz
+        build/dist/scons-2.5.1.tar.gz
+        build/dist/scons-2.5.1.win32.exe
+        build/dist/scons-2.5.1.zip
+        build/dist/scons-doc-2.5.1.tar.gz
+        build/dist/scons-local-2.5.1.tar.gz
+        build/dist/scons-local-2.5.1.zip
+        build/dist/scons-src-2.5.1.tar.gz
+        build/dist/scons-src-2.5.1.zip
+        build/dist/scons_2.5.1-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.  For
diff --git a/ReleaseConfig b/ReleaseConfig
index 517b5dbf..cf815c5f 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -32,7 +32,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 # 'final', the patchlevel is set to the release date.  This value is
 # mandatory and must be present in this file.
 #version_tuple = (2, 2, 0, 'final', 0)
-version_tuple = (2, 7, 0, 'alpha', 0)
+version_tuple = (2, 5, 1)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version
diff --git a/doc/generated/examples/tasks_ex1_1.xml b/doc/generated/examples/tasks_ex1_1.xml
index 4885fde2..5760a453 100644
--- a/doc/generated/examples/tasks_ex1_1.xml
+++ b/doc/generated/examples/tasks_ex1_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cat &lt; test.bar &gt; test.h
 cc -o app main.cpp
 cat &lt; foo.bar2 &gt; foo.cpp
 cc -o app2 main2.cpp foo.cpp
+cat &lt; test.bar &gt; test.h
 </screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index a86a5ddb..34297502 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -8,6 +8,6 @@ scons: internal stack trace:
     return SCons.Taskmaster.OutOfDateTask.prepare(self)
   File "bootstrap/src/engine/SCons/Taskmaster.py", line 195, in prepare
     executor.prepare()
-  File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare
+  File "bootstrap/src/engine/SCons/Executor.py", line 396, in prepare
     raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0]))
 </screen>
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index f31b3f3c..01dd7a8d 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -762,19 +762,19 @@ Sets construction variables for the
 </para>
 <para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;.</para></listitem>
   </varlistentry>
-  <varlistentry id="t-Packaging">
-    <term>Packaging</term>
+  <varlistentry id="t-packaging">
+    <term>packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
+A framework for building binary and source packages.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="t-packaging">
-    <term>packaging</term>
+  <varlistentry id="t-Packaging">
+    <term>Packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-A framework for building binary and source packages.
+Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
 </para>
 </listitem>
   </varlistentry>
diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod
index bf552c33..ee387ad3 100644
--- a/doc/generated/tools.mod
+++ b/doc/generated/tools.mod
@@ -76,8 +76,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-mwcc "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwcc</literal>">
 <!ENTITY t-mwld "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwld</literal>">
 <!ENTITY t-nasm "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>nasm</literal>">
-<!ENTITY t-Packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>Packaging</literal>">
 <!ENTITY t-packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>packaging</literal>">
+<!ENTITY t-Packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>Packaging</literal>">
 <!ENTITY t-pdf "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdf</literal>">
 <!ENTITY t-pdflatex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdflatex</literal>">
 <!ENTITY t-pdftex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdftex</literal>">
@@ -182,8 +182,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-link-mwcc "<link linkend='t-mwcc' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwcc</literal></link>">
 <!ENTITY t-link-mwld "<link linkend='t-mwld' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwld</literal></link>">
 <!ENTITY t-link-nasm "<link linkend='t-nasm' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>nasm</literal></link>">
-<!ENTITY t-link-Packaging "<link linkend='t-Packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>Packaging</literal></link>">
 <!ENTITY t-link-packaging "<link linkend='t-packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>packaging</literal></link>">
+<!ENTITY t-link-Packaging "<link linkend='t-Packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>Packaging</literal></link>">
 <!ENTITY t-link-pdf "<link linkend='t-pdf' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdf</literal></link>">
 <!ENTITY t-link-pdflatex "<link linkend='t-pdflatex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdflatex</literal></link>">
 <!ENTITY t-link-pdftex "<link linkend='t-pdftex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdftex</literal></link>">
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index d2bced9c..e4f1a5cb 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -864,19 +864,19 @@ DFLAGPREFIX.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-_DFLAGS">
-    <term>_DFLAGS</term>
+  <varlistentry id="cv-DFLAGS">
+    <term>DFLAGS</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-_DFLAGS.
+DFLAGS.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-DFLAGS">
-    <term>DFLAGS</term>
+  <varlistentry id="cv-_DFLAGS">
+    <term>_DFLAGS</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DFLAGS.
+_DFLAGS.
 </para>
 </listitem>
   </varlistentry>
diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod
index d1763192..bace7869 100644
--- a/doc/generated/variables.mod
+++ b/doc/generated/variables.mod
@@ -67,8 +67,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-DESCRIPTION_lang "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DESCRIPTION_lang</envar>">
 <!ENTITY cv-DFILESUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DFILESUFFIX</envar>">
 <!ENTITY cv-DFLAGPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DFLAGPREFIX</envar>">
-<!ENTITY cv-_DFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_DFLAGS</envar>">
 <!ENTITY cv-DFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DFLAGS</envar>">
+<!ENTITY cv-_DFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_DFLAGS</envar>">
 <!ENTITY cv-DFLAGSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DFLAGSUFFIX</envar>">
 <!ENTITY cv-_DINCFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_DINCFLAGS</envar>">
 <!ENTITY cv-DINCPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DINCPREFIX</envar>">
@@ -696,8 +696,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-DESCRIPTION_lang "<link linkend='cv-DESCRIPTION_lang' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DESCRIPTION_lang</envar></link>">
 <!ENTITY cv-link-DFILESUFFIX "<link linkend='cv-DFILESUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DFILESUFFIX</envar></link>">
 <!ENTITY cv-link-DFLAGPREFIX "<link linkend='cv-DFLAGPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DFLAGPREFIX</envar></link>">
-<!ENTITY cv-link-_DFLAGS "<link linkend='cv-_DFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_DFLAGS</envar></link>">
 <!ENTITY cv-link-DFLAGS "<link linkend='cv-DFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DFLAGS</envar></link>">
+<!ENTITY cv-link-_DFLAGS "<link linkend='cv-_DFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_DFLAGS</envar></link>">
 <!ENTITY cv-link-DFLAGSUFFIX "<link linkend='cv-DFLAGSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DFLAGSUFFIX</envar></link>">
 <!ENTITY cv-link-_DINCFLAGS "<link linkend='cv-_DINCFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_DINCFLAGS</envar></link>">
 <!ENTITY cv-link-DINCPREFIX "<link linkend='cv-DINCPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DINCPREFIX</envar></link>">
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index d71619d4..3831032e 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -3,7 +3,7 @@
 
           http://www.scons.org/download.php
 
-  XXX The primary purpose of this release ... XXX
+  This is a minor release
 
   A SCons "checkpoint release" is intended to provide early access to
   new features so they can be tested in the field before being released