1. anatoly techtonik
  2. scons-all-branches

Commits

Steven Knight  committed 7e11bbf

Merged revisions 4939-5028 via svnmerge from
http://scons.tigris.org/svn/scons/trunk

................
r4940 | garyo | 2010-06-02 18:40:26 -0700 (Wed, 02 Jun 2010) | 1 line

Document GetBuildPath in Users Guide
................
r4941 | bdbaddog | 2010-06-03 08:22:50 -0700 (Thu, 03 Jun 2010) | 3 lines

Initial Migration of MSVC logic from 1.3 branch.
................
r4944 | bdbaddog | 2010-06-03 17:36:27 -0700 (Thu, 03 Jun 2010) | 2 lines

Fix failing tests on macosx
................
r4945 | garyo | 2010-06-03 19:16:13 -0700 (Thu, 03 Jun 2010) | 1 line

Document FindPathDirs in Users Guide
................
r4951 | stevenknight | 2010-06-04 16:55:28 -0700 (Fri, 04 Jun 2010) | 2 lines

Issue 1975: Add documentation of the AllowSubstExceptions() function
to the User's Guide. (Jim Randall)
................
r4952 | bdbaddog | 2010-06-04 20:18:15 -0700 (Fri, 04 Jun 2010) | 4 lines

Re-enable tests on non win32 platforms.
This should alter the HOST_ARCH for these tests on non-x86 platforms to x86 and therefore run.
................
r4953 | bdbaddog | 2010-06-04 23:12:54 -0700 (Fri, 04 Jun 2010) | 3 lines

Fix tests on win32
................
r4954 | gregnoel | 2010-06-05 01:38:21 -0700 (Sat, 05 Jun 2010) | 1 line

The re_escape() function escapes too little. Blind fix for a Windows problem.
................
r4955 | gregnoel | 2010-06-05 02:43:21 -0700 (Sat, 05 Jun 2010) | 3 lines

Oops, backslash must be done first, or backslashes from previous substitutions
will be quoted.
................
r4956 | stevenknight | 2010-06-05 06:42:53 -0700 (Sat, 05 Jun 2010) | 1 line

Fix an AllowSubstExceptions() typo in the User's Guide update.
................
r4957 | stevenknight | 2010-06-05 07:03:28 -0700 (Sat, 05 Jun 2010) | 1 line

Fix a ripple effect from the change to TestSCons.re_escape().
................
r4958 | stevenknight | 2010-06-05 17:40:06 -0700 (Sat, 05 Jun 2010) | 11 lines

When trying to execute v[cs]*vars*.bat scripts to fetch the Visual
{C++,Studio} environment variables, propagate %COMSPEC% and any
%VS*COMNTOOLS% variables from os.environ, since they're outright
required for Express versions of the scripts (and maybe others) to
execute correctly. Only propagate the values if they're not manually
set in the ENV execution environment.

Additionally, if the script execution put anything on stderr, propagate
it to our stderr so we don't swallow errors. (Unfortunately, errors
don't necessarily cause these scripts to exit non-zero.)
................
r4959 | stevenknight | 2010-06-05 17:48:58 -0700 (Sat, 05 Jun 2010) | 3 lines

Windows portability fixes in various tests. Fix runtest.py detection
of non-zero exit status on systems that don't have os.WEXITSTATUS().
................
r4960 | stevenknight | 2010-06-05 17:54:20 -0700 (Sat, 05 Jun 2010) | 2 lines

Restore the __COPYRIGHT__ and __FILE__ header lines.
................
r4961 | stevenknight | 2010-06-05 19:00:29 -0700 (Sat, 05 Jun 2010) | 4 lines

Explicitly initialize the construction environment with tools = ['mssdk',
'msvc', 'mslink', 'midl'], so the test can actually find and compile
against things like the atlbase.h file.
................
r4962 | bdbaddog | 2010-06-05 20:23:17 -0700 (Sat, 05 Jun 2010) | 3 lines

Update release notes to include note about MSVC/VS/SDK improvements
................
r4966 | bdbaddog | 2010-06-05 21:36:43 -0700 (Sat, 05 Jun 2010) | 9 lines

Merged revisions 4964 via svnmerge from
http://scons.tigris.org/svn/scons/checkpoint/trunk

........
r4964 | bdbaddog | 2010-06-05 21:09:54 -0700 (Sat, 05 Jun 2010) | 3 lines

Changes for 2.0.0.beta.20100605 checkpoint release.
........
................
r4969 | bdbaddog | 2010-06-05 22:29:09 -0700 (Sat, 05 Jun 2010) | 2 lines

Update with 2.0.0.beta.20100605 info
................
r4978 | bdbaddog | 2010-06-06 17:30:13 -0700 (Sun, 06 Jun 2010) | 2 lines

Add 1.3.0.d20100606 checkpoint info
................
r4980 | gregnoel | 2010-06-06 18:03:58 -0700 (Sun, 06 Jun 2010) | 8 lines

For some reason, using the `imp` module to do imports doesn't do quite the
same thing as using the 'import' statement, even though the documentation
clearly says that the 'import' statement uses the 'imp' module under the
covers. I have no clue why, but there were some cases where it made a
difference. The code was changed to using 'imp' to prevent the fixers
from trying to convert the old names to the new names, so this changeset
uses a different technique to hide the old names.
................
r4981 | gregnoel | 2010-06-07 02:33:56 -0700 (Mon, 07 Jun 2010) | 12 lines

Initial drop of bin/update-release-info.py.

This program automates the process of inserting the release configuration
information that is currently done by hand. The configuration data now
all lives in a file, 'ReleaseConfig'. Change the configuration file, run
the program, and, hey presto, the files are updated.

More work needs to be done; the documentation doesn't quite match with the
program and the regression tests only cover the release flows, but it's
important to get this stuff out before the next release is published so
people can start using it.
................
r4983 | stevenknight | 2010-06-07 09:24:19 -0700 (Mon, 07 Jun 2010) | 1 line

Don't skip runtest.py tests on systems that don't have QMTest installed.
................
r4985 | stevenknight | 2010-06-07 11:33:47 -0700 (Mon, 07 Jun 2010) | 2 lines

Windows portability: \ separators in the expected output.
................
r4986 | stevenknight | 2010-06-07 11:41:10 -0700 (Mon, 07 Jun 2010) | 6 lines

Architecture canonicalization fixes:
* Lower-case the *_platform values to handle Pythons that return
upper-case values like 'AMD64'.
* Add "i[456]86" entries to the canonicalization dictionary.
* Sort and reformat the dictionary for readability.
................
r4987 | gregnoel | 2010-06-07 11:58:42 -0700 (Mon, 07 Jun 2010) | 10 lines

Fixed a bug in the regression test to use the right filenames for each
platform; it was causing the test to fail on Windows.

Added some documentation to bin/update-release-info.py.

In my last log message, I forgot to mention that QMTest/TestRuntest.py was
tweaked to make it less specialized for testing runtest.py. It can now be
used to test other programs; in this case, bin/update-release-info.py. The
defaults are unchanged so that it will normally test runtest.py.
................
r4988 | stevenknight | 2010-06-07 17:59:05 -0700 (Mon, 07 Jun 2010) | 1 line

Update src/CHANGES.txt for the upper-case-platform fix.
................
r4989 | gregnoel | 2010-06-07 21:17:01 -0700 (Mon, 07 Jun 2010) | 1 line

Add a src/CHANGES.txt entry for the problem with is_Dict()
................
r4992 | stevenknight | 2010-06-07 22:48:50 -0700 (Mon, 07 Jun 2010) | 1 line

Minor User's Guide updates: copyright years, deprecated features, TODOs that have been documented.
................
r4993 | stevenknight | 2010-06-07 23:36:47 -0700 (Mon, 07 Jun 2010) | 2 lines

Test fixes for Solaris, notably making test/Actions/function.py print
intermediate messages to avoid buildbot hangs.
................
r4994 | gregnoel | 2010-06-08 00:50:14 -0700 (Tue, 08 Jun 2010) | 1 line

Remove the rest of the logic for the noqmtest keyword
................
r4999 | stevenknight | 2010-06-08 10:42:45 -0700 (Tue, 08 Jun 2010) | 7 lines

More Solaris test fixes:
* Different messages and exit codes for errors.
* Fix Solaris shared suffixes.
* Add a function declaration to some in-line C code to avoid a warning
from Sun's compiler.
* Make test/Parallel/multiple-parents.py chatty to avoid hangs, and
reduce how many times it calls SCons just to make it go a little quicker.
................
r5003 | gregnoel | 2010-06-08 16:37:17 -0700 (Tue, 08 Jun 2010) | 1 line

Changes to publish the SCons 2.0.0.candidate.20100607 release
................
r5004 | gregnoel | 2010-06-09 03:28:10 -0700 (Wed, 09 Jun 2010) | 2 lines

Wrong date in highlights information.
................
r5005 | stevenknight | 2010-06-09 06:24:26 -0700 (Wed, 09 Jun 2010) | 2 lines

Add missing "print" to the warning about: not building scons-src-* packages.
................
r5007 | stevenknight | 2010-06-09 22:25:10 -0700 (Wed, 09 Jun 2010) | 1 line

Move test/update-release-info.py to src/test_update-release-info.py.
................
r5008 | stevenknight | 2010-06-10 01:19:53 -0700 (Thu, 10 Jun 2010) | 10 lines

Increase the default timeout of TestSCons.wait_for() to 20.0 seconds.
(--interactive mode on our Solaris buildbot slave takes longer than
10 seconds to create the necessary marker files.)

Set the stdin attribute on our popen object to None after we close it,
so some versions of subprocess.py don't try to write it after it's closed.

If we time out waiting for a marker file to be created, then print any
stdout or stderr that's already accumulated, since that may give clues
about why the test failed.
................
r5009 | stevenknight | 2010-06-10 06:23:26 -0700 (Thu, 10 Jun 2010) | 1 line

More Solaris test fixes.
................
r5010 | stevenknight | 2010-06-10 09:50:46 -0700 (Thu, 10 Jun 2010) | 1 line

Windows portability.
................
r5011 | gregnoel | 2010-06-10 21:20:56 -0700 (Thu, 10 Jun 2010) | 1 line

Move update-release-info.py from src/ to tests/update_release-info/
................
r5019 | stevenknight | 2010-06-14 17:03:40 -0700 (Mon, 14 Jun 2010) | 1 line

Update install_scons.py to work on Windows.
................
r5020 | gregnoel | 2010-06-14 19:11:02 -0700 (Mon, 14 Jun 2010) | 4 lines

Add the warning about the regression in 1.3 that's carried over into 2.0.
Since the problem has a viable workaround, it was not deemed worth delaying
the 2.0 release.
................
r5026 | gregnoel | 2010-06-15 00:56:08 -0700 (Tue, 15 Jun 2010) | 1 line

Update web site for 2.0.0.final.0
................
r5027 | gregnoel | 2010-06-15 01:24:00 -0700 (Tue, 15 Jun 2010) | 7 lines

This changeset increments the trunk to the next minor level, 2.1.0, and
updates the dates and other information in the files to have the right
base values.

With this changeset, 2.0.0 is history and a new era has begun. It's
time to celebrate; anybody want a beer?
................
r5028 | stevenknight | 2010-06-15 06:13:18 -0700 (Tue, 15 Jun 2010) | 2 lines

Update with recent checkpoints and 2.0.0.final.0 (yay!).
................

  • Participants
  • Parent commits 0dec660
  • Branches pending

Comments (0)

Files changed (83)

File QMTest/TestCommon.py

View file
 elif sys.platform.find('sunos') != -1:
     exe_suffix   = ''
     obj_suffix   = '.o'
-    shobj_suffix = '.os'
+    shobj_suffix = '.o'
     shobj_prefix = 'so_'
     lib_prefix   = 'lib'
     lib_suffix   = '.a'
     dll_prefix   = 'lib'
-    dll_suffix   = '.dylib'
+    dll_suffix   = '.so'
 else:
     exe_suffix   = ''
     obj_suffix   = '.o'

File QMTest/TestRuntest.py

View file
         temporary directory, duplicating how this test infrastructure
         appears in a normal workspace.
         """
-        set_workpath_runtest = None
         if 'program' not in kw:
             kw['program'] = 'runtest.py'
-            set_workpath_runtest = 1
         if 'interpreter' not in kw:
             kw['interpreter'] = [python, '-tt']
         if 'match' not in kw:
             kw['workdir'] = ''
 
         try:
-            noqmtest = kw['noqmtest']
+            things_to_copy = kw['things_to_copy']
         except KeyError:
-            noqmtest = 0
+            things_to_copy = [
+                'runtest.py',
+                'QMTest',
+            ]
         else:
-            del kw['noqmtest']
+            del kw['things_to_copy']
 
         orig_cwd = os.getcwd()
         TestCommon.__init__(self, **kw)
-  
-        if not noqmtest:
-            qmtest = self.where_is('qmtest')
-            if not qmtest:
-                self.skip_test("Could not find 'qmtest'; skipping test(s).\n")
-
-        things_to_copy = [
-            'runtest.py',
-            'QMTest',
-        ]
 
         dirs = [os.environ.get('SCONS_RUNTEST_DIR', orig_cwd)]
         
                     copy_func(t, self.workpath(thing))
                     break
 
-        if set_workpath_runtest:
-            self.program_set(self.workpath('runtest.py'))
+        self.program_set(self.workpath(kw['program']))
 
         for key in os.environ.keys():
             if key[:5] == 'AEGIS':

File QMTest/TestSCons.py

View file
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.0.0'
+default_version = '2.1.0.alpha.yyyymmdd'
 
 copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010'
 
 
 # re.escape escapes too much.
 def re_escape(str):
-    for c in ['.', '[', ']', '(', ')', '*', '+', '?']:  # Not an exhaustive list.
+    for c in '\\.[]()*+?':   # Not an exhaustive list.
         str = str.replace(c, '\\' + c)
     return str
 
             restore_sconsflags(sconsflags)
         return p
 
-    def wait_for(self, fname, timeout=10.0, popen=None):
+    def wait_for(self, fname, timeout=20.0, popen=None):
         """
         Waits for the specified file name to exist.
         """
                 sys.stderr.write('timed out waiting for %s to exist\n' % fname)
                 if popen:
                     popen.stdin.close()
+                    popen.stdin = None
                     self.status = 1
                     self.finish(popen)
+                stdout = self.stdout()
+                if stdout:
+                    sys.stdout.write(self.banner('STDOUT ') + '\n')
+                    sys.stdout.write(stdout)
+                stderr = self.stderr()
+                if stderr:
+                    sys.stderr.write(self.banner('STDERR ') + '\n')
+                    sys.stderr.write(stderr)
                 self.fail_test()
             time.sleep(1.0)
             waited = waited + 1.0

File QMTest/TestSConsMSVS.py

View file
 
 import os
 import sys
+import platform
 
 from TestSCons import *
 from TestSCons import __all__
 '''
 
 SConscript_contents_6_0 = """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='6.0')
+env=Environment(platform='win32', tools=['msvs'],
+                MSVS_VERSION='6.0',HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test.c']
 testincs = ['sdk.h']
 """
 
 SConscript_contents_7_0 = """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.0')
+env=Environment(platform='win32', tools=['msvs'],
+                MSVS_VERSION='7.0',HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test1.cpp', 'test2.cpp']
 testincs = ['sdk.h']
 """
 
 SConscript_contents_7_1 = """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.1')
+env=Environment(platform='win32', tools=['msvs'],
+                MSVS_VERSION='7.1',HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test1.cpp', 'test2.cpp']
 testincs = ['sdk.h']
 SConscript_contents_8_0 = """\
 env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='8.0',
                 CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
-                CPPPATH=['inc1', 'inc2'])
+                CPPPATH=['inc1', 'inc2'],
+                HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test1.cpp', 'test2.cpp']
 testincs = ['sdk.h']
         finally:
             os.environ['SCONSFLAGS'] = save_sconsflags or ''
         return result
+    
+    def get_vs_host_arch(self):
+        """ Get an MSVS, SDK , and/or MSVS acceptable platform arch
+        """
+        
+        # Dict to 'canonalize' the arch
+        _ARCH_TO_CANONICAL = {
+            "x86": "x86",
+            "amd64": "amd64",
+            "i386": "x86",
+            "emt64": "amd64",
+            "x86_64": "amd64",
+            "itanium": "ia64",
+            "ia64": "ia64",
+        }
+
+        host_platform = platform.machine()
+        # TODO(2.5):  the native Python platform.machine() function returns
+        # '' on all Python versions before 2.6, after which it also uses
+        # PROCESSOR_ARCHITECTURE.
+        if not host_platform:
+            host_platform = os.environ.get('PROCESSOR_ARCHITECTURE', '')
+                
+            
+        try:
+            host = _ARCH_TO_CANONICAL[host_platform]
+        except KeyError, e:
+            # Default to x86 for all other platforms
+            host = 'x86'
+    
+   
+        return host
 
 # Local Variables:
 # tab-width:4

File README

View file
-# __COPYRIGHT__
-
                  SCons - a software construction tool
 
 Welcome to the SCons development tree.  The real purpose of this tree
         build/dist/scons-2.0.0-1.noarch.rpm
         build/dist/scons-2.0.0-1.src.rpm
         build/dist/scons-2.0.0.linux-i686.tar.gz
-        build/dist/scons-2.0.0.tar.gz
-        build/dist/scons-2.0.0.win32.exe
-        build/dist/scons-2.0.0.zip
-        build/dist/scons-doc-2.0.0.tar.gz
-        build/dist/scons-local-2.0.0.tar.gz
-        build/dist/scons-local-2.0.0.zip
-        build/dist/scons-src-2.0.0.tar.gz
-        build/dist/scons-src-2.0.0.zip
+        build/dist/scons-2.1.0.alpha.yyyymmdd.tar.gz
+        build/dist/scons-2.1.0.alpha.yyyymmdd.win32.exe
+        build/dist/scons-2.1.0.alpha.yyyymmdd.zip
+        build/dist/scons-doc-2.1.0.alpha.yyyymmdd.tar.gz
+        build/dist/scons-local-2.1.0.alpha.yyyymmdd.tar.gz
+        build/dist/scons-local-2.1.0.alpha.yyyymmdd.zip
+        build/dist/scons-src-2.1.0.alpha.yyyymmdd.tar.gz
+        build/dist/scons-src-2.1.0.alpha.yyyymmdd.zip
         build/dist/scons_1.3.0-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to
         Anthony Roach
         Greg Spencer
         Christoph Wiedemann
+
+__COPYRIGHT__

File ReleaseConfig

View file
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+# The version tuple that will be used for the release.  The fields are
+# (major, minor, micro, type, patchlevel).  The release level is one of
+# 'alpha', 'beta', 'candidate', or 'final'.  If the release type is not
+# 'final', the patchlevel is set to the release date.  This value is
+# manatory and must be present in this file.
+version_tuple = (2, 1, 0, 'alpha', 0)
+
+# Python versions prior to unsupported_python_version cause a fatal error
+# when that version is used.  Python versions prior to deprecate_python_version
+# cause a warning to be issued (assuming it's not disabled).  These values are
+# mandatory and must be present in the configuration file.
+unsupported_python_version = (2, 3, 0)
+deprecated_python_version = (2, 4, 0)
+
+# If release_date is (yyyy, mm, dd, hh, mm, ss), that is used as the release
+# date and time.  If release_date is (yyyy, mm, dd), it is used for the
+# release date and the current time is used for the release timetime.  If
+# release_date is not given, the current date and time are used.
+#release_date = (2012, 12, 21)
+
+# If month_year is not given, the release month and year are used.
+#month_year = 'December 2012'
+
+# If copyright years is not given, the release year is used as the end.
+#copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010'
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:

File SConstruct

View file
 copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'May 2010'
+month_year = 'MONTH YEAR'
 
 #
 # __COPYRIGHT__
 import tempfile
 
 project = 'scons'
-default_version = '2.0.0'
+default_version = '2.1.0.alpha.yyyymmdd'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
     sentries = [l.split()[-1] for l in slines]
     sfiles = list(filter(os.path.isfile, sentries))
 else:
-   "Not building in a Mercurial or Subversion tree; skipping building src package."
+   print "Not building in a Mercurial or Subversion tree; skipping building src package."
 
 if sfiles:
     remove_patterns = [

File bin/install_scons.py

View file
 import os
 import shutil
 import sys
+import tarfile
+import urllib
 
 from Command import CommandRunner, Usage
 
     '1.3.0',
     '1.3.0.d20100404',
     '1.3.0.d20100501',
+    '1.3.0.d20100523',
+    '1.3.0.d20100606',
     '2.0.0.alpha.20100508',
+    '2.0.0.beta.20100531',
+    '2.0.0.beta.20100605',
+    '2.0.0.final.0',
 ]
 
 def main(argv=None):
     all = False
     downloads_dir = 'Downloads'
     downloads_url = 'http://downloads.sourceforge.net/scons'
-    sudo = 'sudo'
-    prefix = '/usr/local'
+    if sys.platform == 'win32':
+        sudo = ''
+        prefix = sys.prefix
+    else:
+        sudo = 'sudo'
+        prefix = '/usr/local'
     python = sys.executable
 
     short_options = 'ad:hnp:q'
     for version in args:
         scons = 'scons-' + version
         tar_gz = os.path.join(downloads_dir, scons + '.tar.gz')
-        tar_gz_url = os.path.join(downloads_url, scons + '.tar.gz')
+        tar_gz_url = "%s/%s.tar.gz" % (downloads_url, scons)
 
         cmd.subst_dictionary(locals())
 
         if not os.path.exists(tar_gz):
             if not os.path.exists(downloads_dir):
                 cmd.run('mkdir %(downloads_dir)s')
-            cmd.run('wget -O %(tar_gz)s %(tar_gz_url)s')
+            cmd.run((urllib.urlretrieve, tar_gz_url, tar_gz),
+                    'wget -O %(tar_gz)s %(tar_gz_url)s')
 
-        cmd.run('tar zxf %(tar_gz)s')
+        def extract(tar_gz):
+            tarfile.open(tar_gz, "r:gz").extractall()
+        cmd.run((extract, tar_gz), 'tar zxf %(tar_gz)s')
 
         cmd.run('cd %(scons)s')
 

File bin/scons-doc.py

View file
         try:
             f = open(filename, 'r')
         except EnvironmentError, e:
-            sys.stderr.write('%s: %s\n' % (filename, msg))
+            sys.stderr.write('%s: %s\n' % (filename, e))
             return 1
 
     data = f.read()

File bin/update-release-info.py

View file
+#!/usr/bin/env python
+"""
+This program takes information about a release in the ReleaseConfig file
+and inserts the information in various files.  It helps to keep the files
+in sync because it never forgets which files need to be updated, nor what
+information should be inserted in each file.
+
+It takes one parameter that says what the mode of update should be, which
+may be one of 'develop', 'release', or 'post'.
+
+In 'develop' mode, which is what someone would use as part of their own
+development practices, the release type is forced to be 'alpha' and the
+patch level is the string 'yyyymmdd'.  Otherwise, it's the same as the
+'release' mode.
+
+In 'release' mode, the release type is taken from ReleaseConfig and the
+patch level is calculated from the release date for non-final runs and
+taken from the version tuple for final runs.  It then inserts information
+in various files:
+  - The RELEASE header line in src/CHANGES.txt and src/Announce.txt.
+  - The version string at the top of src/RELEASE.txt.
+  - The version string in the 'default_version' variable in SConstruct
+    and QMTest/TestSCons.py.
+  - The copyright years in SConstruct and QMTest/TestSCons.py.
+  - The month and year (used for documentation) in SConstruct.
+  - The unsupported and deprecated Python floors in QMTest/TestSCons.py
+    and src/engine/SCons/Script/Main.py
+  - The version string in the filenames in README.
+
+In 'post' mode, files are prepared for the next release cycle:
+  - In ReleaseConfig, the version tuple is updated for the next release
+    by incrementing the release number (either minor or micro, depending
+    on the branch) and resetting release type to 'alpha'.
+  - A blank template replaces src/RELEASE.txt.
+  - A new section to accumulate changes is added to src/CHANGES.txt and
+    src/Announce.txt.
+"""
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import sys
+import time
+import re
+
+DEBUG = os.environ.get('DEBUG', 0)
+
+# Evaluate parameter
+
+if len(sys.argv) < 2:
+    mode = 'develop'
+else:
+    mode = sys.argv[1]
+    if mode not in ['develop', 'release', 'post']:
+        print("""ERROR: `%s' as a parameter is invalid; it must be one of
+\tdevelop, release, or post.  The default is develop.""" % mode)
+        sys.exit(1)
+
+# Get configuration information
+
+config = dict()
+exec open('ReleaseConfig').read() in globals(), config
+
+try:
+    version_tuple = config['version_tuple']
+    unsupported_version = config['unsupported_python_version']
+    deprecated_version = config['deprecated_python_version']
+except KeyError:
+    print('''ERROR: Config file must contain at least version_tuple,
+\tunsupported_python_version, and deprecated_python_version.''')
+    sys.exit(1)
+if DEBUG: print 'version tuple', version_tuple
+if DEBUG: print 'unsupported Python version', unsupported_version
+if DEBUG: print 'deprecated Python version', deprecated_version
+
+try:
+    release_date = config['release_date']
+except KeyError:
+    release_date = time.localtime()[:6]
+else:
+    if len(release_date) == 3:
+        release_date = release_date + time.localtime()[3:6]
+    if len(release_date) != 6:
+        print '''ERROR: Invalid release date''', release_date
+        sys.exit(1)
+if DEBUG: print 'release date', release_date
+
+if mode == 'develop' and version_tuple[3] != 'alpha':
+    version_tuple ==  version_tuple[:3] + ('alpha', 0)
+if version_tuple[3] != 'final':
+    if mode == 'develop':
+        version_tuple = version_tuple[:4] + ('yyyymmdd',)
+    else:
+        yyyy,mm,dd,_,_,_ = release_date
+        version_tuple = version_tuple[:4] + ((yyyy*100 + mm)*100 + dd,)
+version_string = '.'.join(map(str, version_tuple))
+version_type = version_tuple[3]
+if DEBUG: print 'version string', version_string
+
+if version_type not in ['alpha', 'beta', 'candidate', 'final']:
+    print("""ERROR: `%s' is not a valid release type in version tuple;
+\tit must be one of alpha, beta, candidate, or final""" % version_type)
+    sys.exit(1)
+
+try:
+    month_year = config['month_year']
+except KeyError:
+    if version_type == 'alpha':
+        month_year = 'MONTH YEAR'
+    else:
+        month_year =  time.strftime('%B %Y', release_date + (0,0,0))
+if DEBUG: print 'month year', month_year
+
+try:
+    copyright_years = config['copyright_years']
+except KeyError:
+    copyright_years = ', '.join(map(str, list(range(2001, release_date[0] + 1))))
+if DEBUG: print 'copyright years', copyright_years
+
+class UpdateFile(object):
+    """
+    XXX
+    """
+
+    def __init__(self, file, orig = None):
+        '''
+        '''
+        if orig is None: orig = file
+        try:
+            self.content = open(orig, 'rU').read()
+        except IOError:
+            # Couldn't open file; don't try to write anything in __del__
+            self.file = None
+            raise
+        else:
+            self.file = file
+            if file == orig:
+                # so we can see if it changed
+                self.orig = self.content
+            else:
+                # pretend file changed
+                self.orig = ''
+
+    def sub(self, pattern, replacement, count = 1):
+        '''
+        XXX
+        '''
+        self.content = re.sub(pattern, replacement, self.content, count)
+
+    def replace_assign(self, name, replacement, count = 1):
+        '''
+        XXX
+        '''
+        self.sub('\n' + name + ' = .*', '\n' + name + ' = ' + replacement)
+
+    # Determine the pattern to match a version
+
+    _rel_types = '(alpha|beta|candidate|final)'
+    match_pat = '\d+\.\d+\.\d+\.' + _rel_types + '\.(\d+|yyyymmdd)'
+    match_rel = re.compile(match_pat)
+
+    def replace_version(self, replacement = version_string, count = 1):
+        '''
+        XXX
+        '''
+        self.content = self.match_rel.sub(replacement, self.content, count)
+
+    # Determine the release date and the pattern to match a date
+    # Mon, 05 Jun 2010 21:17:15 -0700
+    # NEW DATE WILL BE INSERTED HERE
+
+    if mode == 'develop':
+        new_date = 'NEW DATE WILL BE INSERTED HERE'
+    else:
+        min = (time.daylight and time.altzone or time.timezone)//60
+        hr = min//60
+        min = -(min%60 + hr*100)
+        new_date =  (time.strftime('%a, %d %b %Y %X', release_date + (0,0,0))
+                         + ' %+.4d' % min)
+
+    _days = '(Sun|Mon|Tue|Wed|Thu|Fri|Sat)'
+    _months = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oce|Nov|Dec)'
+    match_date = _days+', \d\d '+_months+' \d\d\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d'
+    match_date = re.compile(match_date)
+
+    def replace_date(self, replacement = new_date, count = 1):
+        '''
+        XXX
+        '''
+        self.content = self.match_date.sub(replacement, self.content, count)
+
+    def __del__(self):
+        '''
+        XXX
+        '''
+        if self.file is not None and self.content != self.orig:
+            print 'Updating ' + self.file + '...'
+            open(self.file, 'w').write(self.content)
+
+if mode == 'post':
+    # Set up for the next release series.
+
+    if version_tuple[2]:
+        # micro release, increment micro value
+        minor = version_tuple[1]
+        micro = version_tuple[2] + 1
+    else:
+        # minor release, increment minor value
+        minor = version_tuple[1] + 1
+        micro = 0
+    new_tuple = (version_tuple[0], minor, micro, 'alpha', 0)
+    new_version = '.'.join(map(str, new_tuple[:4])) + '.yyyymmdd'
+
+    # Update ReleaseConfig
+
+    t = UpdateFile('ReleaseConfig')
+    if DEBUG: t.file = '/tmp/ReleaseConfig'
+    t.replace_assign('version_tuple', str(new_tuple))
+
+    # Update src/CHANGES.txt
+
+    t = UpdateFile(os.path.join('src', 'CHANGES.txt'))
+    if DEBUG: t.file = '/tmp/CHANGES.txt'
+    t.sub('(\nRELEASE .*)', r"""\nRELEASE  VERSION/DATE TO BE FILLED IN LATER\n
+  From John Doe:\n
+    - Whatever John Doe did.\n
+\1""")
+
+    # Update src/RELEASE.txt
+
+    t = UpdateFile(os.path.join('src', 'RELEASE.txt'),
+                   os.path.join('template', 'RELEASE.txt'))
+    if DEBUG: t.file = '/tmp/RELEASE.txt'
+    t.replace_version(new_version)
+
+    # Update src/Announce.txt
+
+    t = UpdateFile(os.path.join('src', 'Announce.txt'))
+    if DEBUG: t.file = '/tmp/Announce.txt'
+    t.sub('\nRELEASE .*', '\nRELEASE VERSION/DATE TO BE FILLED IN LATER')
+    announce_pattern = """(
+  Please note the following important changes scheduled for the next
+  release:
+)"""
+    announce_replace = (r"""\1
+    --  FEATURE THAT WILL CHANGE\n
+  Please note the following important changes since release """
+            + '.'.join(map(str, version_tuple[:3])) + ':\n')
+    t.sub(announce_pattern, announce_replace)
+
+    # Write out the last update and exit
+
+    t = None
+    sys.exit()
+
+# Update src/CHANGES.txt
+
+t = UpdateFile(os.path.join('src', 'CHANGES.txt'))
+if DEBUG: t.file = '/tmp/CHANGES.txt'
+t.sub('\nRELEASE .*', '\nRELEASE ' + version_string + ' - ' + t.new_date)
+
+# Update src/RELEASE.txt
+
+t = UpdateFile(os.path.join('src', 'RELEASE.txt'))
+if DEBUG: t.file = '/tmp/RELEASE.txt'
+t.replace_version()
+
+# Update src/Announce.txt
+
+t = UpdateFile(os.path.join('src', 'Announce.txt'))
+if DEBUG: t.file = '/tmp/Announce.txt'
+t.sub('\nRELEASE .*', '\nRELEASE ' + version_string + ' - ' + t.new_date)
+
+# Update SConstruct
+
+t = UpdateFile('SConstruct')
+if DEBUG: t.file = '/tmp/SConstruct'
+t.replace_assign('month_year', repr(month_year))
+t.replace_assign('copyright_years', repr(copyright_years))
+t.replace_assign('default_version', repr(version_string))
+
+# Update README
+
+t = UpdateFile('README')
+if DEBUG: t.file = '/tmp/README'
+t.sub('-' + t.match_pat + '\.', '-' + version_string + '.', count = 0)
+# the loop below can be removed after all 1.x.y releases are dead
+for suf in ['tar', 'win32', 'zip']:
+    t.sub('-(\d+\.\d+\.\d+)\.%s' % suf,
+          '-%s.%s' % (version_string, suf),
+          count = 0)
+
+# Update QMTest/TestSCons.py
+
+t = UpdateFile(os.path.join('QMTest', 'TestSCons.py'))
+if DEBUG: t.file = '/tmp/TestSCons.py'
+t.replace_assign('copyright_years', repr(copyright_years))
+t.replace_assign('default_version', repr(version_string))
+#??? t.replace_assign('SConsVersion', repr(version_string))
+t.replace_assign('python_version_unsupported', str(unsupported_version))
+t.replace_assign('python_version_deprecated', str(deprecated_version))
+
+# Update Script/Main.py
+
+t = UpdateFile(os.path.join('src', 'engine', 'SCons', 'Script', 'Main.py'))
+if DEBUG: t.file = '/tmp/Main.py'
+t.replace_assign('unsupported_python_version', str(unsupported_version))
+t.replace_assign('deprecated_python_version', str(deprecated_version))
+
+# Update doc/user/main.{in,xml}
+
+docyears = ', '.join(map(str, iter(range(2004, release_date[0] + 1))))
+t = UpdateFile(os.path.join('doc', 'user', 'main.in'))
+if DEBUG: t.file = '/tmp/main.in'
+## TODO debug these
+#t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>' + docyears + '</pubdate>')
+#t.sub('<year>[^<]*</year>', '<year>' + docyears + '</year>')
+
+t = UpdateFile(os.path.join('doc', 'user', 'main.xml'))
+if DEBUG: t.file = '/tmp/main.xml'
+## TODO debug these
+#t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>' + docyears + '</pubdate>')
+#t.sub('<year>[^<]*</year>', '<year>' + docyears + '</year>')
+
+# Write out the last update
+
+t = None
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:

File doc/scons.mod

View file
 <!ENTITY AddVariables "<function>AddVariables</function>">
 <!ENTITY Alias "<function>Alias</function>">
 <!ENTITY Aliases "<function>Aliases</function>">
+<!ENTITY AllowSubstExceptions "<function>AllowSubstExceptions</function>">
 <!ENTITY AlwaysBuild "<function>AlwaysBuild</function>">
 <!ENTITY Append "<function>Append</function>">
 <!ENTITY AppendENVPath "<function>AppendENVPath</function>">
 <!ENTITY File "<function>File</function>">
 <!ENTITY FindFile "<function>FindFile</function>">
 <!ENTITY FindInstalledFiles "<function>FindInstalledFiles</function>">
+<!ENTITY FindPathDirs "<function>FindPathDirs</function>">
 <!ENTITY Finish "<function>Finish</function>">
 <!ENTITY Flatten "<function>Flatten</function>">
 <!ENTITY GenerateHelpText "<function>GenerateHelpText</function>">
 <!ENTITY GetBuildFailures "<function>GetBuildFailures</function>">
+<!ENTITY GetBuildPath "<function>GetBuildPath</function>">
 <!ENTITY GetLaunchDir "<function>GetLaunchDir</function>">
 <!ENTITY GetOption "<function>GetOption</function>">
 <!ENTITY Glob "<function>Glob</function>">
 <!ENTITY TryRun "<function>TryRun</function>">
 
 
-<!-- Python functions -->
+<!-- Python functions and classes -->
+<!ENTITY IndexError "<classname>IndexError</classname>">
+<!ENTITY NameError "<classname>NameError</classname>">
 <!ENTITY str "<function>str</function>">
 <!ENTITY zipfile "<function>zipfile</function>">
 

File doc/user/command-line.in

View file
       These older names still work,
       and you may encounter them in older
       &SConscript; fles,
-      but their use is discouraged
-      and will be officially deprecated some day.
+      but they have been officially deprecated
+      as of &SCons; version 2.0.
 
       </para>
 

File doc/user/command-line.xml

View file
       These older names still work,
       and you may encounter them in older
       &SConscript; fles,
-      but their use is discouraged
-      and will be officially deprecated some day.
+      but they have been officially deprecated
+      as of &SCons; version 2.0.
 
       </para>
 

File doc/user/depends.in

View file
     &SCons; still supports two functions that used to be the
     primary methods for configuring the
     decision about whether or not an input file has changed.
-    Although they're not officially deprecated yet,
-    their use is discouraged,
+    These functions have been officially deprecated
+    as &SCons; version 2.0,
+    and their use is discouraged,
     mainly because they rely on a somewhat
     confusing distinction between how
     source files and target files are handled.
     These functions are documented here mainly in case you
-    encounter them in existing &SConscript; files.
+    encounter them in older &SConscript; files.
 
     </para>
   

File doc/user/depends.xml

View file
     &SCons; still supports two functions that used to be the
     primary methods for configuring the
     decision about whether or not an input file has changed.
-    Although they're not officially deprecated yet,
-    their use is discouraged,
+    These functions have been officially deprecated
+    as &SCons; version 2.0,
+    and their use is discouraged,
     mainly because they rely on a somewhat
     confusing distinction between how
     source files and target files are handled.
     These functions are documented here mainly in case you
-    encounter them in existing &SConscript; files.
+    encounter them in older &SConscript; files.
 
     </para>
   

File doc/user/environments.in

View file
     </section>
 
     <section>
+    <title>Handling Problems With Value Expansion</title>
+
+      <para>
+
+      If a problem occurs when expanding a construction variable,
+      by default it is expanded to <literal>''</literal>
+      (a null string), and will not cause scons to fail. 
+      
+       <scons_example name="missing1">
+         <file name="SConstruct" printme="1">
+          env = Environment()
+          print "value is:", env.subst( '->$MISSING<-' )
+        </file>
+      </scons_example>
+
+       <scons_output example="missing1">
+          <scons_output_command>scons -Q</scons_output_command>
+       </scons_output>
+      
+      This default behaviour can be changed using the &AllowSubstExceptions;
+      function.
+      When a problem occurs with a variable expansion it generates
+      an exception, and the &AllowSubstExceptions; function controls
+      which of these exceptions are actually fatal and which are
+      allowed to occur safely.   By default, &NameError; and &IndexError;
+      are the two exceptions that are allowed to occur: so instead of
+      causing scons to fail, these are caught, the variable expanded to
+      <literal>''</literal>
+      and scons execution continues.
+      To require that all construction variable names exist, and that
+      indexes out of range are not allowed, call &AllowSubstExceptions;
+      with no extra arguments.
+      </para>
+
+       <scons_example name="missing2">
+         <file name="SConstruct" printme="1">
+          AllowSubstExceptions()
+          env = Environment()
+          print "value is:", env.subst( '->$MISSING<-' )
+        </file>
+      </scons_example>
+
+       <scons_output example="missing2">
+          <scons_output_command>scons -Q</scons_output_command>
+       </scons_output>
+
+      <para>
+      This can also be used to allow other exceptions that might occur,
+      most usefully with the <literal>${...}</literal> construction
+      variable syntax.  For example, this would allow zero-division to
+      occur in a variable expansion in addition to the default exceptions
+      allowed
+      </para>
+
+       <scons_example name="missing3">
+         <file name="SConstruct" printme="1">
+          AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
+          env = Environment()
+          print "value is:", env.subst( '->${1 / 0}<-' )
+        </file>
+      </scons_example>
+
+       <scons_output example="missing3">
+          <scons_output_command>scons -Q</scons_output_command>
+       </scons_output>
+      <sconstruct>
+      </sconstruct>
+
+      <para>
+      If &AllowSubstExceptions; is called multiple times, each call
+      completely overwrites the previous list of allowed exceptions.
+      </para>
+
+    </section>
+
+    <section>
     <title>Controlling the Default &ConsEnv;:  the &DefaultEnvironment; Function</title>
 
       <para>

File doc/user/environments.xml

View file
     </section>
 
     <section>
+    <title>Handling Problems With Value Expansion</title>
+
+      <para>
+
+      If a problem occurs when expanding a construction variable,
+      by default it is expanded to <literal>''</literal>
+      (a null string), and will not cause scons to fail. 
+      
+       <programlisting>
+          env = Environment()
+          print "value is:", env.subst( '-&gt;$MISSING&lt;-' )
+      </programlisting>
+
+       <screen>
+          % <userinput>scons -Q</userinput>
+          value is: -&gt;&lt;-
+          scons: `.' is up to date.
+       </screen>
+      
+      This default behaviour can be changed using the &AllowSubstExceptions;
+      function.
+      When a problem occurs with a variable expansion it generates
+      an exception, and the &AllowSubstExceptions; function controls
+      which of these exceptions are actually fatal and which are
+      allowed to occur safely.   By default, &NameError; and &IndexError;
+      are the two exceptions that are allowed to occur: so instead of
+      causing scons to fail, these are caught, the variable expanded to
+      <literal>''</literal>
+      and scons execution continues.
+      To require that all construction variable names exist, and that
+      indexes out of range are not allowed, call &AllowSubstExceptions;
+      with no extra arguments.
+      </para>
+
+       <programlisting>
+          AllowSubstExceptions()
+          env = Environment()
+          print "value is:", env.subst( '-&gt;$MISSING&lt;-' )
+      </programlisting>
+
+       <screen>
+          % <userinput>scons -Q</userinput>
+          value is:
+          scons: *** NameError `MISSING' trying to evaluate `$MISSING'
+          File "/home/my/project/SConstruct", line 3, in &lt;module&gt;
+       </screen>
+
+      <para>
+      This can also be used to allow other exceptions that might occur,
+      most usefully with the <literal>${...}</literal> construction
+      variable syntax.  For example, this would allow zero-division to
+      occur in a variable expansion in addition to the default exceptions
+      allowed
+      </para>
+
+       <programlisting>
+          AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
+          env = Environment()
+          print "value is:", env.subst( '-&gt;${1 / 0}&lt;-' )
+      </programlisting>
+
+       <screen>
+          % <userinput>scons -Q</userinput>
+          value is: -&gt;&lt;-
+          scons: `.' is up to date.
+       </screen>
+      <programlisting>
+      </programlisting>
+
+      <para>
+      If &AllowSubstExceptions; is called multiple times, each call
+      completely overwrites the previous list of allowed exceptions.
+      </para>
+
+    </section>
+
+    <section>
     <title>Controlling the Default &ConsEnv;:  the &DefaultEnvironment; Function</title>
 
       <para>

File doc/user/main.in

View file
 
   <!--
 
-  XXX FindFile()
-  XXX FindPathDirs()
-  XXX GetBuildPath()
-  XXX GetLaunchDir()
-
-  XXX ParseDepends()
   XXX Platform()
-  XXX SConsignFile()
   XXX Tools()
 
   XXX GetOption('duplicate')
 
     <edition>Revision &buildrevision; (&builddate;)</edition>
 
-    <pubdate>2004, 2005, 2006, 2007, 2008</pubdate>
+    <pubdate>2004, 2005, 2006, 2007, 2008, 2009, 2010</pubdate>
 
     <copyright>
-      <year>2004, 2005, 2006, 2007, 2008</year>
+      <year>2004, 2005, 2006, 2007, 2008, 2009, 2010</year>
       <holder>Steven Knight</holder>
     </copyright>
 

File doc/user/main.xml

View file
 
   <!--
 
-  XXX FindFile()
-  XXX FindPathDirs()
-  XXX GetBuildPath()
-  XXX GetLaunchDir()
-
-  XXX ParseDepends()
   XXX Platform()
-  XXX SConsignFile()
   XXX Tools()
 
   XXX GetOption('duplicate')

File doc/user/nodes.in

View file
 
   </section>
 
+  <section>
+  <title>&GetBuildPath;: Getting the Path From a &Node; or String</title>
+
+    <para>
+
+    <function>env.GetBuildPath(file_or_list)</function>
+    returns the path of a &Node; or a string representing a
+    path.  It can also take a list of &Node;s and/or strings, and
+    returns the list of paths.  If passed a single &Node;, the result
+    is the same as calling <literal>str(node)</literal> (see above).
+    The string(s) can have embedded construction variables, which are
+    expanded as usual, using the calling environment's set of
+    variables.  The paths can be files or directories, and do not have
+    to exist.
+
+    </para>
+
+    <scons_example name="GetBuildPath">
+      <file name="SConstruct" printme="1">
+      env=Environment(VAR="value")
+      n=File("foo.c")
+      print env.GetBuildPath([n, "sub/dir/$VAR"])
+      </file>
+    </scons_example>
+
+    <para>
+
+    Would print the following file names:
+
+    </para>
+
+    <scons_output example="GetBuildPath" os="posix">
+      <scons_output_command>scons -Q</scons_output_command>
+    </scons_output>
+
+    <para>
+
+    There is also a function version of &GetBuildPath; which can
+    be called without an &Environment;; that uses the default SCons
+    &Environment; to do substitution on any string arguments.
+
+    </para>
+
+  </section>
+
   <!--
 
   <section>

File doc/user/nodes.xml

View file
 
   </section>
 
+  <section>
+  <title>&GetBuildPath;: Getting the Path From a &Node; or String</title>
+
+    <para>
+
+    <function>env.GetBuildPath(file_or_list)</function>
+    returns the path of a &Node; or a string representing a
+    path.  It can also take a list of &Node;s and/or strings, and
+    returns the list of paths.  If passed a single &Node;, the result
+    is the same as calling <literal>str(node)</literal> (see above).
+    The string(s) can have embedded construction variables, which are
+    expanded as usual, using the calling environment's set of
+    variables.  The paths can be files or directories, and do not have
+    to exist.
+
+    </para>
+
+    <programlisting>
+      env=Environment(VAR="value")
+      n=File("foo.c")
+      print env.GetBuildPath([n, "sub/dir/$VAR"])
+    </programlisting>
+
+    <para>
+
+    Would print the following file names:
+
+    </para>
+
+    <screen>
+      % <userinput>scons -Q</userinput>
+      ['foo.c', 'sub/dir/value']
+      scons: `.' is up to date.
+    </screen>
+
+    <para>
+
+    There is also a function version of &GetBuildPath; which can
+    be called without an &Environment;; that uses the default SCons
+    &Environment; to do substitution on any string arguments.
+
+    </para>
+
+  </section>
+
   <!--
 
   <section>

File doc/user/scanners.in

View file
     -->
 
   </section>
+
+  <section>
+  <title>Adding a search path to a scanner: &FindPathDirs;</title>
+
+    <para>
+
+    Many scanners need to search for included files or dependencies
+    using a path variable; this is how &cv-link-CPPPATH; and
+    &cv-link-LIBPATH; work.  The path to search is passed to your
+    scanner as the <literal>path</literal> argument.  Path variables
+    may be lists of nodes, semicolon-separated strings, or even
+    contain SCons variables which need to be expanded.  Fortunately,
+    &SCons; provides the &FindPathDirs; function which itself returns
+    a function to expand a given path (given as a SCons construction
+    variable name) to a list of paths at the time the scanner is
+    called.  Deferring evaluation until that point allows, for
+    instance, the path to contain $TARGET references which differ for
+    each file scanned.
+
+    </para>
+
+    <para>
+
+    Using &FindPathDirs; is quite easy.  Continuing the above example,
+    using KPATH as the construction variable with the search path
+    (analogous to &cv-link-CPPPATH;), we just modify the &Scanner;
+    constructor call to include a path keyword arg:
+
+    </para>
+    
+    <scons_example name="findpathdirs">
+      <file name="SConstruct" printme="1">
+        kscan = Scanner(function = kfile_scan,
+                        skeys = ['.k'],
+                        path=FindPathDirs('KPATH'))
+      </file>
+    </scons_example>
+    
+    <para>
+    
+    FindPathDirs returns a callable object that, when called, will
+    essentially expand the elements in env['KPATH'] and tell the
+    scanner to search in those dirs.  It will also properly add
+    related repository and variant dirs to the search list.  As a side
+    note, the returned method stores the path in an efficient way so
+    lookups are fast even when variable substitutions may be needed.
+    This is important since many files get scanned in a typical build.
+    
+    </para>
+    </section>

File doc/user/scanners.xml

View file
     -->
 
   </section>
+
+  <section>
+  <title>Adding a search path to a scanner: &FindPathDirs;</title>
+
+    <para>
+
+    Many scanners need to search for included files or dependencies
+    using a path variable; this is how &cv-link-CPPPATH; and
+    &cv-link-LIBPATH; work.  The path to search is passed to your
+    scanner as the <literal>path</literal> argument.  Path variables
+    may be lists of nodes, semicolon-separated strings, or even
+    contain SCons variables which need to be expanded.  Fortunately,
+    &SCons; provides the &FindPathDirs; function which itself returns
+    a function to expand a given path (given as a SCons construction
+    variable name) to a list of paths at the time the scanner is
+    called.  Deferring evaluation until that point allows, for
+    instance, the path to contain $TARGET references which differ for
+    each file scanned.
+
+    </para>
+
+    <para>
+
+    Using &FindPathDirs; is quite easy.  Continuing the above example,
+    using KPATH as the construction variable with the search path
+    (analogous to &cv-link-CPPPATH;), we just modify the &Scanner;
+    constructor call to include a path keyword arg:
+
+    </para>
+    
+    <programlisting>
+        kscan = Scanner(function = kfile_scan,
+                        skeys = ['.k'],
+                        path=FindPathDirs('KPATH'))
+    </programlisting>
+    
+    <para>
+    
+    FindPathDirs returns a callable object that, when called, will
+    essentially expand the elements in env['KPATH'] and tell the
+    scanner to search in those dirs.  It will also properly add
+    related repository and variant dirs to the search list.  As a side
+    note, the returned method stores the path in an efficient way so
+    lookups are fast even when variable substitutions may be needed.
+    This is important since many files get scanned in a typical build.
+    
+    </para>
+    </section>

File runtest.py

View file
         sys.stdout.flush()
     status = 0
     if execute_tests:
-        status = os.WEXITSTATUS(os.system(cmd))
+        status = os.system(cmd)
+        try:
+            wexitstatus = os.WEXITSTATUS
+        except AttributeError:
+            pass
+        else:
+            status = wexitstatus(status)
     sys.exit(status)
 
 #try:

File src/Announce.txt

View file
+
+
+                   SCons - a software construction tool
+
+                              Release Notes
+
+
+This is SCons, a tool for building software (and other files).  SCons is
+implemented in Python, and its "configuration files" are actually Python
+scripts, allowing you to use the full power of a real scripting language
+to solve build problems.  You do not, however, need to know Python to
+use SCons effectively.
+
+Please go to http://www.scons.org/download.php to get the latest production
+release of SCons.
+
+So that everyone using SCons can help each other learn how to use it more
+effectively, please go to http://scons.org/lists.php#users to sign up for
+the scons-users mailing list.
+
+
+RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+
+  Please consult the RELEASE.txt file for a summary changes since the last
+  release and consult the CHANGES.txt file for complete a list of changes
+  since last release.  This announcement highlights only the important
+  changes.
+
+  IMPORTANT:  In 1.3.0 and 2.0.0, explicit dependencies (configured via
+  the Depends() call) are ignored for any nodes that do not have builders.
+  This known issue[1] will typically only happen if you explicitly
+  configure a builder call to create multiple output files, some of which
+  are "hidden" from SCons by not being listed in the targets list, and then
+  use Depends() to establish an explicit dependency on a "hidden" file.
+
+  [1] See http://scons.tigris.org/issues/show_bug.cgi?id=2647 for details.
+
+  Please note the following important changes scheduled for the next
+  release:
+
+    --  FEATURE THAT WILL CHANGE
+
+  Please note the following important changes since release 2.0.0:
+
+    --  NEW FEATURE
+
+  Please note the following important changes since release 1.3.0:
+
+    --  SUPPORT FOR PYTHON VERSIONS PRIOR TO 2.4 HAS BEEN REMOVED
+
+    	Although SCons is still tested with Python 2.3, use of Python
+	versions prior to 2.4 is deprecated.
+
+    --  DEPRECATED FEATURES WILL GENERATE MANDATORY WARNINGS IN 2.0.0
+
+        In keeping with our deprecation cycle, the following deprecated
+        features will still be supported in 2.0.0 but will generate
+        mandatory, non-disableable warnings:
+
+            --  The overrides= keyword argument to the Builder() call.
+            --  The scanner= keyword argument to the Builder() call.
+            --  The BuildDir() function and env.BuildDir() method.
+            --  The env.Copy() method.
+            --  The SourceSignatures() function and
+                env.SourceSignatures() method.
+            --  The TargetSignatures() function and
+                env.TargetSignatures() method.
+            --  The Sig module (now an unnused stub).
+            --  The --debug=dtree, --debug=stree and --debug=tree options.
+            --  The --debug=nomemoizer option.
+            --  The Options object and the related BoolOption(),
+                EnumOption(), ListOption(), PackageOption() and
+                PathOption() functions.
+
+        The mandatory warnings will be issued in order to make sure
+        users of 1.3.0 notice *prior* to the release of SCons 2.0.0, that
+        these features will be removed.  In SCons 2.0.0 these features
+        will no longer work at all, and will instead generate specific
+        fatal errors when anyone tries to use them.
+
+  Please note the following important changes since release 1.2.0:
+
+    --  MICROSOFT VISUAL STUDIO VERSION/ARCH DETECTION HAS CHANGED
+
+        The way SCons detects Visual Studio on Windows has changed in
+        1.3.  By default, it should now use the latest installed
+        Visual Studio version on your machine, and compile for 32 or
+        64 bits according to whether your OS is 32 or 64 bits (32/64
+        bit python makes no difference).
+
+	Two new variables control Visual Studio: MSVC_VERSION and
+	TARGET_ARCH.  These variables ONLY take effect when passed to
+	the Environment() constructor; setting them later has no
+	effect.  To use a non-default Visual Studio version, set
+	MSVC_VERSION to e.g. "8.0" or "7.1".  Setting it to "xxx" (or
+	any nonexistent value) will make it print out the valid
+	versions on your system.  To use a non-default architecture,
+	set TARGET_ARCH to "x86" or "x86_64" (various synonyms are
+	accepted).
+
+	Note that if you use MSVS_VERSION to build Visual Studio
+	projects from your SConstructs, MSVS_VERSION must be set to
+	the same version as MSVC_VERSION.
+
+        Support for HOST_OS,HOST_ARCH,TARGET_OS, TARGET_ARCH has been
+        added to allow specifying different target arch than the host 
+        system. This is only supported for Visual Studio/Visual C++
+        at this time.
+
+    --  Support for Latex glossaries and acronyms has been added
+
+    --  VISUAL C/C++ PRECOMPILED HEADERS WILL BE REBUILT
+
+        Precompiled header files built with Visual C/C++ will be
+        rebuilt after upgrading from 1.2.0 to a later release.
+
+        This rebuild is normal and will occur because the command line
+        defined by the $PCHCOM construction variable has had the $CCFLAGS
+        variable added, and has been rearranged to put the "/Fo" output
+        flag towards the beginning of the line, consistent with the
+        related command lines for $CCCOM, $CXXCOM, etc.
+
+    --  CHANGES TO SOME LINKER COMMAND LINES WILL CAUSE RELINKING
+
+        Changes to the command line definitions for the Microsoft link.exe
+        linker, the OS/2 ilink linker and the Phar Lap linkloc linker
+        will cause targets built with those tools be to be rebuilt after
+        upgrading from 1.2.0 to a later release.
+
+        This relink is normal and will occur because the command lines for
+        these tools have been redefined to remove unnecessary nested $(
+        and $) character strings.
+
+    --  MSVS_USE_MFC_DIRS and MSVS_IGNORE_IDE_PATHS are obsoleted and
+        have no effect.
+
+  Please note the following important changes since release 1.1.0:
+
+    --  THE $CHANGED_SOURCES, $CHANGED_TARGETS, $UNCHANGED_SOURCES
+        AND $UNCHANGED_TARGETS VARIABLES WILL BECOME RESERVED
+
+        A future release (probably 1.3.0) will make the construction
+        variable names $CHANGED_SOURCES, $CHANGED_TARGETS,
+        $UNCHANGED_SOURCES and $UNCHANGED_TARGETS into reserved
+        construction variable names controlled by SCons itself (like
+        the current $SOURCE, $TARGETS, etc.).
+
+        Setting these variable names in the current release will generate
+        a warning but still set the variables.  When they become reserved
+        variable names, they will generate a different warning message
+        and attempts to set these variables will be ignored.
+
+        SCons configurations that happen to use these variable names
+        should be changed to use different variable names, in order
+        to ensure that the configuration continues to work with future
+        versions of SCons.
+
+    --  THE Options OBJECT AND RELATED FUNCTIONS NOW GENERATE WARNINGS
+
+	Use of the Options object, and related functions BoolOption(),
+	EnumOption(), ListOption(), PackageOption() and PathOption()
+	were announced as deprecated in release 0.98.1.  Since then,
+	however, no warning messages were ever implemented for the
+        use of these deprecated functions.
+
+        By default, release 1.2.0 prints warning messages when these
+        deprecated features are used.  Warnings about all deprecated
+        features may be suppressed by using the --warn=no-deprecated
+        command-line option:
+
+            $ scons --warn=no-deprecated
+
+        Or by using the appropriate SetOption() call in any SConscript
+        file:
+
+            SetOption('warn', 'no-deprecated')
+
+        You may optionally disable just warnings about the deprecation
+        of the Options object and its related functions as follows:
+
+            SetOption('warn', 'no-deprecated-options')
+
+        The current plan is for these warnings to become mandatory
+        (non-suppressible) in release 1.3.0, and for the use of Options
+        and its related functions to generate errors in release 2.0.
+
+  Please note the following important changes since release 0.98.4:
+
+    --  scons.bat NOW RETURNS THE REAL SCONS EXIT STATUS
+
+        The scons.bat script shipped with SCons used to exit with
+        a status of 1 when it detected any failed (non-zero) exit
+        status from the underlying Python execution of SCons itself.
+        The scons.bat script now exits with the actual status
+        returned by SCons.
+
+    --  SCONS NOW WARNS WHEN TRYING TO LINK C++ AND FORTRAN OBJECT FILES
+
+        Some C++ toolchains do not understand Fortran runtimes and create
+        unpredictable executables when linking C++ and Fortran object
+        files together.  SCons now issues a warning if you try to link
+        C++ and Fortran object files into the same executable:
+
+            scons: warning: Using $CXX to link Fortran and C++ code together.
+                    This may generate a buggy executable if the '/usr/bin/gcc'
+                    compiler does not know how to deal with Fortran runtimes.
+
+        The warning may be suppressed with either the --warning=no-link
+        or --warning=no-fortran-cxx-mix command line options, or by
+        adding either of the following lines to a SConscript file:
+
+            SetOption('warn', 'no-link')
+            SetOption('warn', 'no-fortran-cxx-mix')
+
+  Please note the following important changes since release 0.98:
+
+    --  SCONS NO LONGER SETS THE GNU TOOLCHAIN -fPIC FLAG IN $SHCXXFLAGS
+
+        The GNU toolchain support in previous versions of SCons would
+        add the -fPIC flag to the $SHCXXFLAGS construction variable.
+        The -fPIC flag has been now been removed from the default
+        $SHCXXFLAGS setting.  Instead, the $SHCXXCOM construction variable
+        (the default SCons command line for compiling shared objects
+        from C++ source files) has been changed to add the $SHCCFLAGS
+        variable, which contains the -fPIC flag.
+
+        This change was made in order to make the behavior of the default
+        C++ compilation line including $SHCCFLAGS consistent with the
+        default C compilation line including $CCFLAGS.
+
+        This change should have no impact on configurations that use
+        the default $SHCXXCOM command line.  It may have an impact on
+        configurations that were using the default $SHCXXFLAGS value
+        *without* the $SHCCFLAGS variable to get the -fPIC flag into a
+        custom command line.  You can fix these by adding the $SHCCFLAGS
+        to the custom command line.
+
+        Adding $SHCCFLAGS is backwards compatible with older SCons
+        releases, although it might cause the -fPIC flag to be repeated
+        on the command line if you execute it on an older version of
+        SCons that sets -fPIC in both the $SHCCLAFGS and $SHCXXFLAGS
+        variables.  Duplicating the -fPIC flag on the g++ command line
+        will not cause any compilation problems, but the change to the
+        command line may cause SCons to rebuild object files.
+
+    --  FORTRAN NOW COMPILES .f FILES WITH gfortran BY DEFAULT
+
+        The Fortran Tool modules have had a major overhaul with the intent
+        of making them work as-is for most configurations.  In general,
+        most configurations that use default settings should not see
+        any noticeable difference.
+
+        One configuration that has changed is if you have both a gfortran
+        and g77 compiler installed.  In this case, previous versions of
+        SCons would, by default, use g77 by default to compile files with
+        a .f suffix, while SCons 0.98.1 will use the gfortran compiler
+        by default.  The old behavior may be preserved by explicitly
+        initializing construction environments with the 'g77' Tool module:
+
+            env = Environment(tools = ['g77', 'default'])
+        
+        The above code is backwards compatible to older versions of SCons.
+
+        If you notice any other changes in the behavior of default
+        Fortran support, please let us know so we can document them in
+        these release notes for other users.
+
+  Please note the following important changes since release 0.97.0d20071212:
+
+    --  SUPPORT FOR PYTHON VERSIONS BEFORE 2.2 IS NOW DEPRECATED
+
+        SCons now prints the following warning when it is run by any
+        Python 1.5, 2.0 or 2.1 release or sub-release:
+
+            scons: warning: Support for pre-2.2 Python (VERSION) is deprecated.
+                If this will cause hardship, contact dev@scons.tigris.org.
+
+        You may disable all warnings about deprecated features by adding
+        the option "--warn=no-deprecated" to the command line or to the
+        $SCONSFLAGS environment variable:
+
+            $ scons --warn=no-deprecated
+
+        Using '--warn=no-deprecated' is compatible with earlier versions
+        of SCons.
+
+        You may also, as of this version of SCons, disable all warnings
+        about deprecated features by adding the following to any
+        SConscript file:
+
+            SetOption('warn', 'no-deprecated')
+
+        You may disable only the specific warning about running under
+        a deprecated Python version by adding the following to any
+        SConscript file:
+
+            SetOption('warn', 'no-python-version')
+
+        The warning may also be suppressed on the command line:
+
+            $ scons --warn=no-python-version
+
+        Or by specifying the --warn=no-python-version option in the
+        $SCONSFLAGS environment variable.
+
+        Using SetOption('warn', ...), and the 'no-python-version'
+        command-line option for suppressing this specific warning,
+        are *not* backwards-compatible to earlier versions of SCons.
+
+    --  THE env.Copy() METHOD IS NOW OFFICIALLY DEPRECATED
+
+        The env.Copy() method is now officially deprecated and will
+        be removed in a future release.  Using the env.Copy() method
+        now generates the following message:
+
+            scons: warning: The env.Copy() method is deprecated; use the env.Clone() method instead.
+
+        You may disable all warnings about deprecated features by adding
+        the option "--warn=no-deprecated" to the command line or to the
+        $SCONSFLAGS environment variable:
+
+            $ scons --warn=no-deprecated
+
+        Using '--warn=no-deprecated' is compatible with earlier versions
+        of SCons.
+
+        You may also, as of this version of SCons, disable all warnings
+        about deprecated features by adding the following to any
+        SConscript file:
+
+            SetOption('warn', 'no-deprecated')
+
+	You may disable only the specific warning about the deprecated
+	env.Copy() method by adding the following to any SConscript
+	file:
+
+            SetOption('warn', 'no-deprecated-copy')
+
+        The warning may also be suppressed on the command line:
+
+            $ scons --warn=no-deprecated-copy
+
+        Or by specifying the --warn=no-deprecated-copy option in the
+        $SCONSFLAGS environment variable.
+
+        Using SetOption('warn', ...), and the 'no-deprecated-copy'
+        command-line option for suppressing this specific warning,
+        are *not* backwards-compatible to earlier versions of SCons.
+
+    --  THE --debug=dtree, --debug=stree AND --debug=tree OPTIONS ARE DEPRECATED
+
+        The --debug=dtree, --debug=stree and --debug=tree methods
+        are now officially deprecated and will be removed in a
+        future release.  Using these options now generate a warning
+        message recommending use of the --tree=derived, --tree=all,status
+        and --tree=all options, respectively.
+
+        You may disable these warnings, and all warnings about
+        deprecated features, by adding the option "--warn=no-deprecated"
+        to the command line or to the $SCONSFLAGS environment
+        variable:
+
+            $ scons --warn=no-deprecated
+
+        Using '--warn=no-deprecated' is compatible with earlier versions
+        of SCons.
+
+    --  THE TargetSignatures() AND SourceSignatures() FUNCTIONS ARE DEPRECATED
+
+	The TargetSignatures() and SourceSignatures() functions,
+	and their corresponding env.TargetSignatures() and
+	env.SourceSignatures() methods, are now officially deprecated
+	and will be be removed in a future release.  Using ahy of
+	these functions or methods now generates a message
+	similar to the following:
+
+            scons: warning: The env.TargetSignatures() method is deprecated;
+                    convert your build to use the env.Decider() method instead.
+
+        You may disable all warnings about deprecated features by adding
+        the option "--warn=no-deprecated" to the command line or to the
+        $SCONSFLAGS environment variable:
+
+            $ scons --warn=no-deprecated
+
+        Using '--warn=no-deprecated' is compatible with earlier versions
+        of SCons.
+
+        You may also, as of this version of SCons, disable all warnings
+        about deprecated features by adding the following to any
+        SConscript file:
+
+            SetOption('warn', 'no-deprecated')
+
+	You may disable only the specific warning about the use of
+	TargetSignatures() or SourceSignatures() by adding the
+	following to any SConscript file:
+
+            SetOption('warn', 'no-deprecated-target-signatures')
+            SetOption('warn', 'no-deprecated-source-signatures')
+
+        The warnings may also be suppressed on the command line:
+
+            $ scons --warn=no-deprecated-target-signatures --warn=no-deprecated-source-signatures
+
+	Or by specifying these options in the $SCONSFLAGS environment
+	variable.
+
+	Using SetOption('warn', ...), or the command-line options
+	for suppressing these warnings, is *not* backwards-compatible
+	to earlier versions of SCons.
+
+    --  File(), Dir() and Entry() NOW RETURN A LIST WHEN THE INPUT IS A SEQUENCE
+
+        Previously, if these methods were passed a list, the list was
+        substituted and stringified, then passed as a single string to
+        create a File/Dir/Entry Node.  This rarely if ever worked with
+        more than one element in the list.  They now return a list of
+        Nodes when passed a list.
+
+        One case that works differently now is a passing in a
+        single-element sequence; that formerly was stringified
+        (returning its only element) and then a single Node would be
+        returned.  Now a single-element list containing the Node will
+        be returned, for consistency.
+
+    --  THE env.subst() METHOD NOW RETURNS A LIST WHEN THE INPUT IS A SEQUENCE
+
+        The env.subst() method now returns a list with the elements
+        expanded when given a list as input.  Previously, the env.subst()
+        method would always turn its result into a string.
+
+        This behavior was changed because it interfered with being able
+        to include things like lists within the expansion of variables
+        like $CPPPATH and then have SCons understand that the elements
+        of the "internal" lists still needed to be treated separately.
+        This would cause a $CPPPATH list like ['subdir1', 'subdir']
+        to show up in a command line as "-Isubdir1 subdir".
+
+    --  THE Jar() BUILDER NOW USES THE Java() BUILDER CLASSDIR BY DEFAULT
+
+        By default, the Jar() Builder will now use the class directory
+        specified when the Java() builder is called.  So the following
+        input:
+
+            classes = env.Java('classes', 'src')
+            env.Jar('out.jar', classes)
+
+        Will cause "-C classes" to be passed the "jar" command invocation,
+        and the Java classes in the "out.jar" file will not be prefixed
+        "classes/".
+
+        Explicitly setting the $JARCHDIR variable overrides this default
+        behavior.  The old behavior of not passing any -C option to the
+        "jar" command can be preserved by explicitly setting $JARCHDIR
+        to None:
+
+            env = Environment(JARCHDIR = None)
+
+        The above setting is compatible with older versions of SCons.
+
+  Please note the following important changes since release 0.97.0d20070918:
+
+    --  SCons REDEFINES PYTHON open() AND file() ON Windows TO NOT PASS
+        ON OPEN FILE HANDLES TO CREATED PROCESSES
+
+        On Windows systems, SCons now redefines the Python open()
+        and file() functions so that, if the Python Win32 extensions
+        are available, the file handles for any opened files will *not*
+        be inherited by subprocesses, such as the spawned compilers and
+        other tools invoked to build the software.
+
+        This prevents certain race conditions where a file handle for
+        a file opened by Python (either in a Python function action,
+        or directly in a SConscript file) could be inherited and help
+        open by a subprocess, interfering with the ability of other
+        processes to create or modify the file.
+
+        In general, this should not cause problems for the vast majority
+        of configurations.  The only time this would be a problem would be
+        in the unlikely event that a process spawned by SCons specifically
+        *expected* to use an inherited file handle opened by SCons.
+
+        If the Python Win32 extensions are not installed or are an
+        earlier version that does not have the ability to disable file
+        handle inheritance, SCons will print a warning message when the
+        -j option is used.  The warning message may be suppressed by
+        specifying --warn=no-parallel-support.
+
+  Please note the following important changes since release 0.97.0d20070809:
+
+    --  "content" SIGNATURES ARE NOW THE DEFAULT BEHAVIOR
+
+        The default behavior of SCons is now to use the MD5 checksum of
+        all file contents to decide if any files have changed and should
+        cause rebuilds of their source files.  This means that SCons may
+        decide not to rebuild "downstream" targets if a a given input
+        file is rebuilt to the exact same contents as the last time.
+        The old behavior may preserved by explicity specifying:
+
+            TargetSignatures("build")
+
+        In any of your SConscript files.
+
+    --  TARGETS NOW IMPLICITLY DEPEND ON THE COMMAND THAT BUILDS THEM
+
+        For all targets built by calling external commands (such as a
+        compiler or other utility), SCons now adds an implicit dependency
+        on the command(s) used to build the target.
+
+        This will cause rebuilds of all targets built by external commands
+        when running SCons in a tree built by previous version of SCons,
+        in order to update the recorded signatures.
+
+        The old behavior of not having targets depend on the external
+        commands that build them can be preserved by setting a new
+        $IMPLICIT_COMMAND_DEPENDENCIES construction variable to a
+        non-True value:
+
+            env = Environment(IMPLICIT_COMMAND_DEPENDENCIES = 0)
+        
+        or by adding Ignore() calls for any targets where the behavior
+        is desired:
+
+            Ignore('/usr/bin/gcc', 'foo.o')
+
+        Both of these settings are compatible with older versions
+        of SCons.
+
+    --  CHANGING SourceSignature() MAY CAUSE "UNECESSARY" REBUILDS
+
+        If you change the SourceSignature() value from 'timestamp' to
+        'MD5', SCons will now rebuild targets that were already up-to-date
+        with respect to their source files.
+
+        This will happen because SCons did not record the content
+        signatures of the input source files when the target was last
+        built--it only recorded the timestamps--and it must record them
+        to make sure the signature information is correct.  However,
+        the content of source files may have changed since the last
+        timestamp build was performed, and SCons would not have any way to
+        verify that.  (It would have had to open up the file and record
+        a content signature, which is one of the things you're trying to
+        avoid by specifying use of timestamps....)  So in order to make
+        sure the built targets reflect the contents of the source files,
+        the targets must be rebuilt.
+
+        Change the SourceSignature() value from 'MD5' to 'timestamp'
+        should correctly not rebuild target files, because the timestamp
+        of the files is always recorded.
+
+        In previous versions of SCons, changing the SourceSignature()
+        value would lead to unpredictable behavior, usually including
+        rebuilding targets.
+
+    --  THE Return() FUNCTION NOW ACTUALLY RETURNS IMMEDIATELY
+
+        The Return() function now immediately stops processing the
+        SConscript file in which it appears and returns the values of the
+        variables named in its arguments.  It used to continue processing
+        the rest of the SConscript file, and then return the values of the
+        specified variables at the point the Return() function was called.
+
+        The old behavior may be requested by adding a "stop=False"
+        keyword argument to the Return() call:
+
+                Return('value', stop=False)
+
+        The "stop=" keyword argument is *not* compatible with SCons
+        versions 0.97.0d20070809 or earlier.
+
+  Please note the following important changes since release 0.97:
+
+    --  env.CacheDir() NOW ONLY AFFECTS CONSTRUCTION ENVIRONMENT TARGETS
+
+        The env.CacheDir() method now only causes derived files to be
+        retrieved from the specified cache directory for targets built
+        with the specified specified construction environment ("env").
+
+        Previously, any call to env.CacheDir() or CacheDir() would modify
+        a global setting and cause all built targets to be retrieved
+        from the specified cache directory.  This behavior was changed so
+        that env.CacheDir() would be consistent with other construction
+        environment methods, which only affect targets built with the
+        specified construction environment.
+
+        The old behavior of changing the global behavior may be preserved
+        by changing any env.CacheDir() calls to:
+
+                CacheDir('/path/to/cache/directory')
+
+        The above change is backwards-compatible and works in all earlier
+        versions of SCons that support CacheDir().
+
+    --  INTERPRETATION OF SUFFIX-LESS SOURCE ARGUMENTS HAS CHANGED
+
+        The interpretation of source arguments (files) without suffixes
+        has changed in one specific configuration.
+
+        Previously, if a Builder had a src_suffix specified (indicating
+        that source files without suffixes should have that suffix
+        appended), the suffix would only be applied to suffix-less source
+        arguments if the Builder did *not* have one or more attached
+        source Builders (that is, the Builder was not a "multi-stage"
+        Builder).  So in the following configuration:
+
+                build_foo = Builder(src_suffix = '.foo')
+                build_bar = Builder(src_suffix = '.bar',
+                                    src_builder = build_bar)
+
+                env = Environment(BUILDERS = {
+                                   'Foo' : build_foo,
+                                   'Boo' : build_bar,
+                                  })
+
+                env.Foo('tgt1', 'src1')
+                env.Bar('tgt2', 'src2')
+        
+        SCons would have expected to find a source file 'src1.foo' for the
+        env.Foo() call, but a source file 'src2' for the env.Bar() call.
+
+        This behavior has now been made consistent, so that the two
+        above calls would expect source files named 'src1.foo' and
+        'src2.bar', respectively.
+
+        Note that, if genuinely desired, the old behavior of building
+        from a source file without a suffix at all (when the Builder has
+        a src_suffix *and* a src_builder) can be specified explicity by
+        turning the string into a File Node directly:
+
+                env.Bar('tgt2', File('src2'))
+
+        The above use of File() is backwards-compatible and will work
+        on earlier versions of SCons.
+
+    --  THE DEFAULT EXECUTION PATH FOR Solaris HAS CHANGED
+
+        On Solaris systems, SCons now adds the "/opt/SUNWspro/bin"
+        directory to the default execution $PATH variable before the