mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.13] gh-130025: Correct handling of symlinks during iOS testbed framework installation. (GH-130026) (#130073)

Browse source 
Correct handling of symlinks during iOS testbed framework installation.
(cherry picked from commit 625470a7d2)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
This commit is contained in:
Miss Islington (bot) 2025-02-13 07:47:05 +01:00 • committed by GitHub
parent a76aff6ea4
commit 32158ea476
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Tools-Demos/2025-02-12-14-58-54.gh-issue-130025._-mp5K.rst Normal file
View file

@ -0,0 +1,2 @@
The iOS testbed now correctly handles symlinks used as Python framework
references.

54
iOS/testbed/__main__.py
View file

@ -230,33 +230,69 @@ def clone_testbed(
shutil.copytree(source, target, symlinks=True) shutil.copytree(source, target, symlinks=True)
print(" done") print(" done")
xc_framework_path = target / "Python.xcframework"
sim_framework_path = xc_framework_path / "ios-arm64_x86_64-simulator"
if framework is not None: if framework is not None:
if framework.suffix == ".xcframework": if framework.suffix == ".xcframework":
print(" Installing XCFramework...", end="", flush=True) print(" Installing XCFramework...", end="", flush=True)
xc_framework_path = (target / "Python.xcframework").resolve()
if xc_framework_path.is_dir(): if xc_framework_path.is_dir():
shutil.rmtree(xc_framework_path) shutil.rmtree(xc_framework_path)
else: else:
xc_framework_path.unlink() xc_framework_path.unlink(missing_ok=True)
xc_framework_path.symlink_to( xc_framework_path.symlink_to(
framework.relative_to(xc_framework_path.parent, walk_up=True) framework.relative_to(xc_framework_path.parent, walk_up=True)
) )
print(" done") print(" done")
else: else:
print(" Installing simulator framework...", end="", flush=True) print(" Installing simulator framework...", end="", flush=True)
sim_framework_path = (
target / "Python.xcframework" / "ios-arm64_x86_64-simulator"
).resolve()
if sim_framework_path.is_dir(): if sim_framework_path.is_dir():
shutil.rmtree(sim_framework_path) shutil.rmtree(sim_framework_path)
else: else:
sim_framework_path.unlink() sim_framework_path.unlink(missing_ok=True)
sim_framework_path.symlink_to( sim_framework_path.symlink_to(
framework.relative_to(sim_framework_path.parent, walk_up=True) framework.relative_to(sim_framework_path.parent, walk_up=True)
) )
print(" done") print(" done")
else: else:
print(" Using pre-existing iOS framework.") if (
xc_framework_path.is_symlink()
and not xc_framework_path.readlink().is_absolute()
):
# XCFramework is a relative symlink. Rewrite the symlink relative
# to the new location.
print(" Rewriting symlink to XCframework...", end="", flush=True)
orig_xc_framework_path = (
source
/ xc_framework_path.readlink()
).resolve()
xc_framework_path.unlink()
xc_framework_path.symlink_to(
orig_xc_framework_path.relative_to(
xc_framework_path.parent, walk_up=True
)
)
print(" done")
elif (
sim_framework_path.is_symlink()
and not sim_framework_path.readlink().is_absolute()
):
print(" Rewriting symlink to simulator framework...", end="", flush=True)
# Simulator framework is a relative symlink. Rewrite the symlink
# relative to the new location.
orig_sim_framework_path = (
source
/ "Python.XCframework"
/ sim_framework_path.readlink()
).resolve()
sim_framework_path.unlink()
sim_framework_path.symlink_to(
orig_sim_framework_path.relative_to(
sim_framework_path.parent, walk_up=True
)
)
print(" done")
else:
print(" Using pre-existing iOS framework.")
for app_src in apps: for app_src in apps:
print(f" Installing app {app_src.name!r}...", end="", flush=True) print(f" Installing app {app_src.name!r}...", end="", flush=True)
@ -372,8 +408,8 @@ def main():
if context.subcommand == "clone": if context.subcommand == "clone":
clone_testbed( clone_testbed(
source=Path(__file__).parent, source=Path(__file__).parent.resolve(),
target=Path(context.location), target=Path(context.location).resolve(),
framework=Path(context.framework).resolve() if context.framework else None, framework=Path(context.framework).resolve() if context.framework else None,
apps=[Path(app) for app in context.apps], apps=[Path(app) for app in context.apps],
) )