summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Taskmaster.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-10 18:15:03 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-10 18:15:03 +0200
commit301edd26f23e3d954dcea5cffc1ad13f969822ca (patch)
treeb0dd8f1b1da7c48da076ae45fc9529e748d082f0 /src/engine/SCons/Taskmaster.py
parente20c9557371eacec533588d33b4bebd543ba178f (diff)
Imported Upstream version 2.5.0+repackupstream/2.5.0+repack
Diffstat (limited to 'src/engine/SCons/Taskmaster.py')
-rw-r--r--src/engine/SCons/Taskmaster.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index f77bde1..829e1fc 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -47,7 +47,7 @@ interface and the SCons build engine. There are two key classes here:
target(s) that it decides need to be evaluated and/or built.
"""
-__revision__ = "src/engine/SCons/Taskmaster.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "src/engine/SCons/Taskmaster.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
from itertools import chain
import operator
@@ -107,7 +107,7 @@ fmt = "%(considered)3d "\
def dump_stats():
for n in sorted(StatsNodes, key=lambda a: str(a)):
- print (fmt % n.stats.__dict__) + str(n)
+ print (fmt % n.attributes.stats.__dict__) + str(n)
@@ -122,7 +122,7 @@ class Task(object):
aspects of controlling a build, so any given application
*should* be able to do what it wants by sub-classing this
class and overriding methods as appropriate. If an application
- needs to customze something by sub-classing Taskmaster (or
+ needs to customize something by sub-classing Taskmaster (or
some other build engine class), we should first try to migrate
that functionality into this class.
@@ -147,7 +147,7 @@ class Task(object):
This hook gets called as part of preparing a task for execution
(that is, a Node to be built). As part of figuring out what Node
- should be built next, the actually target list may be altered,
+ should be built next, the actual target list may be altered,
along with a message describing the alteration. The calling
interface can subclass Task and provide a concrete implementation
of this method to see those messages.
@@ -664,9 +664,9 @@ class Taskmaster(object):
its parent node.
A pending child can occur when the Taskmaster completes a loop
- through a cycle. For example, lets imagine a graph made of
- three node (A, B and C) making a cycle. The evaluation starts
- at node A. The taskmaster first consider whether node A's
+ through a cycle. For example, let's imagine a graph made of
+ three nodes (A, B and C) making a cycle. The evaluation starts
+ at node A. The Taskmaster first considers whether node A's
child B is up-to-date. Then, recursively, node B needs to
check whether node C is up-to-date. This leaves us with a
dependency graph looking like:
@@ -781,10 +781,10 @@ class Taskmaster(object):
# return node
if CollectStats:
- if not hasattr(node, 'stats'):
- node.stats = Stats()
+ if not hasattr(node.attributes, 'stats'):
+ node.attributes.stats = Stats()
StatsNodes.append(node)
- S = node.stats
+ S = node.attributes.stats
S.considered = S.considered + 1
else:
S = None
@@ -951,7 +951,7 @@ class Taskmaster(object):
task.make_ready()
except:
# We had a problem just trying to get this task ready (like
- # a child couldn't be linked in to a VariantDir when deciding
+ # a child couldn't be linked to a VariantDir when deciding
# whether this node is current). Arrange to raise the
# exception when the Task is "executed."
self.ready_exc = sys.exc_info()