Merge pull request #3670 from dmoody256/sconscript_node_flags

Added flags for SConscript nodes to be easily identified

Author: bdbaddog

CHANGES.txt

@@ -92,6 +92,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       exception, however SCons was using TypeError to detect if the callable had a different 
       signature than expected, and would silently fail to report user's exceptions. Fixed to 
       use signature module to detect function signature instead of TypeError. (Github Issue #3654)
+    - Added storage of SConstructs and SConscripts nodes into global set for checking
+      if a given node is a SConstruct/SConscript. 
+      Added new node function SCons.Node.is_sconscript(self) (Github Issue #3625)
 
   From Andrew Morrow:
     - Fix Issue #3469 - Fixed improper reuse of temporary and compiled files by Configure when changing

SCons/Node/NodeTests.py

@@ -1244,6 +1244,19 @@ def test_literal(self):
         n=SCons.Node.Node()
         assert n.is_literal()
 
+    def test_sconscripts(self):
+        """Test the is_sconscript() function."""
+        # check nodes are not sconscript unless added to the list
+        n=SCons.Node.Node()
+        n2=SCons.Node.Node()
+        assert not n.is_sconscript()
+        assert not n2.is_sconscript()
+
+        # add node to sconscript list and verify
+        SCons.Node.SConscriptNodes.add(n2)
+        assert not n.is_sconscript()
+        assert n2.is_sconscript()
+
     def test_Annotate(self):
         """Test using an interface-specific Annotate function."""
         def my_annotate(node, self=self):

SCons/Node/__init__.py

@@ -111,6 +111,9 @@ def do_nothing_node(node): pass
 
 Annotate = do_nothing_node
 
+# global set for recording all processed SContruct/SConscript nodes
+SConscriptNodes = set()
+
 # Gets set to 'True' if we're running in interactive mode. Is
 # currently used to release parts of a target's info during
 # clean builds and update runs (see release_target_info).
@@ -946,6 +949,10 @@ def is_derived(self):
         """
         return _is_derived_map[self._func_is_derived](self)
 
+    def is_sconscript(self):
+        """ Returns true if this node is an sconscript """
+        return self in SConscriptNodes
+
     def alter_targets(self):
         """Return a list of alternate targets for this Node.
         """

SCons/Script/SConscript.py

@@ -43,7 +43,7 @@
 import SCons.Script.Main
 import SCons.Tool
 from SCons.Util import is_List, is_String, is_Dict, flatten
-
+from SCons.Node import SConscriptNodes
 from . import Main
 
 import collections
@@ -202,6 +202,7 @@ def _SConscript(fs, *files, **kw):
                 else:
                     f = fs.File(str(fn))
                 _file_ = None
+                SConscriptNodes.add(f)
 
                 # Change directory to the top of the source
                 # tree to make sure the os's cwd and the cwd of