Merged revisions 4645,4647-4651,4654-4656 via svnmerge from

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

........
  r4648 | managan | 2010-01-22 09:40:52 -0800 (Fri, 22 Jan 2010) | 9 lines

  Added dismbiguate calls on a targets side effects in the
  make_ready_all and make_ready_current routines of Taskmaster.py.
  This fixes Stefan Hepp's problem with latex. Directories to
  hold the side effect files were not created when using
  variantDir with duplicate=0

  Modifying subdir_variantdir_include2.py to run scons with an
  explicit target to reveal this problem.
........
  r4654 | stevenknight | 2010-01-27 07:41:01 -0800 (Wed, 27 Jan 2010) | 5 lines

  Issue 2534:  fix Scanners' default ability to return Dir nodes by
  making the default node_class the real SCons.Node.FS.Base class,
  not SCons.Node.FS.Entry (which is now, and has been for some time,
  a subclass).
........

1 files changed, 84 insertions, 0 deletions

diff --git a/test/Scanner/Dir.py b/test/Scanner/Dir.py
new file mode 100644
index 00000000..120e08ff
--- /dev/null
+++ b/test/Scanner/Dir.py
@@ -0,0 +1,84 @@
+#!/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 a simple scanner that returns Dir nodes works correctly.
+
+Submitted as tigris.org issue #2534.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir(['src'])
+
+test.write(['SConstruct'], """\
+env = Environment()
+Export('env')
+
+env.VariantDir('build', 'src')
+env.SConscript('build/SConscript.py')
+""")
+
+test.write(['src', 'SConscript.py'], """\
+Import('env')
+
+def myscanner(node, env, path):
+    return [ env.Dir('#/install/dir2') ] # Gives error
+
+def mybuilder(target, source, env):
+    env.Execute(Copy(target[0], source[0]))
+    return None
+
+env['BUILDERS']['MyBuilder'] = env.Builder(action=mybuilder, source_scanner=env.Scanner(function=myscanner))
+
+out = env.MyBuilder('outfile1', 'infile1')
+
+env.Install('#/install/dir1', out)
+env.Install('#/install/dir2','infile2')
+""")
+
+test.write(['src', 'infile1'], """\
+src/infile1
+""")
+
+test.write(['src', 'infile2'], """\
+src/infile2
+""")
+
+test.run(arguments = '.')
+
+test.must_match(['install', 'dir1', 'outfile1'], "src/infile1\n")
+test.must_match(['install', 'dir2', 'infile2'], "src/infile2\n")
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: