From e980c5bc26892ce4db1e45516e9983bbc6a2bd33 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 28 Jan 2023 13:38:24 -0800 Subject: Add comments to code and DefaultEnvironment() with no tools loaded for test --- SCons/SConf.py | 9 +++++++++ test/Configure/conftest_source_file/SConstruct | 1 + 2 files changed, 10 insertions(+) diff --git a/SCons/SConf.py b/SCons/SConf.py index 224bf5a..0fd813b 100644 --- a/SCons/SConf.py +++ b/SCons/SConf.py @@ -379,11 +379,20 @@ class SConfBuildTask(SCons.Taskmaster.AlwaysTask): sconsign.merge() def make_ready_current(self): + # We're overriding make_ready_current() call to add to the list + # of nodes used by this task, filtering out any nodes created + # by the checker for it's own purpose. self.non_sconf_nodes.update([t for t in self.targets if not t.is_conftest()]) super().make_ready_current() make_ready = make_ready_current def postprocess(self): + # We're done executing this task, so now we'll go through all the + # nodes used by this task which aren't nodes created for + # Configure checkers, but rather are existing or built files + # and reset their node info. + # If we do not reset their node info, any changes in these + # nodes will not trigger builds in the normal build process for node in self.non_sconf_nodes: node.ninfo = node.new_ninfo() super().postprocess() diff --git a/test/Configure/conftest_source_file/SConstruct b/test/Configure/conftest_source_file/SConstruct index 2e0b672..dd8d28e 100644 --- a/test/Configure/conftest_source_file/SConstruct +++ b/test/Configure/conftest_source_file/SConstruct @@ -1,3 +1,4 @@ +DefaultEnvironment(tools=[]) env = Environment() env.Append(CPPPATH=['.']) conf1 = Configure(env) -- cgit v0.12