Merged revisions 3611-3763,3765-3794,3796-3811,3813-3839,3841-3847 via svnmerge from

http://scons.tigris.org/svn/scons/checkpoint

................
  r3765 | stevenknight | 2008-11-04 07:57:03 -0800 (Tue, 04 Nov 2008) | 2 lines

  Update release info for checkpoint.
................
  r3796 | stevenknight | 2008-11-25 21:56:26 -0800 (Tue, 25 Nov 2008) | 2 lines

  Updates for 20081125 checkpoint release.
................
  r3797 | stevenknight | 2008-11-26 08:21:04 -0800 (Wed, 26 Nov 2008) | 2 lines

  User's Guide updates for changes to error messages.
................
  r3813 | stevenknight | 2008-12-07 19:13:17 -0800 (Sun, 07 Dec 2008) | 2 lines

  Update lines for the 20081207 checkpoint release (candidate for 1.2.0).
................
  r3814 | stevenknight | 2008-12-07 19:35:09 -0800 (Sun, 07 Dec 2008) | 2 lines

  Update troubleshoot.xml for the changes to taskmastertrace output.
................
  r3847 | stevenknight | 2008-12-21 07:57:50 -0800 (Sun, 21 Dec 2008) | 9 lines

  Merged revisions 3610-3840,3842-3846 via svnmerge from
  http://scons.tigris.org/svn/scons/release

  ........
    r3842 | stevenknight | 2008-12-20 22:48:14 -0800 (Sat, 20 Dec 2008) | 2 lines

    Update files for 1.2.0.
  ........
................

3 files changed, 38 insertions, 10 deletions

diff --git a/doc/user/misc.xml b/doc/user/misc.xml
index cd09274..f6dec57 100644
--- a/doc/user/misc.xml
+++ b/doc/user/misc.xml
@@ -350,7 +350,7 @@
        % <userinput>scons -Q</userinput>
        None
        derived
-       scons: *** Source `leaf' not found, needed by target `derived'.  Stop.
+       scons: *** [derived] Source `leaf' not found, needed by target `derived'.
     </screen>
 
     <programlisting>
diff --git a/doc/user/output.xml b/doc/user/output.xml
index d42457a..08d28d1 100644
--- a/doc/user/output.xml
+++ b/doc/user/output.xml
@@ -683,9 +683,9 @@
           scons: `.' is up to date.
           Build succeeded.
           % <userinput>scons -Q fail=1</userinput>
-          scons: *** Source `source' not found, needed by target `target'.  Stop.
+          scons: *** [target] Source `source' not found, needed by target `target'.
           FAILED!!!!
-          Failed building Source `source' not found, needed by target `target'.
+          Failed building target: Source `source' not found, needed by target `target'.
     </screen>
 
   </section>
diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml
index 75079d9..5171638 100644
--- a/doc/user/troubleshoot.xml
+++ b/doc/user/troubleshoot.xml
@@ -1096,7 +1096,7 @@
 
     <screen>
       % <userinput>scons -Q</userinput>
-      scons: *** Source `prog.c' not found, needed by target `prog.o'.  Stop.
+      scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
     </screen>
 
     <para>
@@ -1114,12 +1114,12 @@
 
     <screen>
       % <userinput>scons -Q --debug=stacktrace</userinput>
-      scons: *** Source `prog.c' not found, needed by target `prog.o'.  Stop.
+      scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
       scons: internal stack trace:
         File "bootstrap/src/engine/SCons/Job.py", line 197, in start
         File "bootstrap/src/engine/SCons/Script/Main.py", line 167, in prepare
-        File "bootstrap/src/engine/SCons/Taskmaster.py", line 182, in prepare
-        File "bootstrap/src/engine/SCons/Executor.py", line 171, in prepare
+        File "bootstrap/src/engine/SCons/Taskmaster.py", line 188, in prepare
+        File "bootstrap/src/engine/SCons/Executor.py", line 175, in prepare
     </screen>
 
     <para>
@@ -1178,31 +1178,59 @@
       Taskmaster: Looking for a node to evaluate
       Taskmaster:     Considering node &lt;no_state   0   'prog'&gt; and its children:
       Taskmaster:        &lt;no_state   0   'prog.o'&gt;
-      Taskmaster:      adjusting ref count: &lt;pending    1   'prog'&gt;
+      Taskmaster:      adjusted ref count: &lt;pending    1   'prog'&gt;, child 'prog.o'
       Taskmaster:     Considering node &lt;no_state   0   'prog.o'&gt; and its children:
       Taskmaster:        &lt;no_state   0   'prog.c'&gt;
       Taskmaster:        &lt;no_state   0   'inc.h'&gt;
-      Taskmaster:      adjusting ref count: &lt;pending    1   'prog.o'&gt;
-      Taskmaster:      adjusting ref count: &lt;pending    2   'prog.o'&gt;
+      Taskmaster:      adjusted ref count: &lt;pending    1   'prog.o'&gt;, child 'prog.c'
+      Taskmaster:      adjusted ref count: &lt;pending    2   'prog.o'&gt;, child 'inc.h'
       Taskmaster:     Considering node &lt;no_state   0   'prog.c'&gt; and its children:
       Taskmaster: Evaluating &lt;pending    0   'prog.c'&gt;
       
+      Task.make_ready_current(): node &lt;pending    0   'prog.c'&gt;
+      Task.prepare():      node &lt;up_to_date 0   'prog.c'&gt;
+      Task.executed_with_callbacks(): node &lt;up_to_date 0   'prog.c'&gt;
+      Task.postprocess():  node &lt;up_to_date 0   'prog.c'&gt;
+      Task.postprocess():  removing &lt;up_to_date 0   'prog.c'&gt;
+      Task.postprocess():  adjusted parent ref count &lt;pending    1   'prog.o'&gt;
+      
       Taskmaster: Looking for a node to evaluate
       Taskmaster:     Considering node &lt;no_state   0   'inc.h'&gt; and its children:
       Taskmaster: Evaluating &lt;pending    0   'inc.h'&gt;
       
+      Task.make_ready_current(): node &lt;pending    0   'inc.h'&gt;
+      Task.prepare():      node &lt;up_to_date 0   'inc.h'&gt;
+      Task.executed_with_callbacks(): node &lt;up_to_date 0   'inc.h'&gt;
+      Task.postprocess():  node &lt;up_to_date 0   'inc.h'&gt;
+      Task.postprocess():  removing &lt;up_to_date 0   'inc.h'&gt;
+      Task.postprocess():  adjusted parent ref count &lt;pending    0   'prog.o'&gt;
+      
       Taskmaster: Looking for a node to evaluate
       Taskmaster:     Considering node &lt;pending    0   'prog.o'&gt; and its children:
       Taskmaster:        &lt;up_to_date 0   'prog.c'&gt;
       Taskmaster:        &lt;up_to_date 0   'inc.h'&gt;
       Taskmaster: Evaluating &lt;pending    0   'prog.o'&gt;
+      
+      Task.make_ready_current(): node &lt;pending    0   'prog.o'&gt;
+      Task.prepare():      node &lt;executing  0   'prog.o'&gt;
+      Task.execute():      node &lt;executing  0   'prog.o'&gt;
       cc -o prog.o -c -I. prog.c
+      Task.executed_with_callbacks(): node &lt;executing  0   'prog.o'&gt;
+      Task.postprocess():  node &lt;executed   0   'prog.o'&gt;
+      Task.postprocess():  removing &lt;executed   0   'prog.o'&gt;
+      Task.postprocess():  adjusted parent ref count &lt;pending    0   'prog'&gt;
       
       Taskmaster: Looking for a node to evaluate
       Taskmaster:     Considering node &lt;pending    0   'prog'&gt; and its children:
       Taskmaster:        &lt;executed   0   'prog.o'&gt;
       Taskmaster: Evaluating &lt;pending    0   'prog'&gt;
+      
+      Task.make_ready_current(): node &lt;pending    0   'prog'&gt;
+      Task.prepare():      node &lt;executing  0   'prog'&gt;
+      Task.execute():      node &lt;executing  0   'prog'&gt;
       cc -o prog prog.o
+      Task.executed_with_callbacks(): node &lt;executing  0   'prog'&gt;
+      Task.postprocess():  node &lt;executed   0   'prog'&gt;
       
       Taskmaster: Looking for a node to evaluate
       Taskmaster: No candidate anymore.