summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Node
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2001-12-11 01:53:48 (GMT)
committerSteven Knight <knight@baldmt.com>2001-12-11 01:53:48 (GMT)
commitee1ca39a5afec8c92e9d427dd18cbd655a2e46dc (patch)
tree42fd27b36d6607aa6b31fde639b53bd15852bacb /src/engine/SCons/Node
parent9ca1ac7a1f54fafa93713e3ff6bff693ca180d3e (diff)
downloadSCons-ee1ca39a5afec8c92e9d427dd18cbd655a2e46dc.zip
SCons-ee1ca39a5afec8c92e9d427dd18cbd655a2e46dc.tar.gz
SCons-ee1ca39a5afec8c92e9d427dd18cbd655a2e46dc.tar.bz2
Refactor the Builder execute() interface to take Nodes, not string names of targets and sources.
Diffstat (limited to 'src/engine/SCons/Node')
-rw-r--r--src/engine/SCons/Node/NodeTests.py3
-rw-r--r--src/engine/SCons/Node/__init__.py3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 2eba47e..a3590a1 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -90,7 +90,8 @@ class NodeTestCase(unittest.TestCase):
node.sources = ["yyy", "zzz"]
node.build()
assert built_it
- assert built_target == "xxx", built_target
+ assert type(built_target) == type(MyNode()), type(built_target)
+ assert str(built_target) == "xxx", str(built_target)
assert built_source == ["yyy", "zzz"], built_source
def test_builder_set(self):
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 83663dc..8b1ef55 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -71,9 +71,8 @@ class Node:
"""Actually build the node. Return the status from the build."""
if not self.builder:
return None
- sources = map(lambda x: str(x), self.sources)
stat = self.builder.execute(env = self.env.Dictionary(),
- target = str(self), source = sources)
+ target = self, source = self.sources)
if stat != 0:
raise BuildError(node = self, stat = stat)
return stat