asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make module dependency check recursive

Browse source 
The `env.disabled_modules` and `methods.disable_module` weren't used anywhere
so the first one was repurposed and the second just deleted

Signed-off-by: Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com>
This commit is contained in:
Yevhen Babiichuk (DustDFG) 2024-10-04 16:21:33 +03:00
parent 533c616cb8
commit 8e75e029b3
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -149,13 +149,11 @@ env.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
if "TERM" in os.environ: # Used for colored output. if "TERM" in os.environ: # Used for colored output.
env["ENV"]["TERM"] = os.environ["TERM"] env["ENV"]["TERM"] = os.environ["TERM"]
env.disabled_modules = [] env.disabled_modules = set()
env.module_version_string = "" env.module_version_string = ""
env.msvc = False env.msvc = False
env.scons_version = env._get_major_minor_revision(scons_raw_version) env.scons_version = env._get_major_minor_revision(scons_raw_version)
env.__class__.disable_module = methods.disable_module
env.__class__.add_module_version_string = methods.add_module_version_string env.__class__.add_module_version_string = methods.add_module_version_string
env.__class__.add_source_files = methods.add_source_files env.__class__.add_source_files = methods.add_source_files

22
methods.py
View file

@ -404,10 +404,6 @@ def convert_custom_modules_path(path):
return path return path
def disable_module(self):
self.disabled_modules.append(self.current_module)
def module_add_dependencies(self, module, dependencies, optional=False): def module_add_dependencies(self, module, dependencies, optional=False):
""" """
Adds dependencies for a given module. Adds dependencies for a given module.
@ -428,19 +424,21 @@ def module_check_dependencies(self, module):
Meant to be used in module `can_build` methods. Meant to be used in module `can_build` methods.
Returns a boolean (True if dependencies are satisfied). Returns a boolean (True if dependencies are satisfied).
""" """
missing_deps = [] missing_deps = set()
required_deps = self.module_dependencies[module][0] if module in self.module_dependencies else [] required_deps = self.module_dependencies[module][0] if module in self.module_dependencies else []
for dep in required_deps: for dep in required_deps:
opt = "module_{}_enabled".format(dep) opt = "module_{}_enabled".format(dep)
if opt not in self or not self[opt]: if opt not in self or not self[opt] or not module_check_dependencies(self, dep):
missing_deps.append(dep) missing_deps.add(dep)
if missing_deps != []: if missing_deps:
print_warning( if module not in self.disabled_modules:
"Disabling '{}' module as the following dependencies are not satisfied: {}".format( print_warning(
module, ", ".join(missing_deps) "Disabling '{}' module as the following dependencies are not satisfied: {}".format(
module, ", ".join(missing_deps)
)
) )
) self.disabled_modules.add(module)
return False return False
else: else:
return True return True