diff options
| author | Steven Knight <knight@baldmt.com> | 2009-03-11 17:34:37 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-03-11 17:34:37 (GMT) |
| commit | efa6c9777b0be0fc3011cba0080916fc43b80a8c (patch) | |
| tree | b82788704d498093297e056320e9225b6509bc48 /src | |
| parent | 7f380de2d31a8ca288bd8a44a51de8f2867830be (diff) | |
| download | SCons-efa6c9777b0be0fc3011cba0080916fc43b80a8c.zip SCons-efa6c9777b0be0fc3011cba0080916fc43b80a8c.tar.gz SCons-efa6c9777b0be0fc3011cba0080916fc43b80a8c.tar.bz2 | |
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).
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Taskmaster.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index a902e4c..4a5a727 100644 --- 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 91eac35..1c65ee3 100644 --- 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))) |