Remove the Node.derived attribute.

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

diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index dc2566f824540e0e1357974cbd330c71db4a5b9b..1f4f555f37529a214563a74abad1483f92f1c9e6 100644 (file)
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -95,7 +95,6 @@ class BuilderBase:
        for t in tlist:
            t.builder_set(self)
            t.env_set(env)
-           t.derived = 1
            t.add_source(slist)
 
        if len(tlist) == 1:

diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py
index 035289466916cfbd5a9473878a91af6e3f8a69a9..e84799aaeadf74e2019b6702f04c65b0b9373299 100644 (file)
--- a/src/engine/SCons/BuilderTests.py
+++ b/src/engine/SCons/BuilderTests.py
@@ -68,7 +68,7 @@ class BuilderTestCase(unittest.TestCase):
            def __init__(self, name):
                self.name = name
                self.sources = []
-               self.derived = 0
+               self.builder = None
            def __str__(self):
                return self.name
            def builder_set(self, builder):
@@ -84,7 +84,6 @@ class BuilderTestCase(unittest.TestCase):
        assert n1.env == env
        assert n1.builder == builder
        assert n1.sources == [n2]
-       assert n1.derived == 1
 
     def test_action(self):
        """Test Builder creation

diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index 66d64a054cf02c08d21a48afdbf5c68f0fb23bf1..b15b19330991cd7c1e10262527d7a8f330f5ffe8 100644 (file)
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -175,7 +175,7 @@ class EnvironmentTestCase(unittest.TestCase):
         env = Environment()
         t = env.Command(target='foo.out', source=['foo1.in', 'foo2.in'],
                         action='buildfoo $target $source')
-        assert t.derived
+        assert t.builder
         assert t.builder.action.__class__.__name__ == 'CommandAction'
         assert t.builder.action.command == 'buildfoo $target $source'
         assert 'foo1.in' in map(lambda x: x.path, t.sources)

diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 8334d2d727c7d10b61ca1cb32fbbfff4d534181f..d6553e55797847fb2edeef6560795c24f0ddf403 100644 (file)
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -51,12 +51,12 @@ class Node:
     def __init__(self):
        self.sources = []
        self.depends = []
-       self.derived = 0
+       self.builder = None
        self.env = None
         self.state = None
 
     def build(self):
-       if not hasattr(self, "builder"):
+       if not self.builder:
            return None
        sources_str = string.join(map(lambda x: str(x), self.sources))
        stat = self.builder.execute(env = self.env.Dictionary(),

diff --git a/src/engine/SCons/Sig/SigTests.py b/src/engine/SCons/Sig/SigTests.py
index de8d6e65cdbe4275599495864ffc8b4e87f6d341..77a8a166eeb57cfcd95f044fa48cd50c7d211b3b 100644 (file)
--- a/src/engine/SCons/Sig/SigTests.py
+++ b/src/engine/SCons/Sig/SigTests.py
@@ -33,11 +33,11 @@ import sys
 
 class DummyFile:
     """A class that simulates a file for testing purposes"""
-    def __init__(self, path, contents, timestamp, derived):
+    def __init__(self, path, contents, timestamp, builder):
         self.path = path
         self.contents = contents
         self.timestamp = timestamp
-        self.derived = derived
+        self.builder = builder
 
     def modify(self, contents, timestamp):
         self.contents = contents
@@ -49,7 +49,7 @@ class DummyNode:
     def __init__(self, file):
         self.file = file
         self.path = file.path
-        self.derived = file.derived
+        self.builder = file.builder
        self.depends = []
         
     def get_contents(self):

diff --git a/src/engine/SCons/Sig/__init__.py b/src/engine/SCons/Sig/__init__.py
index 964a3294a43bccef1630c0913f90035693ddd89f..869cf8531d4906222651d12e663b077892f3d053 100644 (file)
--- a/src/engine/SCons/Sig/__init__.py
+++ b/src/engine/SCons/Sig/__init__.py
@@ -147,7 +147,7 @@ class Calculator:
 
         if node.has_signature():
             sig = node.get_signature()
-        elif node.derived:
+        elif node.builder:
             signatures = {}
             self.collect(node, signatures)
             signatures = filter(lambda x: not x is None, signatures.values())
@@ -192,7 +192,7 @@ class Calculator:
 
         newtime = node.get_timestamp()
 
-        if not node.derived and newtime == oldtime:
+        if not node.builder and newtime == oldtime:
             newsig = oldsig
         else:
             newsig = self.signature(node)

diff --git a/src/script/scons.py b/src/script/scons.py
index 1a67e51ef465d6b03baa44dfad5e6c4f920d0be2..b8dc2ff705dc37036338439696d9a49c5c1bfb78 100644 (file)
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -68,7 +68,7 @@ class BuildTask(SCons.Taskmaster.Task):
 class CleanTask(SCons.Taskmaster.Task):
     """An SCons clean task."""
     def execute(self):
-        if hasattr(self.target, "builder"):
+        if self.target.builder:
            os.unlink(self.target.path)
            print "Removed " + self.target.path