1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00

Make module dependency check recursive

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

View File

@@ -404,10 +404,6 @@ def convert_custom_modules_path(path):
return path
def disable_module(self):
self.disabled_modules.append(self.current_module)
def module_add_dependencies(self, module, dependencies, optional=False):
"""
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.
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 []
for dep in required_deps:
opt = "module_{}_enabled".format(dep)
if opt not in self or not self[opt]:
missing_deps.append(dep)
if opt not in self or not self[opt] or not module_check_dependencies(self, dep):
missing_deps.add(dep)
if missing_deps != []:
print_warning(
"Disabling '{}' module as the following dependencies are not satisfied: {}".format(
module, ", ".join(missing_deps)
if missing_deps:
if module not in self.disabled_modules:
print_warning(
"Disabling '{}' module as the following dependencies are not satisfied: {}".format(
module, ", ".join(missing_deps)
)
)
)
self.disabled_modules.add(module)
return False
else:
return True