Merged revisions 1784-1824 via svnmerge from

http://scons.tigris.org/svn/scons/branches/core

........
  r1786 | stevenknight | 2007-01-25 15:29:15 -0600 (Thu, 25 Jan 2007) | 1 line

  0.96.D555 - Doc string updates for TaskMaster to better describe the architecture. Get rid of some no-longer-used code.
........
  r1787 | stevenknight | 2007-01-25 23:24:31 -0600 (Thu, 25 Jan 2007) | 1 line

  0.96.D556 - Packaging changes to support building packages in an arbitrary directory.
........
  r1788 | stevenknight | 2007-01-30 20:35:39 -0600 (Tue, 30 Jan 2007) | 1 line

  0.96.D557 - Make the Scanner.Base class able to handle Scanner.Selector functionality (i.e., a dictionary to select other scanners) and prepare to deprecate Scanner.Selector and Scanner.Scanner() in the future.
........
  r1789 | stevenknight | 2007-01-30 20:45:23 -0600 (Tue, 30 Jan 2007) | 1 line

  0.96.D558 - Add support for a site-scons subdirectory. (Gary Oberbrunner)
........
  r1790 | stevenknight | 2007-01-31 00:36:20 -0600 (Wed, 31 Jan 2007) | 1 line

  0.96.D559 - Clean up various module imports and other pychecker-detected problems.
........
  r1791 | stevenknight | 2007-01-31 11:51:04 -0600 (Wed, 31 Jan 2007) | 1 line

  0.96.D560 - Fix detection of Java anonymous classes if a newline precedes the opening brace. (Leanid Nazdrynau)
........
  r1792 | stevenknight | 2007-02-02 11:57:59 -0600 (Fri, 02 Feb 2007) | 1 line

  0.96.D561 - Add a --bootstrap_src option to bootstrap.py; search the bootstrap.py directory by default. (Greg Noel)
........
  r1793 | stevenknight | 2007-02-02 18:04:52 -0600 (Fri, 02 Feb 2007) | 1 line

  0.96.D562 - Don't check the build/*/gentoo directories for copyright strings.
........
  r1794 | stevenknight | 2007-02-02 18:12:43 -0600 (Fri, 02 Feb 2007) | 1 line

  0.96.D563 - Fix pychecker clean-ups on later Python versions.
........
  r1795 | stevenknight | 2007-02-02 18:38:47 -0600 (Fri, 02 Feb 2007) | 1 line

  0.96.D564 - Add a NoCache() function to allow marking targets as not being suitable for propagating/ to (or retrieving from) CacheDir(). (Dave Vitek)
........
  r1796 | stevenknight | 2007-02-02 20:08:33 -0600 (Fri, 02 Feb 2007) | 1 line

  0.96.D565 - Add a --tree= option, to make the interface to dumping dependency graphs a little clearner, and give it a 'prune' option to avoid repeating the dependency walk for Nodes we've already visited.
........
  r1797 | stevenknight | 2007-02-03 20:37:25 -0600 (Sat, 03 Feb 2007) | 1 line

  0.96.D566 - Packaging fix: don't add '#' to the beginning of a build_dir name if it's already an absolute path.
........
  r1798 | stevenknight | 2007-02-03 20:53:42 -0600 (Sat, 03 Feb 2007) | 1 line

  0.96.D567 - Add backwards-compatibility for set() types, and restore the line that used them in the compatibility _subprocess.py module.
........
  r1799 | stevenknight | 2007-02-05 10:30:28 -0600 (Mon, 05 Feb 2007) | 1 line

  0.96.D568 - Capture outline and build configuration for a possible future Developer's Guide.
........
  r1800 | stevenknight | 2007-02-05 11:03:37 -0600 (Mon, 05 Feb 2007) | 1 line

  0.96.D569 - Exclude the new developer guide MANIFEST from Copyright string checks.
........
  r1801 | stevenknight | 2007-02-05 11:16:04 -0600 (Mon, 05 Feb 2007) | 1 line

  0.96.D570 - Track fix in upstream subprocess.py. (Ralf W. Grosse-Kunstleve)
........
  r1802 | stevenknight | 2007-02-05 20:05:59 -0600 (Mon, 05 Feb 2007) | 1 line

  0.96.D571 - Change the Windows installer to register scons.bat as an 'App Path', so the directory doesn't need to be added to %PATH%.
........
  r1803 | stevenknight | 2007-02-05 21:33:01 -0600 (Mon, 05 Feb 2007) | 1 line

  0.96.D572 - Prepare SConf for use with the subprocess module by refactoring the Unbuffered class.
........
  r1804 | stevenknight | 2007-02-05 22:37:09 -0600 (Mon, 05 Feb 2007) | 1 line

  0.96.D573 - Get rid of left-over Node.Node.{pre,post}_actions attributes.
........
  r1805 | stevenknight | 2007-02-06 12:04:14 -0600 (Tue, 06 Feb 2007) | 1 line

  0.96.D574 - Remove leftover print in the test/CacheDir/NoCache.py test.
........
  r1806 | stevenknight | 2007-02-06 17:11:03 -0600 (Tue, 06 Feb 2007) | 1 line

  0.96.D575 - Support the ability to evaluate a ${} construction variable to select the spawner function.
........
  r1809 | stevenknight | 2007-02-07 00:30:10 -0600 (Wed, 07 Feb 2007) | 1 line

  0.96.D576 - Documentation fixes and updates.
........
  r1810 | stevenknight | 2007-02-07 15:51:20 -0600 (Wed, 07 Feb 2007) | 1 line

  0.96.D577 - Don't expect a bootstrap.py runtest.py file to be generated when swig -noproxy is used.
........
  r1811 | stevenknight | 2007-02-07 16:55:06 -0600 (Wed, 07 Feb 2007) | 1 line

  0.96.D578 - Make --srcdir a synonym for -Y/--repository.
........
  r1812 | stevenknight | 2007-02-07 23:46:22 -0600 (Wed, 07 Feb 2007) | 1 line

  0.96.D579 - More doc updates: PathAccept, #include+Repository double-quote limitation.
........
  r1817 | stevenknight | 2007-02-08 12:46:42 -0600 (Thu, 08 Feb 2007) | 1 line

  0.96.D580 - Fix use of toolpath with BuildDir.
........
  r1818 | stevenknight | 2007-02-08 12:59:23 -0600 (Thu, 08 Feb 2007) | 1 line

  0.96.D581 - Enable build of the text version of the User's Guide.
........
  r1819 | stevenknight | 2007-02-08 14:21:31 -0600 (Thu, 08 Feb 2007) | 1 line

  0.96.D582 - Fix handling of Java inner classes with JARCHDIR.
........
  r1820 | stevenknight | 2007-02-08 14:39:33 -0600 (Thu, 08 Feb 2007) | 1 line

  0.96.D583 - Add linking with -lm to the dmd.py Tool smart linker. (Anonymous)
........
  r1821 | stevenknight | 2007-02-08 17:26:29 -0600 (Thu, 08 Feb 2007) | 1 line

  0.96.D584 - Fix ParseConfig() when *FLAGS variables have been replaced with strings.
........
  r1822 | stevenknight | 2007-02-09 12:21:17 -0600 (Fri, 09 Feb 2007) | 1 line

  0.96.D585 - Fix installation of file names beginning with #. (Dave Weber)
........
  r1823 | stevenknight | 2007-02-09 14:14:47 -0600 (Fri, 09 Feb 2007) | 1 line

  0.96.D586 - Post-review improvements to recent toolpath and MergeFlags() changes. (Gary Oberbrunner, Greg Noel)
........
  r1824 | stevenknight | 2007-02-10 00:53:13 -0600 (Sat, 10 Feb 2007) | 1 line

  0.96.D587 - Commonize flags initialization between the c and c++ Tools.
........

2 files changed, 233 insertions, 0 deletions

diff --git a/test/toolpath/BuildDir.py b/test/toolpath/BuildDir.py
new file mode 100644
index 0000000..a8b8b8a
--- /dev/null
+++ b/test/toolpath/BuildDir.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+#
+# __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__"
+
+"""
+Verify that toolpath works with BuildDir() for an SConscript.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('subdir', ['subdir', 'src'], ['subdir', 'src', 'tools'])
+
+test.write('SConstruct', """\
+BuildDir('build', 'subdir', duplicate=0)
+SConscript('build/SConscript')
+""")
+
+test.write(['subdir', 'SConscript'], """\
+env = Environment(tools = ['MyBuilder'], toolpath = ['src/tools'])
+env.MyCopy('src/file.out', 'src/file.in')
+""")
+
+test.write(['subdir', 'src', 'file.in'], "subdir/src/file.in\n")
+
+test.write(['subdir', 'src', 'tools', 'MyBuilder.py'], """\
+from SCons.Script import Builder
+def generate(env):
+    def my_copy(target, source, env):
+        content = open(str(source[0]), 'rb').read()
+        open(str(target[0]), 'wb').write(content)
+    env['BUILDERS']['MyCopy'] = Builder(action = my_copy)
+
+def exists(env):
+    return 1
+""")
+
+test.run()
+
+test.must_match(['build', 'src', 'file.out'], "subdir/src/file.in\n")
+
+# We should look for the underlying tool in both the build/src/tools
+# (which doesn't exist) and subdir/src/tools (which still does).  If we
+# don't, the following would fail because the execution directory is
+# now relative to the created BuildDir.
+test.run()
+
+test.pass_test()
diff --git a/test/toolpath/basic.py b/test/toolpath/basic.py
new file mode 100644
index 0000000..7e08f8a
--- /dev/null
+++ b/test/toolpath/basic.py
@@ -0,0 +1,162 @@
+#!/usr/bin/env python
+#
+# __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.path
+import sys
+import time
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+def foo(env):
+    env['TOOL_FOO'] = 1
+    
+env1 = Environment(tools=[foo, 'bar'], toolpath=['tools'])
+print "env1['TOOL_FOO'] =", env1.get('TOOL_FOO')
+print "env1['TOOL_BAR'] =", env1.get('TOOL_BAR')
+
+# pick a built-in tool with pretty simple behavior
+env2 = Environment(tools=['SCCS'])
+print "env2['SCCS'] =", env2.get('SCCS')
+print "env2['TOOL_SCCS1'] =", env2.get('TOOL_SCCS1')
+print "env2['TOOL_SCCS2'] =", env2.get('TOOL_SCCS2')
+
+env3 = Environment(tools=['SCCS'], toolpath=['.'])
+print "env3['SCCS'] =", env3.get('SCCS')
+print "env3['TOOL_SCCS1'] =", env3.get('TOOL_SCCS1')
+print "env3['TOOL_SCCS2'] =", env3.get('TOOL_SCCS2')
+
+env4 = Environment(tools=['SCCS'], toolpath=['tools'])
+print "env4['SCCS'] =", env4.get('SCCS')
+print "env4['TOOL_SCCS1'] =", env4.get('TOOL_SCCS1')
+print "env4['TOOL_SCCS2'] =", env4.get('TOOL_SCCS2')
+
+env5 = Environment(tools=['SCCS'], toolpath=['tools', '.'])
+print "env5['SCCS'] =", env5.get('SCCS')
+print "env5['TOOL_SCCS1'] =", env5.get('TOOL_SCCS1')
+print "env5['TOOL_SCCS2'] =", env5.get('TOOL_SCCS2')
+
+env6 = Environment(tools=['SCCS'], toolpath=['.', 'tools'])
+print "env6['SCCS'] =", env6.get('SCCS')
+print "env6['TOOL_SCCS1'] =", env6.get('TOOL_SCCS1')
+print "env6['TOOL_SCCS2'] =", env6.get('TOOL_SCCS2')
+
+env7 = Environment(TOOLPATH="tools", tools=['SCCS'], toolpath=['$TOOLPATH'])
+print "env7['SCCS'] =", env7.get('SCCS')
+print "env7['TOOL_SCCS1'] =", env7.get('TOOL_SCCS1')
+print "env7['TOOL_SCCS2'] =", env7.get('TOOL_SCCS2')
+
+env8 = Environment(tools=[])
+env8.Tool('SCCS', toolpath=['tools'])
+print "env8['SCCS'] =", env8.get('SCCS')
+print "env8['TOOL_SCCS1'] =", env8.get('TOOL_SCCS1')
+print "env8['TOOL_SCCS2'] =", env8.get('TOOL_SCCS2')
+
+env9 = Environment(tools=[])
+Tool('SCCS', toolpath=['tools'])(env9)
+print "env9['SCCS'] =", env9.get('SCCS')
+print "env9['TOOL_SCCS1'] =", env9.get('TOOL_SCCS1')
+print "env9['TOOL_SCCS2'] =", env9.get('TOOL_SCCS2')
+
+env0 = Environment(TOOLPATH='tools', tools=[])
+env0.Tool('SCCS', toolpath=['$TOOLPATH'])
+print "env0['SCCS'] =", env0.get('SCCS')
+print "env0['TOOL_SCCS1'] =", env0.get('TOOL_SCCS1')
+print "env0['TOOL_SCCS2'] =", env0.get('TOOL_SCCS2')
+
+base = Environment(tools=[], toolpath=['tools'])
+derived = base.Clone(tools=['bar'])
+print "derived['TOOL_BAR'] =", derived.get('TOOL_BAR')
+""")
+
+test.write('SCCS.py', r"""\
+def generate(env):
+    env['TOOL_SCCS1'] = 1
+def exists(env):
+    return 1
+""")
+
+test.subdir('tools')
+
+test.write(['tools', 'Common.py'], r"""\
+One = 1
+""")
+
+test.write(['tools', 'SCCS.py'], r"""\
+import Common
+def generate(env):
+    env['TOOL_SCCS2'] = Common.One
+def exists(env):
+    return Common.One
+""")
+
+test.write(['tools', 'bar.py'], r"""\
+def generate(env):
+    env['TOOL_BAR'] = 1
+def exists(env):
+    return 1
+""")
+
+test.run(arguments = '.', stdout = """\
+scons: Reading SConscript files ...
+env1['TOOL_FOO'] = 1
+env1['TOOL_BAR'] = 1
+env2['SCCS'] = sccs
+env2['TOOL_SCCS1'] = None
+env2['TOOL_SCCS2'] = None
+env3['SCCS'] = None
+env3['TOOL_SCCS1'] = 1
+env3['TOOL_SCCS2'] = None
+env4['SCCS'] = None
+env4['TOOL_SCCS1'] = None
+env4['TOOL_SCCS2'] = 1
+env5['SCCS'] = None
+env5['TOOL_SCCS1'] = None
+env5['TOOL_SCCS2'] = 1
+env6['SCCS'] = None
+env6['TOOL_SCCS1'] = 1
+env6['TOOL_SCCS2'] = None
+env7['SCCS'] = None
+env7['TOOL_SCCS1'] = None
+env7['TOOL_SCCS2'] = 1
+env8['SCCS'] = None
+env8['TOOL_SCCS1'] = None
+env8['TOOL_SCCS2'] = 1
+env9['SCCS'] = None
+env9['TOOL_SCCS1'] = None
+env9['TOOL_SCCS2'] = 1
+env0['SCCS'] = None
+env0['TOOL_SCCS1'] = None
+env0['TOOL_SCCS2'] = 1
+derived['TOOL_BAR'] = 1
+scons: done reading SConscript files.
+scons: Building targets ...
+scons: `.' is up to date.
+scons: done building targets.
+""")
+
+test.pass_test()