Better error message when a source file is missing.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@907 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index be8dfa04cf38ee02a5c23b6e0c6c099eb2517917..9e7431427eadf01c9267d746002d65a7f1d44140 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -186,6 +186,9 @@ RELEASE 0.95 - XXX
     having the same string re-appended to the end, yielding an incorrect
     path name.
 
+  - Supply a more descriptive error message when the source for a target
+    can't be found.
+
   From Vincent Risi:
 
   - Add support for the bcc32, ilink32 and tlib Borland tools.

diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 88aa120ae575af648a51fae6e2b13505644cb8c9..861b5540f393339e492adc3a96fa82d3f406e724 100644 (file)
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -598,7 +598,7 @@ class Node:
                    not node.rexists()
         missing_sources = filter(missing, self.children())
         if missing_sources:
-            desc = "No Builder for target `%s', needed by `%s'." % (missing_sources[0], self)
+            desc = "Source `%s' not found, needed by target `%s'." % (missing_sources[0], self)
             raise SCons.Errors.StopError, desc
 
     def remove(self):

diff --git a/test/Alias.py b/test/Alias.py
index 2a14c024b6cad505fb87573f9f73cb532ddd9799..631aa30707647280911ecff953b1740a3f05cb03 100644 (file)
--- a/test/Alias.py
+++ b/test/Alias.py
@@ -171,7 +171,7 @@ env.Alias('A', 'B')
 """)
 
 test.run(arguments='A',
-         stderr="scons: \\*\\*\\* No Builder for target `D', needed by `C'.  Stop.\n",
+         stderr="scons: \\*\\*\\* Source `D' not found, needed by target `C'.  Stop.\n",
          status=2)
 
 test.pass_test()

diff --git a/test/bad-drive.py b/test/bad-drive.py
index d7a820f332845f9f9111deb418b1cdff30e56a55..612b24b033420346cb1ef76ffd6ebb13e6f9d925 100644 (file)
--- a/test/bad-drive.py
+++ b/test/bad-drive.py
@@ -94,11 +94,11 @@ test.run(arguments = bad_drive + 'no_target_1',
          status = 2)
 
 test.run(arguments = bad_drive + 'no_target_2',
-         stderr = "scons: *** No Builder for target `ccc.does_not_exist', needed by `%sno_target_2'.  Stop.\n" % bad_drive,
+         stderr = "scons: *** Source `ccc.does_not_exist' not found, needed by target `%sno_target_2'.  Stop.\n" % bad_drive,
          status = 2)
 
 test.run(arguments = 'ddd.out',
-         stderr = "scons: *** No Builder for target `%sno_source', needed by `ddd.out'.  Stop.\n" % bad_drive,
+         stderr = "scons: *** Source `%sno_source' not found, needed by target `ddd.out'.  Stop.\n" % bad_drive,
          status = 2)
 
 test.pass_test()

diff --git a/test/nonexistent.py b/test/nonexistent.py
index 05dd9d09190f40447e7a0aface000f2dd6fb3019..3e47cbe675b97681c35e5475e352fcc341ae41b7 100644 (file)
--- a/test/nonexistent.py
+++ b/test/nonexistent.py
@@ -54,12 +54,12 @@ test.run(arguments = '-k foo/bar foo',
          status = 2)
 
 test.run(arguments = "aaa.out",
-         stderr = "scons: *** No Builder for target `aaa.in', needed by `aaa.out'.  Stop.\n",
+         stderr = "scons: *** Source `aaa.in' not found, needed by target `aaa.out'.  Stop.\n",
          status = 2)
 
 test.run(arguments = "-k bbb.out aaa.out",
-         stderr = """scons: *** No Builder for target `bbb.in', needed by `bbb.out'.
-scons: *** No Builder for target `aaa.in', needed by `aaa.out'.
+         stderr = """scons: *** Source `bbb.in' not found, needed by target `bbb.out'.
+scons: *** Source `aaa.in' not found, needed by target `aaa.out'.
 """,
          status = 2)