From e98728ab4d4ab9e69ce05ae4da4031bbc80f457b Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 20 Jul 2022 00:17:52 -0700 Subject: gh-93939: Use new MODULE_name_STATE in wasm_assets script (GH-95035) (cherry picked from commit 0f34c7e2d3163525813dbd644f30db58e6d36af2) Co-authored-by: Christian Heimes --- Tools/wasm/wasm_assets.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Tools/wasm/wasm_assets.py b/Tools/wasm/wasm_assets.py index b7e8351..40acea2 100755 --- a/Tools/wasm/wasm_assets.py +++ b/Tools/wasm/wasm_assets.py @@ -175,14 +175,13 @@ def detect_extension_modules(args: argparse.Namespace): loc = {} exec(data, globals(), loc) - for name, value in loc["build_time_vars"].items(): - if value not in {"yes", "missing", "disabled", "n/a"}: + for key, value in loc["build_time_vars"].items(): + if not key.startswith("MODULE_") or not key.endswith("_STATE"): continue - if not name.startswith("MODULE_"): - continue - if name.endswith(("_CFLAGS", "_DEPS", "_LDFLAGS")): - continue - modname = name.removeprefix("MODULE_").lower() + if value not in {"yes", "disabled", "missing", "n/a"}: + raise ValueError(f"Unsupported value '{value}' for {key}") + + modname = key[7:-6].lower() if modname not in modules: modules[modname] = value == "yes" return modules -- cgit v0.12