Check all targets when deciding if a target is up to date. (Patrick Mezard)

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 7922bcc52c8d10edc0fb989dc1b30bdfb3b0ec61..7656c6bdc73368dd6497a2a5f652bdc7de072238 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -375,6 +375,12 @@ RELEASE 0.97 - XXX
 
   - Improve SWIG tests for use on Mac OS X (Darwin).
 
+  From Patrick Mezard:
+
+  - Execute build commands for a command-line target if any of the
+    files built along with the target is out of date or non-existent,
+    not just if the command-line target itself is out of date.
+
   From Georg Mischler:
 
   - Remove the space after the -o option when invoking the Borland

diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 67b3308a77072461c1050c9d7517fd49c6290ff9..a5e07b41c5a5b795bad3bd50332a9e6a5479d1ae 100644 (file)
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -79,19 +79,22 @@ class BuildTask(SCons.Taskmaster.Task):
         display('scons: ' + message)
 
     def execute(self):
-        target = self.targets[0]
-        if target.get_state() == SCons.Node.up_to_date:
+        for target in self.targets:
+            if target.get_state() == SCons.Node.up_to_date: 
+                continue
+            if target.has_builder() and not hasattr(target.builder, 'status'):
+                if print_time:
+                    start_time = time.time()
+                SCons.Taskmaster.Task.execute(self)
+                if print_time:
+                    finish_time = time.time()
+                    global command_time
+                    command_time = command_time+finish_time-start_time
+                    print "Command execution time: %f seconds"%(finish_time-start_time)
+                break
+        else:
             if self.top and target.has_builder():
                 display("scons: `%s' is up to date." % str(self.node))
-        elif target.has_builder() and not hasattr(target.builder, 'status'):
-            if print_time:
-                start_time = time.time()
-            SCons.Taskmaster.Task.execute(self)
-            if print_time:
-                finish_time = time.time()
-                global command_time
-                command_time = command_time+finish_time-start_time
-                print "Command execution time: %f seconds"%(finish_time-start_time)
 
     def do_failed(self, status=2):
         global exit_status
@@ -1187,7 +1190,7 @@ def _main(args, parser):
 
     nodes = filter(None, map(Entry, targets))
 
-    task_class = BuildTask     # default action is to build targets
+    task_class = BuildTask      # default action is to build targets
     opening_message = "Building targets ..."
     closing_message = "done building targets."
     if keep_going_on_error:
@@ -1277,7 +1280,7 @@ def main():
     global exit_status
     
     try:
-       _exec_main()
+        _exec_main()
     except SystemExit, s:
         if s:
             exit_status = s

diff --git a/test/skip-execution.py b/test/skip-execution.py
new file mode 100644 (file)
index 0000000..50cef79
--- /dev/null
+++ b/test/skip-execution.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify that a command that builds multiple targets doesn't get
+skipped if the first target is up-to-date but the rest aren't.
+Test (and fix for the bug) courtesy Patrick Mezard.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+
+test.write('SConstruct', """
+env = Environment()
+env.Command(['a', 'b', 'c'], ['source'], [Touch('a'),Touch('b'),Touch('c')])
+""")
+
+test.write('source', '')
+
+test.run(arguments = '.')
+test.must_exist('a')
+test.must_exist('b')
+test.must_exist('c')
+
+test.unlink('c')
+test.run(arguments = '.')
+test.must_exist('c')
+
+test.unlink('b')
+test.run(arguments = '.')
+test.must_exist('b')
+
+test.unlink('a')
+test.run(arguments = '.')
+test.must_exist('a')
+
+test.pass_test()