summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-11-23 08:12:11 (GMT)
committerSteven Knight <knight@baldmt.com>2002-11-23 08:12:11 (GMT)
commite891e39fcc8671d7a5ad2073e866d85ad9c9e362 (patch)
tree4f55b4289e3c4abe3cbc5f9cece674db33b611e0
parent35fa4fb9b7914a860b985bc306f50e1b25dc6361 (diff)
downloadSCons-e891e39fcc8671d7a5ad2073e866d85ad9c9e362.zip
SCons-e891e39fcc8671d7a5ad2073e866d85ad9c9e362.tar.gz
SCons-e891e39fcc8671d7a5ad2073e866d85ad9c9e362.tar.bz2
Make building source files fail like Make.
-rw-r--r--src/CHANGES.txt2
-rw-r--r--src/engine/SCons/Script/__init__.py2
-rw-r--r--test/SideEffect.py1
-rw-r--r--test/preserve-source.py3
4 files changed, 7 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index d74788d..0c6325f 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -54,6 +54,8 @@ RELEASE 0.09 -
- Add separate $SHOBJPREFIX and $SHOBJSUFFIX construction variables
(by default, the same as $OBJPREFIX and $OBJSUFFIX).
+ - Add a Make-like message when asked to build a source file.
+
From Steven Knight and Anthony Roach:
- Man page: document the fact that Builder calls return Node objects.
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 3f3ff8d..814d147 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -105,6 +105,8 @@ class BuildTask(SCons.Taskmaster.Task):
def executed(self):
SCons.Taskmaster.Task.executed(self)
+ if not self.targets[0].builder and self.top:
+ print "scons: Nothing to be done for `%s'." % str(self.targets[0])
# print the tree here instead of in execute() because
# this method is serialized, but execute isn't:
if print_tree and self.top:
diff --git a/test/SideEffect.py b/test/SideEffect.py
index 6e37420..6337f68 100644
--- a/test/SideEffect.py
+++ b/test/SideEffect.py
@@ -70,6 +70,7 @@ test.write('bar.in', 'bar.in 2 \n')
test.run(arguments = 'log.txt', stdout=test.wrap_stdout("""\
copy() < bar.in > bar.out
copy() < blat.in > blat.out
+scons: Nothing to be done for `log.txt'.
"""))
expect = """\
diff --git a/test/preserve-source.py b/test/preserve-source.py
index b0acdaa..5eddeec 100644
--- a/test/preserve-source.py
+++ b/test/preserve-source.py
@@ -53,7 +53,8 @@ test.run(arguments = '.')
test.fail_test(test.read('aaa.out') != "aaa.in\n")
#
-test.run(arguments = "aaa.in", stdout = test.wrap_stdout(""))
+test.run(arguments = "aaa.in",
+ stdout = test.wrap_stdout("scons: Nothing to be done for `aaa.in'.\n"))
test.fail_test(not os.path.exists('aaa.in'))