From 208d06fd515119af49f844c7781e1eb2be8a8add Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Tue, 29 Apr 2025 09:53:43 +0100 Subject: gh-132930: Fix use of ALIAS_WPREFIX in pymanager builds (GH-133120) --- PC/layout/support/pymanager.py | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/PC/layout/support/pymanager.py b/PC/layout/support/pymanager.py index 5113b31..4cf3a55 100644 --- a/PC/layout/support/pymanager.py +++ b/PC/layout/support/pymanager.py @@ -58,6 +58,7 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False): COMPANY = "PythonEmbed" TARGETW = None ALIAS_PREFIX = None + ALIAS_WPREFIX = None DISPLAY_TAGS.append("embeddable") # Deliberately name the file differently from the existing distro # so we can republish old versions without replacing files. @@ -126,23 +127,24 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False): # Generate alias entries for each target. We need both arch and non-arch # versions as well as windowed/non-windowed versions to make sure that all # necessary aliases are created. - if ALIAS_PREFIX: - for prefix, base in [ - (ALIAS_PREFIX, {"target": TARGET}), - (f"{ALIAS_PREFIX}w", {"target": TARGETW, "windowed": 1}), - ]: - if not base["target"]: - continue - if XY_TAG: - STD_ALIAS.extend([ - {**base, "name": f"{prefix}{XY_TAG}.exe"}, - {**base, "name": f"{prefix}{XY_ARCH_TAG}.exe"}, - ]) - if X_TAG: - STD_ALIAS.extend([ - {**base, "name": f"{prefix}{X_TAG}.exe"}, - {**base, "name": f"{prefix}{X_ARCH_TAG}.exe"}, - ]) + for prefix, base in ( + (ALIAS_PREFIX, {"target": TARGET}), + (ALIAS_WPREFIX, {"target": TARGETW, "windowed": 1}), + ): + if not prefix: + continue + if not base["target"]: + continue + if XY_TAG: + STD_ALIAS.extend([ + {**base, "name": f"{prefix}{XY_TAG}.exe"}, + {**base, "name": f"{prefix}{XY_ARCH_TAG}.exe"}, + ]) + if X_TAG: + STD_ALIAS.extend([ + {**base, "name": f"{prefix}{X_TAG}.exe"}, + {**base, "name": f"{prefix}{X_ARCH_TAG}.exe"}, + ]) STD_PEP514.append({ "kind": "pep514", -- cgit v0.12