From b8913d95f06c9399c5a03700d59a32140c060d8f Mon Sep 17 00:00:00 2001 From: Noble Eugene Date: Tue, 5 Nov 2024 22:21:25 +0100 Subject: [PATCH 1/2] update build.scons to python 3.12+ --- Build/Build.scons | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Build/Build.scons b/Build/Build.scons index 6cbc79d6..4559e160 100644 --- a/Build/Build.scons +++ b/Build/Build.scons @@ -1,15 +1,17 @@ import sys import os -import imp +import importlib from glob import glob ####################################################### # reusable functions and data structures ####################################################### def LoadTool(name, env, **kw): - config_path = GetBuildPath('#/Build/Tools/SCons') - file, path, desc = imp.find_module(name, [config_path]) - module = imp.load_module(name, file, path, desc) + config_path = os.path.abspath(GetBuildPath("#/Build/Tools/SCons")) + file_path = os.path.join(config_path,f"{name}.py") + spec = importlib.util.spec_from_file_location("gcc-generic", file_path) + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) module.generate(env, **kw) def MergeListUnique(item_list, items): From 7ef53e96bad709e34fce21184622f4edcc0bdb1d Mon Sep 17 00:00:00 2001 From: Noble Eugene Date: Tue, 5 Nov 2024 22:34:40 +0100 Subject: [PATCH 2/2] patch build.scons --- Build/Build.scons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/Build.scons b/Build/Build.scons index 4559e160..ffd8475c 100644 --- a/Build/Build.scons +++ b/Build/Build.scons @@ -9,7 +9,7 @@ from glob import glob def LoadTool(name, env, **kw): config_path = os.path.abspath(GetBuildPath("#/Build/Tools/SCons")) file_path = os.path.join(config_path,f"{name}.py") - spec = importlib.util.spec_from_file_location("gcc-generic", file_path) + spec = importlib.util.spec_from_file_location(name, file_path) module = importlib.util.module_from_spec(spec) spec.loader.exec_module(module) module.generate(env, **kw)