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

3 files changed, 25 insertions, 5 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