summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-05-19 03:01:10 (GMT)
committerSteven Knight <knight@baldmt.com>2003-05-19 03:01:10 (GMT)
commita371da732f6b9bdf35639b88b0e6b8370b088261 (patch)
treec485f67398f32e8851d5e7ecad397c709cbaa464 /src
parenta4a6636bb15d7544abb5ee360aff6c7bb9ee21be (diff)
downloadSCons-a371da732f6b9bdf35639b88b0e6b8370b088261.zip
SCons-a371da732f6b9bdf35639b88b0e6b8370b088261.tar.gz
SCons-a371da732f6b9bdf35639b88b0e6b8370b088261.tar.bz2
Change the Building message to say Cleaning when the -c option is used.
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/engine/SCons/Script/__init__.py8
2 files changed, 9 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index df77749..1733520 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -90,6 +90,9 @@ RELEASE 0.14 - XXX
- Optimize out calling hasattr() before accessing attributes.
+ - Say "Cleaning targets" (not "Building...") when the -c option is
+ used.
+
From Damyan Pepper:
- Quote the "Entering directory" message like Make.
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index a1a54e6..c5e469a 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -908,6 +908,8 @@ def _main():
calc = None
task_class = BuildTask # default action is to build targets
+ opening_message = "Building targets ..."
+ closing_message = "done building targets."
if options.question:
task_class = QuestionTask
try:
@@ -923,6 +925,8 @@ def _main():
def write(self):
pass
calc = CleanCalculator()
+ opening_message = "Cleaning targets ..."
+ closing_message = "done cleaning targets."
except AttributeError:
pass
@@ -946,7 +950,7 @@ def _main():
"""Leave the order of dependencies alone."""
return dependencies
- display("scons: Building targets ...")
+ display("scons: " + opening_message)
taskmaster = SCons.Taskmaster.Taskmaster(nodes, task_class, calc, order)
jobs = SCons.Job.Jobs(ssoptions.get('num_jobs'), taskmaster)
@@ -954,7 +958,7 @@ def _main():
try:
jobs.run()
finally:
- display("scons: done building targets.")
+ display("scons: " + closing_message)
SCons.Sig.write()
def main():