summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2001-10-26 17:12:27 (GMT)
committerSteven Knight <knight@baldmt.com>2001-10-26 17:12:27 (GMT)
commit72bf1332c237068b5a3fac1bb5342530237f36f0 (patch)
tree7784d77922fec9c64fdaccb0039099af25b6d3c9 /src/script
parent123be6df3fe113bad181c0c93aab4ee58b26e91f (diff)
downloadSCons-72bf1332c237068b5a3fac1bb5342530237f36f0.zip
SCons-72bf1332c237068b5a3fac1bb5342530237f36f0.tar.gz
SCons-72bf1332c237068b5a3fac1bb5342530237f36f0.tar.bz2
Make up-to-date messages get printed out in the correct order Mark II
Diffstat (limited to 'src/script')
-rw-r--r--src/script/scons.py21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/script/scons.py b/src/script/scons.py
index 5f5d45d..8f48f9c 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -61,17 +61,16 @@ from SCons.Defaults import *
class BuildTask(SCons.Taskmaster.Task):
"""An SCons build task."""
def execute(self):
- try:
- self.target.build()
- except BuildError, e:
- sys.stderr.write("scons: *** [%s] Error %d\n" % (e.node, e.stat))
- raise
-
- def up_to_date(self):
- if self.top:
- print 'scons: "%s" is up to date.' % str(self.target)
- SCons.Taskmaster.Task.up_to_date(self)
-
+ if self.target.get_state() == SCons.Node.up_to_date:
+ if self.top:
+ print 'scons: "%s" is up to date.' % str(self.target)
+ else:
+ try:
+ self.target.build()
+ except BuildError, e:
+ sys.stderr.write("scons: *** [%s] Error %d\n" % (e.node, e.stat))
+ raise
+
def failed(self):
global ignore_errors
if ignore_errors: