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).
........

5 files changed, 116 insertions, 72 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index c4f50dc..0d5a045 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,15 +8,31 @@
 
 
 
-RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800  
+RELEASE X.X.X - XXX
 
   From Luca Falavigna:
 
     - Fix typos in the man page.
 
+  From Steven Knight:
 
+    - Make the messages for Configure checks of compilers consistent.
 
-RELEASE X.X.X - XXX
+  From Rob Managan:
+
+    - Update tex builder to handle the case where a \input{foo}
+      command tries to work with a directory named foo instead of the
+      file foo.tex. The builder now ignores a directory and continues
+      searching to find the correct file. Thanks to Lennart Sauerbeck
+      for the test case and initial patch
+      
+      Also allow the \include of files in subdirectories when variantDir
+      is used with duplicate=0. Previously latex would crash since 
+      the directory in which the .aux file is written was not created.
+      Thanks to Stefan Hepp for finding this and part of the solution.
+
+
+RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800  
 
   From Jim Randall:
     - Fixed temp filename race condition on Windows with long cmd lines.
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py
index cbf829c..da82060 100644
--- a/src/engine/SCons/Scanner/__init__.py
+++ b/src/engine/SCons/Scanner/__init__.py
@@ -92,7 +92,9 @@ class Base:
                  argument = _null,
                  skeys = _null,
                  path_function = None,
-                 node_class = SCons.Node.FS.Entry,
+                 # Node.FS.Base so that, by default, it's okay for a
+                 # scanner to return a Dir, File or Entry.
+                 node_class = SCons.Node.FS.Base,
                  node_factory = None,
                  scan_check = None,
                  recursive = None):
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index 1c65ee3..c123ca5 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -359,7 +359,8 @@ class Task:
         for t in self.targets:
             t.disambiguate().set_state(NODE_EXECUTING)
             for s in t.side_effects:
-                s.set_state(NODE_EXECUTING)
+                # add disambiguate here to mirror the call on targets above
+                s.disambiguate().set_state(NODE_EXECUTING)
 
     def make_ready_current(self):
         """
@@ -390,7 +391,8 @@ class Task:
             for t in self.targets:
                 t.set_state(NODE_EXECUTING)
                 for s in t.side_effects:
-                    s.set_state(NODE_EXECUTING)
+                    # add disambiguate here to mirror the call on targets in first loop above
+                    s.disambiguate().set_state(NODE_EXECUTING)
         else:
             for t in self.targets:
                 # We must invoke visited() to ensure that the node
diff --git a/test/Scanner/Dir.py b/test/Scanner/Dir.py
new file mode 100644
index 0000000..120e08f
--- /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:
diff --git a/test/TEX/subdir_variantdir_include2.py b/test/TEX/subdir_variantdir_include2.py
index 68607b1..b195bc0 100644
--- a/test/TEX/subdir_variantdir_include2.py
+++ b/test/TEX/subdir_variantdir_include2.py
@@ -58,15 +58,12 @@ import os
 env = Environment(TOOLS = ['tex', 'pdftex'],ENV = {'PATH' : os.environ['PATH']})
 
 env.VariantDir('build', 'docs', duplicate=0)
-graph = env.PDF('build/fig/graph.eps')
 pdf = env.PDF('build/main.tex')
-Depends(pdf, graph)
 """)
 
 test.write(['docs','main.tex'],
 r"""\documentclass{article}
 \usepackage{makeidx}
-\usepackage{graphicx}
 \makeindex
 \begin{document}
 Hi there.
@@ -87,70 +84,13 @@ Sub-chapter 2
 
 """)
 
-test.write(['docs','fig','graph.eps'], """\
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: Fig1.fig
-%%Creator: fig2dev Version 3.2 Patchlevel 4
-%%CreationDate: Tue Apr 25 09:56:11 2006
-%%For: managan@mangrove.llnl.gov (Rob Managan)
-%%BoundingBox: 0 0 98 98
-%%Magnification: 1.0000
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {0 setgray} bind def
-/col0 {0.000 0.000 0.000 srgb} bind def
-
-end
-save
-newpath 0 98 moveto 0 0 lineto 98 0 lineto 98 98 lineto closepath clip newpath
--24.9 108.2 translate
-1 -1 scale
-
-/gr {grestore} bind def
-/gs {gsave} bind def
-/rs {restore} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/sc {scale} bind def
-/sf {setfont} bind def
-/scf {scalefont} bind def
-/tr {translate} bind def
- /DrawEllipse {
-	/endangle exch def
-	/startangle exch def
-	/yrad exch def
-	/xrad exch def
-	/y exch def
-	/x exch def
-	/savematrix mtrx currentmatrix def
-	x y tr xrad yrad sc 0 0 1 startangle endangle arc
-	closepath
-	savematrix setmatrix
-	} def
-
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-
-$F2psBegin
-10 setmiterlimit
- 0.06299 0.06299 sc
-%
-% Fig objects follow
-% 
-7.500 slw
-% Ellipse
-n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
-
-$F2psEnd
-rs
-""")
-
 #test.run(arguments = '.')
-test.run(arguments = '.', stderr=None, stdout=None)
+#test.run(arguments = '.', stderr=None, stdout=None)
+
+# next line tests that side effect nodes get disambiguated 
+# and their directories created in a variantDir before 
+# the builder tries to populate them and fails
+test.run(arguments = 'build/main.pdf', stderr=None, stdout=None)
 
 test.must_exist(['build', 'main.aux'])
 test.must_exist(['build', 'main.fls'])
@@ -191,7 +131,7 @@ test.must_not_exist(['docs', 'content', 'chapter.aux'])
 test.up_to_date(arguments = '.', stderr=None, stdout=None)
 
 test.write(['docs','content', 'subchap.tex'], """\
-Sub-document 2
+Sub-document 2a
 """)
 
 test.not_up_to_date(arguments = '.')