Skip to content

GH-132930: Fix use of ALIAS_WPREFIX in pymanager builds #133120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged

GH-132930: Fix use of ALIAS_WPREFIX in pymanager builds #133120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a80e26d
Fix use of ALIAS_WPREFIX in pymanager builds
AA-Turner Apr 28, 2025
b98b480
Update PC/layout/support/pymanager.py
zooba Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions PC/layout/support/pymanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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",
Expand Down
Loading