Merged revisions 2880-2883,2885-2895 via svnmerge from

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

........
  r2885 | stevenknight | 2008-04-18 21:38:59 -0700 (Fri, 18 Apr 2008) | 2 lines

  Update troubleshooting appendix for new Taskmaster output.
........
  r2886 | bdbaddog | 2008-04-19 15:15:03 -0700 (Sat, 19 Apr 2008) | 5 lines

  Fix infinite loop in Fortran tool initialization.
  Bug 2017.
  Steven fixed, I tested.
........
  r2887 | garyo | 2008-04-20 17:44:46 -0700 (Sun, 20 Apr 2008) | 1 line

  Added this in two sections; simple one when discussing simple builds, and an example in the VariantDir section showing how it still works there.
........
  r2888 | stevenknight | 2008-04-20 21:33:01 -0700 (Sun, 20 Apr 2008) | 4 lines

  Accomodate test/MSVC/msvc.py's reliance on the Windows Platform SDK
  (for now) by making use of the user's %INCLUDE% and %LIB% variables.
  Split some independent embedded subtests into their own test scripts.
........
  r2889 | stevenknight | 2008-04-20 21:38:05 -0700 (Sun, 20 Apr 2008) | 2 lines

  Windows portability fix (line endings).
........
  r2890 | stevenknight | 2008-04-20 21:44:24 -0700 (Sun, 20 Apr 2008) | 2 lines

  Update Windows portion of if:-elif: block for a variable name change.
........
  r2891 | stevenknight | 2008-04-20 21:52:41 -0700 (Sun, 20 Apr 2008) | 3 lines

  On Windows, escape backslashes on the --interactive command line input,
  so people can build targets in other directories.
........
  r2892 | stevenknight | 2008-04-20 21:56:50 -0700 (Sun, 20 Apr 2008) | 3 lines

  Fix ripple effects on Windows from redefining how $CXXFLAGS gets
  added to C++ command lines.
........
  r2893 | stevenknight | 2008-04-20 22:04:50 -0700 (Sun, 20 Apr 2008) | 4 lines

  Handle a ripple effect from redefining the file() and open() builtin
  functions by explicitly restoring the originals whenever we reset
  the global state between tests.
........
  r2894 | stevenknight | 2008-04-20 23:17:23 -0700 (Sun, 20 Apr 2008) | 2 lines

  Remove by-hand backslash escaping, now that --interactive mode is handling it.
........
  r2895 | stevenknight | 2008-04-20 23:23:04 -0700 (Sun, 20 Apr 2008) | 2 lines

  Mention the fix for the Fortran suffix out-of-memory bug
........

1 files changed, 30 insertions, 20 deletions

diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml
index dc90622..0a34559 100644
--- a/doc/user/troubleshoot.xml
+++ b/doc/user/troubleshoot.xml
@@ -1115,11 +1115,10 @@
       % <userinput>scons -Q --debug=stacktrace</userinput>
       scons: *** Source `prog.c' not found, needed by target `prog.o'.  Stop.
       scons: internal stack trace:
-        File "bootstrap/src/engine/SCons/Job.py", line 131, in start
+        File "bootstrap/src/engine/SCons/Job.py", line 187, in start
         File "bootstrap/src/engine/SCons/Script/Main.py", line 169, in prepare
-        File "bootstrap/src/engine/SCons/Taskmaster.py", line 169, in prepare
-        File "bootstrap/src/engine/SCons/Node/FS.py", line 2551, in prepare
-        File "bootstrap/src/engine/SCons/Node/__init__.py", line 349, in prepare
+        File "bootstrap/src/engine/SCons/Taskmaster.py", line 184, in prepare
+        File "bootstrap/src/engine/SCons/Executor.py", line 171, in prepare
     </screen>
 
     <para>
@@ -1174,24 +1173,35 @@
 
     <screen>
       % <userinput>scons -Q --taskmastertrace=- prog</userinput>
-      Taskmaster: 'prog': children:
-          ['prog.o']
-          waiting on unfinished children:
-          ['prog.o']
-      Taskmaster: 'prog.o': children:
-          ['inc.h', 'prog.c']
-          waiting on unfinished children:
-          ['inc.h', 'prog.c']
-      Taskmaster: 'prog.c': evaluating prog.c
-      Taskmaster: 'inc.h': evaluating inc.h
-      Taskmaster: 'prog.o': children:
-          ['inc.h', 'prog.c']
-          evaluating prog.o
+      
+      Taskmaster: Looking for a node to evaluate
+      Taskmaster:     Considering node &lt;no_state   'prog'&gt; and its children:
+      Taskmaster:        &lt;no_state   'prog.o'&gt;
+      Taskmaster:     Considering node &lt;no_state   'prog.o'&gt; and its children:
+      Taskmaster:        &lt;no_state   'prog.c'&gt;
+      Taskmaster:        &lt;no_state   'inc.h'&gt;
+      Taskmaster:     Considering node &lt;no_state   'prog.c'&gt; and its children:
+      Taskmaster: Evaluating &lt;pending    'prog.c'&gt;
+      
+      Taskmaster: Looking for a node to evaluate
+      Taskmaster:     Considering node &lt;no_state   'inc.h'&gt; and its children:
+      Taskmaster: Evaluating &lt;pending    'inc.h'&gt;
+      
+      Taskmaster: Looking for a node to evaluate
+      Taskmaster:     Considering node &lt;pending    'prog.o'&gt; and its children:
+      Taskmaster:        &lt;up_to_date 'prog.c'&gt;
+      Taskmaster:        &lt;up_to_date 'inc.h'&gt;
+      Taskmaster: Evaluating &lt;pending    'prog.o'&gt;
       cc -o prog.o -c -I. prog.c
-      Taskmaster: 'prog': children:
-          ['prog.o']
-          evaluating prog
+      
+      Taskmaster: Looking for a node to evaluate
+      Taskmaster:     Considering node &lt;pending    'prog'&gt; and its children:
+      Taskmaster:        &lt;executed   'prog.o'&gt;
+      Taskmaster: Evaluating &lt;pending    'prog'&gt;
       cc -o prog prog.o
+      
+      Taskmaster: Looking for a node to evaluate
+      Taskmaster: No candidate anymore.
     </screen>
 
     <para>