Issue 2372: evaluate a Node's order-only prerequisites before the sources

and dependencies (so they can affect how the sources and dependencies
are built).

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index a902e4ce4acf51c9027a9d951c42470041890883..4a5a72778516c18a082226273585783634d75720 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -21,6 +21,9 @@ RELEASE X.X.X - XXX
 
     - Fix an exception if a null command-line argument is passed in.
 
+    - Evaluate Requires() prerequisites before a Node's direct children
+      (sources and dependencies).
+
 
 
 RELEASE 1.2.0.d20090223 - Mon, 23 Feb 2009 08:41:06 -0800

diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index 91eac358682b93873eef7830b4f0f82bf79bcee7..1c65ee3b5497a45aa3eafc948f7ff951af38408f 100644 (file)
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -797,7 +797,7 @@ class Taskmaster:
             children_not_ready = []
             children_failed = False
 
-            for child in chain(children, executor.get_all_prerequisites()):
+            for child in chain(executor.get_all_prerequisites(), children):
                 childstate = child.get_state()
 
                 if T: T.write(self.trace_message('       ' + self.trace_node(child)))

diff --git a/test/Parallel/multiple-parents.py b/test/Parallel/multiple-parents.py
index 69accaa292838da73480f5252006cd0fe4be0a58..97089614388b150838400701003af72a687900bd 100644 (file)
--- a/test/Parallel/multiple-parents.py
+++ b/test/Parallel/multiple-parents.py
@@ -73,19 +73,21 @@ def simulate_keyboard_interrupt(target = None, source = None, env = None):
 
 interrupt = Command(target='interrupt',  source='', action=simulate_keyboard_interrupt)
 
+touch0 = Touch('${TARGETS[0]}')
+touch1 = Touch('${TARGETS[1]}')
+touch2 = Touch('${TARGETS[2]}')
 
 failed0  = Command(target='failed00',  source='', action=fail_action)
 ok0      = Command(target=['ok00a', 'ok00b', 'ok00c'], 
                    source='', 
-                   action=[Touch('${TARGETS[0]}'), Touch('${TARGETS[1]}'), Touch('${TARGETS[2]}')])
-prereq0  = Command(target='prereq00',  source='', action=Touch('${TARGET}'))
-ignore0  = Command(target='ignore00',  source='', action=Touch('${TARGET}'))
-igreq0   = Command(target='igreq00',   source='', action=Touch('${TARGET}'))
-missing0 = Command(target='missing00', source='MissingSrc', action=Touch('${TARGET}'))
+                   action=[touch0, touch1, touch2])
+prereq0  = Command(target='prereq00',  source='', action=touch0)
+ignore0  = Command(target='ignore00',  source='', action=touch0)
+igreq0   = Command(target='igreq00',   source='', action=touch0)
+missing0 = Command(target='missing00', source='MissingSrc', action=touch0)
 withSE0  = Command(target=['withSE00a', 'withSE00b', 'withSE00c'], 
                    source='', 
-                   action=[Touch('${TARGETS[0]}'), Touch('${TARGETS[1]}'), Touch('${TARGETS[2]}'), 
-                           Touch('side_effect')])
+                   action=[touch0, touch1, touch2, Touch('side_effect')])
 SideEffect('side_effect', withSE0) 
 
 prev_level  = failed0 + ok0 + ignore0 + missing0 + withSE0
@@ -101,15 +103,14 @@ for i in range(1,20):
     failed = Command(target='failed%02d' % i,  source='', action=fail_action)
     ok     = Command(target=['ok%02da' % i, 'ok%02db' % i, 'ok%02dc' % i], 
                      source='',
-                     action=[Touch('${TARGETS[0]}'), Touch('${TARGETS[1]}'), Touch('${TARGETS[2]}')])
-    prereq = Command(target='prereq%02d' % i,  source='', action=Touch('${TARGET}'))
-    ignore = Command(target='ignore%02d' % i,  source='', action=Touch('${TARGET}'))
-    igreq  = Command(target='igreq%02d' % i,   source='', action=Touch('${TARGET}'))
-    missing = Command(target='missing%02d' %i, source='MissingSrc', action=Touch('${TARGET}'))
+                     action=[touch0, touch1, touch2])
+    prereq = Command(target='prereq%02d' % i,  source='', action=touch0)
+    ignore = Command(target='ignore%02d' % i,  source='', action=touch0)
+    igreq  = Command(target='igreq%02d' % i,   source='', action=touch0)
+    missing = Command(target='missing%02d' %i, source='MissingSrc', action=touch0)
     withSE  = Command(target=['withSE%02da' % i, 'withSE%02db' % i, 'withSE%02dc' % i], 
                        source='', 
-                       action=[Touch('${TARGETS[0]}'), Touch('${TARGETS[1]}'), Touch('${TARGETS[2]}'), 
-                               Touch('side_effect')])
+                       action=[touch0, touch1, touch2, Touch('side_effect')])
     SideEffect('side_effect', withSE) 
 
     next_level = failed + ok + ignore + igreq + missing + withSE
@@ -158,13 +159,19 @@ for i in range(20):
     test.must_not_exist(test.workpath('ok%02da' % i))
     test.must_not_exist(test.workpath('ok%02db' % i))
     test.must_not_exist(test.workpath('ok%02dc' % i))
-    test.must_not_exist(test.workpath('prereq%02d' % i))
     test.must_not_exist(test.workpath('ignore%02d' % i))
-    test.must_not_exist(test.workpath('igreq%02d' % i))
     test.must_not_exist(test.workpath('withSE%02da' % i))
     test.must_not_exist(test.workpath('withSE%02db' % i))
     test.must_not_exist(test.workpath('withSE%02dc' % i))
 
+# prereq19 and igreq19 will exist because, as prerequisites,
+# they are now evaluated *before* the direct children of the Node.
+for i in range(19):
+    test.must_not_exist(test.workpath('prereq%02d' % i))
+    test.must_not_exist(test.workpath('igreq%02d' % i))
+test.must_exist(test.workpath('prereq19'))
+test.must_exist(test.workpath('igreq19'))
+
 
 for i in range(5):
     test.run(arguments = '-c all')

diff --git a/test/Requires/eval-order.py b/test/Requires/eval-order.py
new file mode 100644 (file)
index 0000000..9c1f25b
--- /dev/null
+++ b/test/Requires/eval-order.py
@@ -0,0 +1,67 @@
+#!/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 env.Requires() nodes are evaluated before other children.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+def copy_and_create_func(target, source, env):
+    fp = open(str(target[0]), 'wb')
+    for s in map(str, source):
+        fp.write(open(s, 'rb').read())
+    fp.close()
+    open('file.in', 'wb').write("file.in 1\\n")
+    return None
+copy_and_create = Action(copy_and_create_func)
+env = Environment()
+env.Requires('file.out', 'prereq.out')
+env.Command('file.out', 'file.in', Copy('$TARGET', '$SOURCES'))
+env.Command('prereq.out', 'prereq.in', copy_and_create)
+""")
+
+test.write('prereq.in', "prereq.in 1\n")
+
+# First:  build file.out.  prereq.out should be built first, and if
+# not, we'll get an error when the build action tries to use it to
+# build file.out.
+
+test.run(arguments = 'file.out')
+
+test.must_match('prereq.out', "prereq.in 1\n")
+test.must_match('file.out', "file.in 1\n")
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: