From 3a7cd861f523cd5a80b9ba1d452278cdc138cfd8 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 17 Feb 2025 14:38:25 +0800
Subject: [PATCH 01/40] More updates to USAGE and README (#250)

* Adds details on `python-config` and `testbed`
* Adds a bare bones interpreter instantiation example
* Clarifies the difference between instantiating the interpreter, and accessing the Python API with PythonKit
* Adds header exclusions to the modulemap to silence build warnings.
---
 README.rst                    |  35 ++++++--
 USAGE.md                      | 113 ++++++++++++++++--------
 patch/Python/module.modulemap | 160 ++++++++++++++++++++++++++++++++++
 3 files changed, 265 insertions(+), 43 deletions(-)

diff --git a/README.rst b/README.rst
index 94c0ae94..2317b749 100644
--- a/README.rst
+++ b/README.rst
@@ -83,15 +83,6 @@ Each support package contains:
 
 * ``VERSIONS``, a text file describing the specific versions of code used to build the
   support package;
-* ``platform-site``, a folder that contains site customization scripts that can be used
-  to make your local Python install look like it is an on-device install for each of the
-  underlying target architectures supported by the platform. This is needed because when
-  you run ``pip`` you'll be on a macOS machine with a specific architecture; if ``pip``
-  tries to install a binary package, it will install a macOS binary wheel (which won't
-  work on iOS/tvOS/watchOS). However, if you add the ``platform-site`` folder to your
-  ``PYTHONPATH`` when invoking pip, the site customization will make your Python install
-  return ``platform`` and ``sysconfig`` responses consistent with on-device behavior,
-  which will cause ``pip`` to install platform-appropriate packages.
 * ``Python.xcframework``, a multi-architecture build of the Python runtime library
 
 On iOS/tvOS/watchOS, the ``Python.xcframework`` contains a
@@ -105,6 +96,32 @@ needed to build packages. This is required because Xcode uses the ``xcrun``
 alias to dynamically generate the name of binaries, but a lot of C tooling
 expects that ``CC`` will not contain spaces.
 
+Each slice of an iOS/tvOS/watchOS XCframework also contains a
+``platform-config`` folder with a subfolder for each supported architecture in
+that slice. These subfolders can be used to make a macOS Python environment
+behave as if it were on an iOS/tvOS/watchOS device. This works in one of two
+ways:
+
+1. **A sitecustomize.py script**. If the ``platform-config`` subfolder is on
+   your ``PYTHONPATH`` when a Python interpreter is started, a site
+   customization will be applied that patches methods in ``sys``, ``sysconfig``
+   and ``platform`` that are used to identify the system.
+
+2. **A make_cross_venv.py script**. If you call ``make_cross_venv.py``,
+   providing the location of a virtual environment, the script will add some
+   files to the ``site-packages`` folder of that environment that will
+   automatically apply the same set of patches as the ``sitecustomize.py``
+   script whenever the environment is activated, without any need to modify
+   ``PYTHONPATH``. If you use ``build`` to create an isolated PEP 517
+   environment to build a wheel, these patches will also be applied to the
+   isolated build environment that is created.
+
+iOS distributions also contain a copy of the iOS ``testbed`` project - an Xcode
+project that can be used to run test suites of Python code. See the `CPython
+documentation on testing packages
+<https://docs.python.org/3/using/ios.html#testing-a-python-package>`__ for
+details on how to use this testbed.
+
 For a detailed instructions on using the support package in your own project,
 see the `usage guide <./USAGE.md>`__
 
diff --git a/USAGE.md b/USAGE.md
index 40bbcf80..096f71b0 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -25,6 +25,75 @@ guides:
 For tvOS and watchOS, you should be able to broadly follow the instructions in
 the iOS guide.
 
+### Using Objective C
+
+Once you've added the Python XCframework to your project, you'll need to
+initialize the Python runtime in your Objective C code (This is step 10 of the
+iOS guide linked above). This initialization should generally be done as early
+as possible in the application's lifecycle, but definitely needs to be done
+before you invoke Python code.
+
+As a *bare minimum*, you can do the following:
+
+1. Import the Python C API headers:
+   ```objc
+   #include <Python/Python.h>
+   ```
+
+2. Initialize the Python interpreter:
+   ```objc
+   NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
+   NSString *pythonHome = [NSString stringWithFormat:@"%@/python", resourcePath, nil];
+   NSString *pythonPath = [NSString stringWithFormat:@"%@/lib/python3.13", python_home, nil];
+   NSString *libDynloadPath = [NSString stringWithFormat:@"%@/lib/python3.13/lib-dynload", python_home, nil];
+   NSString *appPath = [NSString stringWithFormat:@"%@/app", resourcePath, nil];
+
+   setenv("PYTHONHOME", pythonHome, 1);
+   setenv("PYTHONPATH", [NSString stringWithFormat:@"%@:%@:%@", pythonpath, libDynloadPath, appPath, nil]);
+
+   Py_Initialize();
+
+   // we now have a Python interpreter ready to be used
+   ```
+   References to a specific Python version should reflect the version of
+   Python you are using.
+
+Again - this is the *bare minimum* initialization. In practice, you will likely
+need to configure other aspects of the Python interpreter using the
+`PyPreConfig`  and `PyConfig` mechanisms. Consult the [Python documentation on
+interpreter configuration](https://docs.python.org/3/c-api/init_config.html) for
+more details on the configuration options that are available. You may find the
+[bootstrap mainline code used by
+Briefcase](https://github.com/beeware/briefcase-iOS-Xcode-template/blob/main/%7B%7B%20cookiecutter.format%20%7D%7D/%7B%7B%20cookiecutter.class_name%20%7D%7D/main.m)
+a helpful point of comparison.
+
+### Using Swift
+
+If you want to use Swift instead of Objective C, the bare minimum initialization
+code will look something like this:
+
+1. Import the Python framework:
+   ```swift
+   import Python
+   ```
+
+2. Initialize the Python interpreter:
+   ```swift
+   guard let pythonHome = Bundle.main.path(forResource: "python", ofType: nil) else { return }
+   guard let pythonPath = Bundle.main.path(forResource: "python/lib/python3.13", ofType: nil) else { return }
+   guard let libDynloadPath = Bundle.main.path(forResource: "python/lib/python3.13/lib-dynload", ofType: nil) else { return }
+   let appPath = Bundle.main.path(forResource: "app", ofType: nil)
+
+   setenv("PYTHONHOME", pythonHome, 1)
+   setenv("PYTHONPATH", [pythonPath, libDynloadPath, appPath].compactMap { $0 }.joined(separator: ":"), 1)
+   Py_Initialize()
+   // we now have a Python interpreter ready to be used
+   ```
+
+   Again, references to a specific Python version should reflect the version of
+   Python you are using; and you will likely need to use `PyPreConfig` and
+   `PreConfig` APIs.
+
 ## Accessing the Python runtime
 
 There are 2 ways to access the Python runtime in your project code.
@@ -32,53 +101,29 @@ There are 2 ways to access the Python runtime in your project code.
 ### Embedded C API
 
 You can use the [Python Embedded C
-API](https://docs.python.org/3/extending/embedding.html) to instantiate a Python
-interpreter. This is the approach taken by Briefcase; you may find the bootstrap
-mainline code generated by Briefcase a helpful guide to what is needed to start
-an interpreter and run Python code.
+API](https://docs.python.org/3/extending/embedding.html) to invoke Python code
+and interact with Python objects. This is a raw C API that is accesible to both
+Objective C and Swift.
 
 ### PythonKit
 
-An alternate approach is to use
+If you're using Swift, an alternate approach is to use
 [PythonKit](https://github.com/pvieito/PythonKit). PythonKit is a package that
 provides a Swift API to running Python code.
 
 To use PythonKit in your project, add the Python Apple Support package to your
-project as described above; then:
-
-1. Add PythonKit to your project using the Swift Package manager. See the
-   PythonKit documentation for details.
+project and instantiate a Python interpreter as described above; then add
+PythonKit to your project using the Swift Package manager (see the [PythonKit
+documentation](https://github.com/pvieito/PythonKit) for details).
 
-2. In your Swift code, initialize the Python runtime. This should generally be
-   done as early as possible in the application's lifecycle, but definitely
-   needs to be done before you invoke Python code. References to a specific
-   Python version should reflect the version of Python you are using:
+Once you've done this, you can import PythonKit:
 ```swift
-import Python
-
-guard let pythonHome = Bundle.main.path(forResource: "python", ofType: nil) else { return }
-guard let pythonPath = Bundle.main.path(forResource: "python/lib/python3.13", ofType: nil) else { return }
-guard let libDynloadPath = Bundle.main.path(forResource: "python/lib/python3.13/lib-dynload", ofType: nil) else { return }
-let appPath = Bundle.main.path(forResource: "app", ofType: nil)
-
-setenv("PYTHONHOME", pythonHome, 1)
-setenv("PYTHONPATH", [pythonPath, libDynloadPath, appPath].compactMap { $0 }.joined(separator: ":"), 1)
-Py_Initialize()
-// we now have a Python interpreter ready to be used
+import PythonKit
 ```
-
-3. Invoke Python code in your app. For example:
+and use the PythonKit Swift API to interact with Python code:
 ```swift
-import PythonKit
-
 let sys = Python.import("sys")
 print("Python Version: \(sys.version_info.major).\(sys.version_info.minor)")
 print("Python Encoding: \(sys.getdefaultencoding().upper())")
 print("Python Path: \(sys.path)")
-
-_ = Python.import("math") // verifies `lib-dynload` is found and signed successfully
 ```
-
-To integrate 3rd party python code and dependencies, you will need to make sure
-`PYTHONPATH` contains their paths; once this has been done, you can run
-`Python.import("<lib name>")`. to import that module from inside swift.
diff --git a/patch/Python/module.modulemap b/patch/Python/module.modulemap
index 9a4dcbb8..96b05fc6 100644
--- a/patch/Python/module.modulemap
+++ b/patch/Python/module.modulemap
@@ -2,4 +2,164 @@ module Python {
     umbrella header "Python.h"
     export *
     link "Python"
+
+    exclude header "datetime.h"
+    exclude header "dynamic_annotations.h"
+    exclude header "errcode.h"
+    exclude header "frameobject.h"
+    exclude header "marshal.h"
+    exclude header "opcode_ids.h"
+    exclude header "opcode.h"
+    exclude header "osdefs.h"
+    exclude header "py_curses.h"
+    exclude header "pyconfig-arm32_64.h"
+    exclude header "pyconfig-arm64.h"
+    exclude header "pyconfig-x86_64.h"
+    exclude header "pydtrace.h"
+    exclude header "pyexpat.h"
+    exclude header "structmember.h"
+
+    exclude header "cpython/frameobject.h"
+    exclude header "cpython/pthread_stubs.h"
+    exclude header "cpython/pyatomic_msc.h"
+    exclude header "cpython/pyatomic_std.h"
+    exclude header "cpython/pystats.h"
+
+    exclude header "internal/mimalloc/mimalloc.h"
+    exclude header "internal/mimalloc/mimalloc/atomic.h"
+    exclude header "internal/mimalloc/mimalloc/internal.h"
+    exclude header "internal/mimalloc/mimalloc/prim.h"
+    exclude header "internal/mimalloc/mimalloc/track.h"
+    exclude header "internal/mimalloc/mimalloc/types.h"
+
+    exclude header "internal/pycore_abstract.h"
+    exclude header "internal/pycore_asdl.h"
+    exclude header "internal/pycore_ast_state.h"
+    exclude header "internal/pycore_ast.h"
+    exclude header "internal/pycore_atexit.h"
+    exclude header "internal/pycore_audit.h"
+    exclude header "internal/pycore_backoff.h"
+    exclude header "internal/pycore_bitutils.h"
+    exclude header "internal/pycore_blocks_output_buffer.h"
+    exclude header "internal/pycore_brc.h"
+    exclude header "internal/pycore_bytes_methods.h"
+    exclude header "internal/pycore_bytesobject.h"
+    exclude header "internal/pycore_call.h"
+    exclude header "internal/pycore_capsule.h"
+    exclude header "internal/pycore_cell.h"
+    exclude header "internal/pycore_ceval_state.h"
+    exclude header "internal/pycore_ceval.h"
+    exclude header "internal/pycore_code.h"
+    exclude header "internal/pycore_codecs.h"
+    exclude header "internal/pycore_compile.h"
+    exclude header "internal/pycore_complexobject.h"
+    exclude header "internal/pycore_condvar.h"
+    exclude header "internal/pycore_context.h"
+    exclude header "internal/pycore_critical_section.h"
+    exclude header "internal/pycore_crossinterp_data_registry.h"
+    exclude header "internal/pycore_crossinterp.h"
+    exclude header "internal/pycore_debug_offsets.h"
+    exclude header "internal/pycore_descrobject.h"
+    exclude header "internal/pycore_dict_state.h"
+    exclude header "internal/pycore_dict.h"
+    exclude header "internal/pycore_dtoa.h"
+    exclude header "internal/pycore_emscripten_signal.h"
+    exclude header "internal/pycore_emscripten_trampoline.h"
+    exclude header "internal/pycore_exceptions.h"
+    exclude header "internal/pycore_faulthandler.h"
+    exclude header "internal/pycore_fileutils_windows.h"
+    exclude header "internal/pycore_fileutils.h"
+    exclude header "internal/pycore_floatobject.h"
+    exclude header "internal/pycore_flowgraph.h"
+    exclude header "internal/pycore_format.h"
+    exclude header "internal/pycore_frame.h"
+    exclude header "internal/pycore_freelist_state.h"
+    exclude header "internal/pycore_freelist.h"
+    exclude header "internal/pycore_function.h"
+    exclude header "internal/pycore_gc.h"
+    exclude header "internal/pycore_genobject.h"
+    exclude header "internal/pycore_getopt.h"
+    exclude header "internal/pycore_gil.h"
+    exclude header "internal/pycore_global_objects_fini_generated.h"
+    exclude header "internal/pycore_global_objects.h"
+    exclude header "internal/pycore_global_strings.h"
+    exclude header "internal/pycore_hamt.h"
+    exclude header "internal/pycore_hashtable.h"
+    exclude header "internal/pycore_identifier.h"
+    exclude header "internal/pycore_import.h"
+    exclude header "internal/pycore_importdl.h"
+    exclude header "internal/pycore_index_pool.h"
+    exclude header "internal/pycore_initconfig.h"
+    exclude header "internal/pycore_instruction_sequence.h"
+    exclude header "internal/pycore_instruments.h"
+    exclude header "internal/pycore_interp.h"
+    exclude header "internal/pycore_intrinsics.h"
+    exclude header "internal/pycore_jit.h"
+    exclude header "internal/pycore_list.h"
+    exclude header "internal/pycore_llist.h"
+    exclude header "internal/pycore_lock.h"
+    exclude header "internal/pycore_long.h"
+    exclude header "internal/pycore_magic_number.h"
+    exclude header "internal/pycore_memoryobject.h"
+    exclude header "internal/pycore_mimalloc.h"
+    exclude header "internal/pycore_modsupport.h"
+    exclude header "internal/pycore_moduleobject.h"
+    exclude header "internal/pycore_namespace.h"
+    exclude header "internal/pycore_object_alloc.h"
+    exclude header "internal/pycore_object_deferred.h"
+    exclude header "internal/pycore_object_stack.h"
+    exclude header "internal/pycore_object_state.h"
+    exclude header "internal/pycore_object.h"
+    exclude header "internal/pycore_obmalloc_init.h"
+    exclude header "internal/pycore_obmalloc.h"
+    exclude header "internal/pycore_opcode_metadata.h"
+    exclude header "internal/pycore_opcode_utils.h"
+    exclude header "internal/pycore_optimizer.h"
+    exclude header "internal/pycore_parking_lot.h"
+    exclude header "internal/pycore_parser.h"
+    exclude header "internal/pycore_pathconfig.h"
+    exclude header "internal/pycore_pyarena.h"
+    exclude header "internal/pycore_pyatomic_ft_wrappers.h"
+    exclude header "internal/pycore_pybuffer.h"
+    exclude header "internal/pycore_pyerrors.h"
+    exclude header "internal/pycore_pyhash.h"
+    exclude header "internal/pycore_pylifecycle.h"
+    exclude header "internal/pycore_pymath.h"
+    exclude header "internal/pycore_pymem_init.h"
+    exclude header "internal/pycore_pymem.h"
+    exclude header "internal/pycore_pystate.h"
+    exclude header "internal/pycore_pystats.h"
+    exclude header "internal/pycore_pythonrun.h"
+    exclude header "internal/pycore_pythread.h"
+    exclude header "internal/pycore_qsbr.h"
+    exclude header "internal/pycore_range.h"
+    exclude header "internal/pycore_runtime_init_generated.h"
+    exclude header "internal/pycore_runtime_init.h"
+    exclude header "internal/pycore_runtime.h"
+    exclude header "internal/pycore_semaphore.h"
+    exclude header "internal/pycore_setobject.h"
+    exclude header "internal/pycore_signal.h"
+    exclude header "internal/pycore_sliceobject.h"
+    exclude header "internal/pycore_stackref.h"
+    exclude header "internal/pycore_strhex.h"
+    exclude header "internal/pycore_structseq.h"
+    exclude header "internal/pycore_symtable.h"
+    exclude header "internal/pycore_sysmodule.h"
+    exclude header "internal/pycore_time.h"
+    exclude header "internal/pycore_token.h"
+    exclude header "internal/pycore_traceback.h"
+    exclude header "internal/pycore_tracemalloc.h"
+    exclude header "internal/pycore_tstate.h"
+    exclude header "internal/pycore_tuple.h"
+    exclude header "internal/pycore_typeobject.h"
+    exclude header "internal/pycore_typevarobject.h"
+    exclude header "internal/pycore_ucnhash.h"
+    exclude header "internal/pycore_unicodeobject_generated.h"
+    exclude header "internal/pycore_unicodeobject.h"
+    exclude header "internal/pycore_unionobject.h"
+    exclude header "internal/pycore_uniqueid.h"
+    exclude header "internal/pycore_uop_ids.h"
+    exclude header "internal/pycore_uop_metadata.h"
+    exclude header "internal/pycore_warnings.h"
+    exclude header "internal/pycore_weakref.h"
 }

From 1158013c280b625e64db4470c528f03f61b48546 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 06:08:50 +0800
Subject: [PATCH 02/40] Bump ncipollo/release-action from 1.15.0 to 1.16.0
 (#253)

Bumps [ncipollo/release-action](https://github.com/ncipollo/release-action) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/ncipollo/release-action/releases)
- [Commits](https://github.com/ncipollo/release-action/compare/v1.15.0...v1.16.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4c0a16a4..0980fb50 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -47,7 +47,7 @@ jobs:
         merge-multiple: true
 
     - name: Create Release
-      uses: ncipollo/release-action@v1.15.0
+      uses: ncipollo/release-action@v1.16.0
       with:
         name: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}
         tag: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}

From 832d39318cb752f0a0165ee2eeee263610fb12ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 06:09:14 +0800
Subject: [PATCH 03/40] Bump actions/upload-artifact from 4.6.0 to 4.6.1 (#254)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.6.0...v4.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 44609a7a..ef7ad512 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -121,7 +121,7 @@ jobs:
         make ${{ matrix.target }} BUILD_NUMBER=${{ needs.config.outputs.BUILD_NUMBER }}
 
     - name: Upload build artefacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.1
       with:
         name: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz

From aa545e919535a3334cf17a79dc4acfdd512d9a41 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 26 Feb 2025 07:05:14 +0800
Subject: [PATCH 04/40] Add patch for handling empty simulator lists.

---
 patch/Python/Python.patch | 49 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index 910f33c2..139da995 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -1271,10 +1271,53 @@ index c3e261ecd9e..26ef7a95de4 100644
  	<array>
  		<string>iPhoneOS</string>
 diff --git a/iOS/testbed/__main__.py b/iOS/testbed/__main__.py
-index b4499f5ac17..08fbe90a1c6 100644
+index b4499f5ac17..d12a5ab065b 100644
 --- a/iOS/testbed/__main__.py
 +++ b/iOS/testbed/__main__.py
-@@ -230,33 +230,69 @@
+@@ -82,19 +82,29 @@
+ 
+ # Return a list of UDIDs associated with booted simulators
+ async def list_devices():
+-    # List the testing simulators, in JSON format
+-    raw_json = await async_check_output(
+-        "xcrun", "simctl", "--set", "testing", "list", "-j"
+-    )
+-    json_data = json.loads(raw_json)
+-
+-    # Filter out the booted iOS simulators
+-    return [
+-        simulator["udid"]
+-        for runtime, simulators in json_data["devices"].items()
+-        for simulator in simulators
+-        if runtime.split(".")[-1].startswith("iOS") and simulator["state"] == "Booted"
+-    ]
++    try:
++        # List the testing simulators, in JSON format
++        raw_json = await async_check_output(
++            "xcrun", "simctl", "--set", "testing", "list", "-j"
++        )
++        json_data = json.loads(raw_json)
++
++        # Filter out the booted iOS simulators
++        return [
++            simulator["udid"]
++            for runtime, simulators in json_data["devices"].items()
++            for simulator in simulators
++            if runtime.split(".")[-1].startswith("iOS") and simulator["state"] == "Booted"
++        ]
++    except subprocess.CalledProcessError as e:
++        # If there's no ~/Library/Developer/XCTestDevices folder (which is the
++        # case on fresh installs, and in some CI environments), `simctl list`
++        # returns error code 1, rather than an empty list. Handle that case,
++        # but raise all other errors.
++        if e.returncode == 1:
++            return []
++        else:
++            raise
+ 
+ 
+ async def find_device(initial_devices):
+@@ -230,33 +240,69 @@
      shutil.copytree(source, target, symlinks=True)
      print(" done")
  
@@ -1351,7 +1394,7 @@ index b4499f5ac17..08fbe90a1c6 100644
  
      for app_src in apps:
          print(f"  Installing app {app_src.name!r}...", end="", flush=True)
-@@ -372,8 +408,8 @@
+@@ -372,8 +418,8 @@
  
      if context.subcommand == "clone":
          clone_testbed(

From c794b061d3092ea6716039b22118de85fd98aa27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Mar 2025 08:56:06 +0800
Subject: [PATCH 05/40] Bump actions/download-artifact from 4.1.8 to 4.1.9
 (#255)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.8 to 4.1.9.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4.1.8...v4.1.9)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0980fb50..61da403c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -40,7 +40,7 @@ jobs:
     needs: [ config, ci ]
     steps:
     - name: Get build artifacts
-      uses: actions/download-artifact@v4.1.8
+      uses: actions/download-artifact@v4.1.9
       with:
         pattern: Python-*
         path: dist

From 0013ca0bc85a38f21ca1c4c9f6c8b1e44ae6c400 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 18 Mar 2025 15:39:26 +0800
Subject: [PATCH 06/40] Update patch for Python 3.14.0a6 (#258)

* Update patch for v3.14.0a6,
* Automate the contents of the modulemap file.
---
 .github/workflows/ci.yaml            |   7 +-
 Makefile                             |  24 +++-
 patch/Python/Python.patch            | 171 +++------------------------
 patch/Python/module.modulemap        | 165 --------------------------
 patch/Python/module.modulemap.prefix |  20 ++++
 5 files changed, 60 insertions(+), 327 deletions(-)
 delete mode 100644 patch/Python/module.modulemap
 create mode 100644 patch/Python/module.modulemap.prefix

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ef7ad512..6befbc46 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,10 +1,6 @@
 name: CI
 on:
   pull_request:
-  push:
-    branches:
-      - main
-      - 3.*
   workflow_call:
     inputs:
       build-number:
@@ -114,6 +110,9 @@ jobs:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
         python-version: ${{ needs.config.outputs.PYTHON_VER }}-dev
+        # Ensure that we *always* use the latest build, not a cached version.
+        # It's an edge case, but when a new alpha is released, we need to use it ASAP.
+        check-latest: true
 
     - name: Build ${{ matrix.target }}
       run: |
diff --git a/Makefile b/Makefile
index b0ba7299..7d3f6bfa 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ BUILD_NUMBER=custom
 # of a release cycle, as official binaries won't be published.
 # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
 # PYTHON_VER is the major/minor version (e.g., 3.10)
-PYTHON_VERSION=3.14.0a5
+PYTHON_VERSION=3.14.0a6
 PYTHON_PKG_VERSION=$(PYTHON_VERSION)
 PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
@@ -426,6 +426,7 @@ PYTHON_FRAMEWORK-$(sdk)=$$(PYTHON_INSTALL-$(sdk))/Python.framework
 PYTHON_INSTALL_VERSION-$(sdk)=$$(PYTHON_FRAMEWORK-$(sdk))/Versions/$(PYTHON_VER)
 PYTHON_LIB-$(sdk)=$$(PYTHON_INSTALL_VERSION-$(sdk))/Python
 PYTHON_INCLUDE-$(sdk)=$$(PYTHON_INSTALL_VERSION-$(sdk))/include/python$(PYTHON_VER)
+PYTHON_MODULEMAP-$(sdk)=$$(PYTHON_INCLUDE-$(sdk))/module.modulemap
 PYTHON_STDLIB-$(sdk)=$$(PYTHON_INSTALL_VERSION-$(sdk))/lib/python$(PYTHON_VER)
 
 else
@@ -436,6 +437,7 @@ else
 # The non-macOS frameworks don't use the versioning structure.
 
 PYTHON_INSTALL-$(sdk)=$(PROJECT_DIR)/install/$(os)/$(sdk)/python-$(PYTHON_VERSION)
+PYTHON_MODULEMAP-$(sdk)=$$(PYTHON_INCLUDE-$(sdk))/module.modulemap
 PYTHON_FRAMEWORK-$(sdk)=$$(PYTHON_INSTALL-$(sdk))/Python.framework
 PYTHON_LIB-$(sdk)=$$(PYTHON_FRAMEWORK-$(sdk))/Python
 PYTHON_BIN-$(sdk)=$$(PYTHON_INSTALL-$(sdk))/bin
@@ -466,8 +468,14 @@ $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h: $$(PYTHON_LIB-$(sdk))
 	# Copy headers as-is from the first target in the $(sdk) SDK
 	cp -r $$(PYTHON_INCLUDE-$$(firstword $$(SDK_TARGETS-$(sdk)))) $$(PYTHON_INCLUDE-$(sdk))
 
-	# Copy in the modulemap file
-	cp -r patch/Python/module.modulemap $$(PYTHON_INCLUDE-$(sdk))
+	# Create the modulemap file
+	cp -r patch/Python/module.modulemap.prefix $$(PYTHON_MODULEMAP-$(sdk))
+	echo "" >> $$(PYTHON_MODULEMAP-$(sdk))
+	cd $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/Include && \
+		find cpython -name "*.h"  | sort | sed -e 's/^/    exclude header "/' | sed 's/$$$$/"/' >> $$(PYTHON_MODULEMAP-$(sdk)) && \
+		echo "" >> $$(PYTHON_MODULEMAP-$(sdk)) && \
+		find internal -name "*.h"  | sort | sed -e 's/^/    exclude header "/' | sed 's/$$$$/"/' >> $$(PYTHON_MODULEMAP-$(sdk))
+	echo "\n}" >> $$(PYTHON_MODULEMAP-$(sdk))
 
 	# Link the PYTHONHOME version of the headers
 	mkdir -p $$(PYTHON_INSTALL-$(sdk))/include
@@ -585,8 +593,14 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 	# Rewrite the framework to make it standalone
 	patch/make-relocatable.sh $$(PYTHON_INSTALL_VERSION-macosx) 2>&1 > /dev/null
 
-	# Copy in the modulemap file
-	cp -r patch/Python/module.modulemap $$(PYTHON_FRAMEWORK-macosx)/Headers
+	# Create the modulemap file
+	cp -r patch/Python/module.modulemap.prefix $$(PYTHON_MODULEMAP-macosx)
+	echo "" >> $$(PYTHON_MODULEMAP-macosx)
+	cd $$(PYTHON_INCLUDE-macosx) && \
+		find cpython -name "*.h"  | sort | sed -e 's/^/    exclude header "/' | sed 's/$$$$/"/' >> $$(PYTHON_MODULEMAP-macosx) && \
+		echo "" >> $$(PYTHON_MODULEMAP-macosx) && \
+		find internal -name "*.h"  | sort | sed -e 's/^/    exclude header "/' | sed 's/$$$$/"/' >> $$(PYTHON_MODULEMAP-macosx)
+	echo "\n}" >> $$(PYTHON_MODULEMAP-macosx)
 
 	# Re-apply the signature on the binaries.
 	codesign -s - --preserve-metadata=identifier,entitlements,flags,runtime -f $$(PYTHON_LIB-macosx) \
diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index 139da995..c9c0ef6f 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -113,7 +113,7 @@ index 1f6baed66d3..235dd98c60a 100644
              macos_release = mac_ver()[0]
              if macos_release:
 diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index 69f72452c40..34ce643340b 100644
+index 18e6b8d25e5..4994c56778c 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
 @@ -719,6 +719,14 @@
@@ -163,7 +163,7 @@ index ec0857a4a99..2350e9dc821 100644
  #  elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX
  PLATFORM_TRIPLET=darwin
 diff --git a/configure b/configure
-index d46bc563a67..d5cd81d16a8 100755
+index d0ae103014a..308124ef06d 100755
 --- a/configure
 +++ b/configure
 @@ -974,6 +974,8 @@
@@ -588,7 +588,7 @@ index d46bc563a67..d5cd81d16a8 100755
  fi
  ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
  if test "x$ac_cv_func_pread" = xyes
-@@ -19860,12 +19973,6 @@
+@@ -19866,12 +19979,6 @@
  then :
    printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
  
@@ -601,7 +601,7 @@ index d46bc563a67..d5cd81d16a8 100755
  fi
  ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
  if test "x$ac_cv_func_sigfillset" = xyes
-@@ -20134,11 +20241,11 @@
+@@ -20140,11 +20247,11 @@
  
  fi
  
@@ -615,7 +615,7 @@ index d46bc563a67..d5cd81d16a8 100755
    ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
  if test "x$ac_cv_func_getentropy" = xyes
  then :
-@@ -20160,6 +20267,53 @@
+@@ -20166,6 +20273,53 @@
  
  fi
  
@@ -669,7 +669,7 @@ index d46bc563a67..d5cd81d16a8 100755
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
  printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
  if test ${ac_cv_c_undeclared_builtin_options+y}
-@@ -23242,7 +23396,8 @@
+@@ -23248,7 +23402,8 @@
  
  
  # check for openpty, login_tty, and forkpty
@@ -679,7 +679,7 @@ index d46bc563a67..d5cd81d16a8 100755
  
    for ac_func in openpty
  do :
-@@ -23356,7 +23511,7 @@
+@@ -23362,7 +23517,7 @@
  fi
  
  done
@@ -688,7 +688,7 @@ index d46bc563a67..d5cd81d16a8 100755
  printf %s "checking for library containing login_tty... " >&6; }
  if test ${ac_cv_search_login_tty+y}
  then :
-@@ -23539,6 +23694,7 @@
+@@ -23545,6 +23700,7 @@
  fi
  
  done
@@ -696,7 +696,7 @@ index d46bc563a67..d5cd81d16a8 100755
  
  # check for long file support functions
  ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
-@@ -23804,10 +23960,10 @@
+@@ -23810,10 +23966,10 @@
  
  done
  
@@ -709,7 +709,7 @@ index d46bc563a67..d5cd81d16a8 100755
  then
  
    for ac_func in clock_settime
-@@ -26146,8 +26302,8 @@
+@@ -26152,8 +26308,8 @@
    LIBPYTHON="\$(BLDLIBRARY)"
  fi
  
@@ -720,7 +720,7 @@ index d46bc563a67..d5cd81d16a8 100755
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
  
-@@ -29017,7 +29173,7 @@
+@@ -29023,7 +29179,7 @@
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
  printf "%s\n" "$as_me: checking for device files" >&6;}
  
@@ -729,7 +729,7 @@ index d46bc563a67..d5cd81d16a8 100755
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -29510,7 +29666,7 @@
+@@ -29504,7 +29660,7 @@
      with_ensurepip=no ;; #(
    WASI) :
      with_ensurepip=no ;; #(
@@ -738,7 +738,7 @@ index d46bc563a67..d5cd81d16a8 100755
      with_ensurepip=no ;; #(
    *) :
      with_ensurepip=upgrade
-@@ -30490,7 +30646,7 @@
+@@ -30484,7 +30640,7 @@
   ;; #(
      Darwin) :
       ;; #(
@@ -747,7 +747,7 @@ index d46bc563a67..d5cd81d16a8 100755
  
  
  
-@@ -34493,6 +34649,8 @@
+@@ -34487,6 +34643,8 @@
      "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
      "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
      "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
@@ -757,7 +757,7 @@ index d46bc563a67..d5cd81d16a8 100755
      "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
      "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
 diff --git a/configure.ac b/configure.ac
-index faa89095303..9bd51f7da97 100644
+index 8bb0f1c6ef4..bfd67de48bb 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -330,6 +330,12 @@
@@ -1128,7 +1128,7 @@ index faa89095303..9bd51f7da97 100644
 +  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt \
    pread preadv preadv2 process_vm_readv \
    pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \
-   pthread_kill pthread_getname_np pthread_setname_np \
+   pthread_kill pthread_getname_np pthread_setname_np pthread_getattr_np \
 @@ -5153,7 +5283,7 @@
    sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \
    sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \
@@ -1232,7 +1232,7 @@ index faa89095303..9bd51f7da97 100644
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -7187,7 +7327,7 @@
+@@ -7174,7 +7314,7 @@
        AS_CASE([$ac_sys_system],
          [Emscripten], [with_ensurepip=no],
          [WASI], [with_ensurepip=no],
@@ -1241,7 +1241,7 @@ index faa89095303..9bd51f7da97 100644
          [with_ensurepip=upgrade]
        )
      ])
-@@ -7598,7 +7738,7 @@
+@@ -7585,7 +7725,7 @@
    [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
    dnl The _scproxy module is available on macOS
    [Darwin], [],
@@ -1270,141 +1270,6 @@ index c3e261ecd9e..26ef7a95de4 100644
  	<key>CFBundleSupportedPlatforms</key>
  	<array>
  		<string>iPhoneOS</string>
-diff --git a/iOS/testbed/__main__.py b/iOS/testbed/__main__.py
-index b4499f5ac17..d12a5ab065b 100644
---- a/iOS/testbed/__main__.py
-+++ b/iOS/testbed/__main__.py
-@@ -82,19 +82,29 @@
- 
- # Return a list of UDIDs associated with booted simulators
- async def list_devices():
--    # List the testing simulators, in JSON format
--    raw_json = await async_check_output(
--        "xcrun", "simctl", "--set", "testing", "list", "-j"
--    )
--    json_data = json.loads(raw_json)
--
--    # Filter out the booted iOS simulators
--    return [
--        simulator["udid"]
--        for runtime, simulators in json_data["devices"].items()
--        for simulator in simulators
--        if runtime.split(".")[-1].startswith("iOS") and simulator["state"] == "Booted"
--    ]
-+    try:
-+        # List the testing simulators, in JSON format
-+        raw_json = await async_check_output(
-+            "xcrun", "simctl", "--set", "testing", "list", "-j"
-+        )
-+        json_data = json.loads(raw_json)
-+
-+        # Filter out the booted iOS simulators
-+        return [
-+            simulator["udid"]
-+            for runtime, simulators in json_data["devices"].items()
-+            for simulator in simulators
-+            if runtime.split(".")[-1].startswith("iOS") and simulator["state"] == "Booted"
-+        ]
-+    except subprocess.CalledProcessError as e:
-+        # If there's no ~/Library/Developer/XCTestDevices folder (which is the
-+        # case on fresh installs, and in some CI environments), `simctl list`
-+        # returns error code 1, rather than an empty list. Handle that case,
-+        # but raise all other errors.
-+        if e.returncode == 1:
-+            return []
-+        else:
-+            raise
- 
- 
- async def find_device(initial_devices):
-@@ -230,33 +240,69 @@
-     shutil.copytree(source, target, symlinks=True)
-     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.suffix == ".xcframework":
-             print("  Installing XCFramework...", end="", flush=True)
--            xc_framework_path = (target / "Python.xcframework").resolve()
-             if xc_framework_path.is_dir():
-                 shutil.rmtree(xc_framework_path)
-             else:
--                xc_framework_path.unlink()
-+                xc_framework_path.unlink(missing_ok=True)
-             xc_framework_path.symlink_to(
-                 framework.relative_to(xc_framework_path.parent, walk_up=True)
-             )
-             print(" done")
-         else:
-             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():
-                 shutil.rmtree(sim_framework_path)
-             else:
--                sim_framework_path.unlink()
-+                sim_framework_path.unlink(missing_ok=True)
-             sim_framework_path.symlink_to(
-                 framework.relative_to(sim_framework_path.parent, walk_up=True)
-             )
-             print(" done")
-     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:
-         print(f"  Installing app {app_src.name!r}...", end="", flush=True)
-@@ -372,8 +418,8 @@
- 
-     if context.subcommand == "clone":
-         clone_testbed(
--            source=Path(__file__).parent,
--            target=Path(context.location),
-+            source=Path(__file__).parent.resolve(),
-+            target=Path(context.location).resolve(),
-             framework=Path(context.framework).resolve() if context.framework else None,
-             apps=[Path(app) for app in context.apps],
-         )
 --- /dev/null
 +++ b/tvOS/README.rst
 @@ -0,0 +1,108 @@
diff --git a/patch/Python/module.modulemap b/patch/Python/module.modulemap
deleted file mode 100644
index 96b05fc6..00000000
--- a/patch/Python/module.modulemap
+++ /dev/null
@@ -1,165 +0,0 @@
-module Python {
-    umbrella header "Python.h"
-    export *
-    link "Python"
-
-    exclude header "datetime.h"
-    exclude header "dynamic_annotations.h"
-    exclude header "errcode.h"
-    exclude header "frameobject.h"
-    exclude header "marshal.h"
-    exclude header "opcode_ids.h"
-    exclude header "opcode.h"
-    exclude header "osdefs.h"
-    exclude header "py_curses.h"
-    exclude header "pyconfig-arm32_64.h"
-    exclude header "pyconfig-arm64.h"
-    exclude header "pyconfig-x86_64.h"
-    exclude header "pydtrace.h"
-    exclude header "pyexpat.h"
-    exclude header "structmember.h"
-
-    exclude header "cpython/frameobject.h"
-    exclude header "cpython/pthread_stubs.h"
-    exclude header "cpython/pyatomic_msc.h"
-    exclude header "cpython/pyatomic_std.h"
-    exclude header "cpython/pystats.h"
-
-    exclude header "internal/mimalloc/mimalloc.h"
-    exclude header "internal/mimalloc/mimalloc/atomic.h"
-    exclude header "internal/mimalloc/mimalloc/internal.h"
-    exclude header "internal/mimalloc/mimalloc/prim.h"
-    exclude header "internal/mimalloc/mimalloc/track.h"
-    exclude header "internal/mimalloc/mimalloc/types.h"
-
-    exclude header "internal/pycore_abstract.h"
-    exclude header "internal/pycore_asdl.h"
-    exclude header "internal/pycore_ast_state.h"
-    exclude header "internal/pycore_ast.h"
-    exclude header "internal/pycore_atexit.h"
-    exclude header "internal/pycore_audit.h"
-    exclude header "internal/pycore_backoff.h"
-    exclude header "internal/pycore_bitutils.h"
-    exclude header "internal/pycore_blocks_output_buffer.h"
-    exclude header "internal/pycore_brc.h"
-    exclude header "internal/pycore_bytes_methods.h"
-    exclude header "internal/pycore_bytesobject.h"
-    exclude header "internal/pycore_call.h"
-    exclude header "internal/pycore_capsule.h"
-    exclude header "internal/pycore_cell.h"
-    exclude header "internal/pycore_ceval_state.h"
-    exclude header "internal/pycore_ceval.h"
-    exclude header "internal/pycore_code.h"
-    exclude header "internal/pycore_codecs.h"
-    exclude header "internal/pycore_compile.h"
-    exclude header "internal/pycore_complexobject.h"
-    exclude header "internal/pycore_condvar.h"
-    exclude header "internal/pycore_context.h"
-    exclude header "internal/pycore_critical_section.h"
-    exclude header "internal/pycore_crossinterp_data_registry.h"
-    exclude header "internal/pycore_crossinterp.h"
-    exclude header "internal/pycore_debug_offsets.h"
-    exclude header "internal/pycore_descrobject.h"
-    exclude header "internal/pycore_dict_state.h"
-    exclude header "internal/pycore_dict.h"
-    exclude header "internal/pycore_dtoa.h"
-    exclude header "internal/pycore_emscripten_signal.h"
-    exclude header "internal/pycore_emscripten_trampoline.h"
-    exclude header "internal/pycore_exceptions.h"
-    exclude header "internal/pycore_faulthandler.h"
-    exclude header "internal/pycore_fileutils_windows.h"
-    exclude header "internal/pycore_fileutils.h"
-    exclude header "internal/pycore_floatobject.h"
-    exclude header "internal/pycore_flowgraph.h"
-    exclude header "internal/pycore_format.h"
-    exclude header "internal/pycore_frame.h"
-    exclude header "internal/pycore_freelist_state.h"
-    exclude header "internal/pycore_freelist.h"
-    exclude header "internal/pycore_function.h"
-    exclude header "internal/pycore_gc.h"
-    exclude header "internal/pycore_genobject.h"
-    exclude header "internal/pycore_getopt.h"
-    exclude header "internal/pycore_gil.h"
-    exclude header "internal/pycore_global_objects_fini_generated.h"
-    exclude header "internal/pycore_global_objects.h"
-    exclude header "internal/pycore_global_strings.h"
-    exclude header "internal/pycore_hamt.h"
-    exclude header "internal/pycore_hashtable.h"
-    exclude header "internal/pycore_identifier.h"
-    exclude header "internal/pycore_import.h"
-    exclude header "internal/pycore_importdl.h"
-    exclude header "internal/pycore_index_pool.h"
-    exclude header "internal/pycore_initconfig.h"
-    exclude header "internal/pycore_instruction_sequence.h"
-    exclude header "internal/pycore_instruments.h"
-    exclude header "internal/pycore_interp.h"
-    exclude header "internal/pycore_intrinsics.h"
-    exclude header "internal/pycore_jit.h"
-    exclude header "internal/pycore_list.h"
-    exclude header "internal/pycore_llist.h"
-    exclude header "internal/pycore_lock.h"
-    exclude header "internal/pycore_long.h"
-    exclude header "internal/pycore_magic_number.h"
-    exclude header "internal/pycore_memoryobject.h"
-    exclude header "internal/pycore_mimalloc.h"
-    exclude header "internal/pycore_modsupport.h"
-    exclude header "internal/pycore_moduleobject.h"
-    exclude header "internal/pycore_namespace.h"
-    exclude header "internal/pycore_object_alloc.h"
-    exclude header "internal/pycore_object_deferred.h"
-    exclude header "internal/pycore_object_stack.h"
-    exclude header "internal/pycore_object_state.h"
-    exclude header "internal/pycore_object.h"
-    exclude header "internal/pycore_obmalloc_init.h"
-    exclude header "internal/pycore_obmalloc.h"
-    exclude header "internal/pycore_opcode_metadata.h"
-    exclude header "internal/pycore_opcode_utils.h"
-    exclude header "internal/pycore_optimizer.h"
-    exclude header "internal/pycore_parking_lot.h"
-    exclude header "internal/pycore_parser.h"
-    exclude header "internal/pycore_pathconfig.h"
-    exclude header "internal/pycore_pyarena.h"
-    exclude header "internal/pycore_pyatomic_ft_wrappers.h"
-    exclude header "internal/pycore_pybuffer.h"
-    exclude header "internal/pycore_pyerrors.h"
-    exclude header "internal/pycore_pyhash.h"
-    exclude header "internal/pycore_pylifecycle.h"
-    exclude header "internal/pycore_pymath.h"
-    exclude header "internal/pycore_pymem_init.h"
-    exclude header "internal/pycore_pymem.h"
-    exclude header "internal/pycore_pystate.h"
-    exclude header "internal/pycore_pystats.h"
-    exclude header "internal/pycore_pythonrun.h"
-    exclude header "internal/pycore_pythread.h"
-    exclude header "internal/pycore_qsbr.h"
-    exclude header "internal/pycore_range.h"
-    exclude header "internal/pycore_runtime_init_generated.h"
-    exclude header "internal/pycore_runtime_init.h"
-    exclude header "internal/pycore_runtime.h"
-    exclude header "internal/pycore_semaphore.h"
-    exclude header "internal/pycore_setobject.h"
-    exclude header "internal/pycore_signal.h"
-    exclude header "internal/pycore_sliceobject.h"
-    exclude header "internal/pycore_stackref.h"
-    exclude header "internal/pycore_strhex.h"
-    exclude header "internal/pycore_structseq.h"
-    exclude header "internal/pycore_symtable.h"
-    exclude header "internal/pycore_sysmodule.h"
-    exclude header "internal/pycore_time.h"
-    exclude header "internal/pycore_token.h"
-    exclude header "internal/pycore_traceback.h"
-    exclude header "internal/pycore_tracemalloc.h"
-    exclude header "internal/pycore_tstate.h"
-    exclude header "internal/pycore_tuple.h"
-    exclude header "internal/pycore_typeobject.h"
-    exclude header "internal/pycore_typevarobject.h"
-    exclude header "internal/pycore_ucnhash.h"
-    exclude header "internal/pycore_unicodeobject_generated.h"
-    exclude header "internal/pycore_unicodeobject.h"
-    exclude header "internal/pycore_unionobject.h"
-    exclude header "internal/pycore_uniqueid.h"
-    exclude header "internal/pycore_uop_ids.h"
-    exclude header "internal/pycore_uop_metadata.h"
-    exclude header "internal/pycore_warnings.h"
-    exclude header "internal/pycore_weakref.h"
-}
diff --git a/patch/Python/module.modulemap.prefix b/patch/Python/module.modulemap.prefix
new file mode 100644
index 00000000..e3b3aafb
--- /dev/null
+++ b/patch/Python/module.modulemap.prefix
@@ -0,0 +1,20 @@
+module Python {
+    umbrella header "Python.h"
+    export *
+    link "Python"
+
+    exclude header "datetime.h"
+    exclude header "dynamic_annotations.h"
+    exclude header "errcode.h"
+    exclude header "frameobject.h"
+    exclude header "marshal.h"
+    exclude header "opcode_ids.h"
+    exclude header "opcode.h"
+    exclude header "osdefs.h"
+    exclude header "py_curses.h"
+    exclude header "pyconfig-arm32_64.h"
+    exclude header "pyconfig-arm64.h"
+    exclude header "pyconfig-x86_64.h"
+    exclude header "pydtrace.h"
+    exclude header "pyexpat.h"
+    exclude header "structmember.h"

From ca43143a7cc279b687291928ecf28d2c599b1e71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 07:25:35 +0800
Subject: [PATCH 07/40] Bump actions/download-artifact from 4.1.9 to 4.2.1
 (#265)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.9 to 4.2.1.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4.1.9...v4.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 61da403c..e4da86bc 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -40,7 +40,7 @@ jobs:
     needs: [ config, ci ]
     steps:
     - name: Get build artifacts
-      uses: actions/download-artifact@v4.1.9
+      uses: actions/download-artifact@v4.2.1
       with:
         pattern: Python-*
         path: dist

From cfd548d6df644ffd922491e47087d4f0c547d6fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 07:26:17 +0800
Subject: [PATCH 08/40] Bump actions/upload-artifact from 4.6.1 to 4.6.2 (#266)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.6.1...v4.6.2)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6befbc46..8569ccfa 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -120,7 +120,7 @@ jobs:
         make ${{ matrix.target }} BUILD_NUMBER=${{ needs.config.outputs.BUILD_NUMBER }}
 
     - name: Upload build artefacts
-      uses: actions/upload-artifact@v4.6.1
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz

From db04fbd9b2da6a34e3837f552ee33733e7062be5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Mar 2025 06:55:55 +0800
Subject: [PATCH 09/40] Bump actions/setup-python from 5.4.0 to 5.5.0 (#267)

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5.4.0...v5.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yaml      | 2 +-
 .github/workflows/publish.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8569ccfa..22859602 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -105,7 +105,7 @@ jobs:
     - uses: actions/checkout@v4.1.7
 
     - name: Set up Python
-      uses: actions/setup-python@v5.4.0
+      uses: actions/setup-python@v5.5.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 5d2ce753..3d6922ba 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python environment
-      uses: actions/setup-python@v5.4.0
+      uses: actions/setup-python@v5.5.0
       with:
         python-version: "3.X"
 

From 81428dbb5dcc3b95260afe06c0bcf275e53f41a5 Mon Sep 17 00:00:00 2001
From: John <johnzhou721@gmail.com>
Date: Wed, 16 Apr 2025 19:01:51 -0500
Subject: [PATCH 10/40] Add Python.patch Note to Contributing.md (#271)

Add notes about contributing changes to Python.patch.

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
---
 CONTRIBUTING.md | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d6aad904..10402ae6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,30 @@
 
 BeeWare <3's contributions!
 
-Please be aware, BeeWare operates under a Code of Conduct.
+Please be aware that BeeWare operates under a [Code of
+Conduct](https://beeware.org/community/behavior/code-of-conduct/).
 
-See [CONTRIBUTING to BeeWare](https://beeware.org/contributing) for details.
+See [CONTRIBUTING to BeeWare](https://beeware.org/contributing) for general
+project contribution guidelines.
 
+Unless a fix is version specific, PRs should genereally be made against the
+`main` branch of this repo, targeting the current development version of Python.
+Project maintainers will manage the process of backporting changes to older
+Python versions.
+
+## Changes to `Python.patch`
+
+Additional handling is required if you need to make modifications to the patch
+applied to Python sources (`patch/Python/Python.patch`).
+
+Any iOS or macOS-specific changes should be submitted to the [upstream CPython
+repository](https://github.com/python/cpython). macOS and iOS are both
+officially supported Python platforms, and the code distributed by this project
+for those platforms is unmodified from the official repository.
+
+Changes to to support other platforms can be included in this PR, but they must
+also be submitted as a pull request against the `MAJOR.MINOR-patched` branch on
+[the `freakboy3742` fork of the CPython
+repo](https://github.com/freakboy3742/cpython). This is required to ensure that
+any contributed changes can be easily reproduced in future patches as more
+changes are made.

From 92d8d958bd451e6683e255a357fa9f1378d4cffa Mon Sep 17 00:00:00 2001
From: John <john-xyz@outlook.com>
Date: Wed, 23 Apr 2025 02:18:48 -0500
Subject: [PATCH 11/40] Add support for visionOS (#270)

Adds targets and patches to support building a visionOS support package.

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
---
 .github/workflows/ci.yaml             |    2 +-
 .github/workflows/publish.yaml        |    3 +
 Makefile                              |   39 +-
 patch/Python/Python.patch             | 2464 +++++++++++++++++++++++--
 patch/Python/release.visionOS.exclude |    6 +
 5 files changed, 2365 insertions(+), 149 deletions(-)
 create mode 100644 patch/Python/release.visionOS.exclude

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 22859602..1f53f4cc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: ['macOS', 'iOS', 'tvOS', 'watchOS']
+        target: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS']
         include:
             - briefcase-run-args:
             - run-tests: false
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 3d6922ba..c06a6e06 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -48,3 +48,6 @@ jobs:
         # watchOS build
         curl -o watchOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.outputs.TAG }}/Python-${{ steps.build-vars.outputs.PYTHON_VER }}-watchOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
         aws s3 cp watchOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.outputs.PYTHON_VER }}/watchOS/Python-${{ steps.build-vars.outputs.PYTHON_VER }}-watchOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
+        # visionOS build
+        curl -o visionOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.outputs.TAG }}/Python-${{ steps.build-vars.outputs.PYTHON_VER }}-visionOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
+        aws s3 cp visionOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.outputs.PYTHON_VER }}/visionOS/Python-${{ steps.build-vars.outputs.PYTHON_VER }}-visionOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
diff --git a/Makefile b/Makefile
index 7d3f6bfa..72994c0b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@
 # - iOS             - build everything for iOS
 # - tvOS            - build everything for tvOS
 # - watchOS         - build everything for watchOS
+# - visionOS        - build everything for visionOS
 
 # Current directory
 PROJECT_DIR=$(shell pwd)
@@ -18,7 +19,7 @@ BUILD_NUMBER=custom
 # of a release cycle, as official binaries won't be published.
 # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
 # PYTHON_VER is the major/minor version (e.g., 3.10)
-PYTHON_VERSION=3.14.0a6
+PYTHON_VERSION=3.14.0a7
 PYTHON_PKG_VERSION=$(PYTHON_VERSION)
 PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
@@ -26,33 +27,41 @@ PYTHON_VER=$(basename $(PYTHON_VERSION))
 
 # The binary releases of dependencies, published at:
 # https://github.com/beeware/cpython-apple-source-deps/releases
-BZIP2_VERSION=1.0.8-1
-LIBFFI_VERSION=3.4.7-1
-MPDECIMAL_VERSION=4.0.0-1
-OPENSSL_VERSION=3.0.16-1
-XZ_VERSION=5.6.4-1
+BZIP2_VERSION=1.0.8-2
+LIBFFI_VERSION=3.4.7-2
+MPDECIMAL_VERSION=4.0.0-2
+OPENSSL_VERSION=3.0.16-2
+XZ_VERSION=5.6.4-2
 
 # Supported OS
-OS_LIST=macOS iOS tvOS watchOS
+OS_LIST=macOS iOS tvOS watchOS visionOS
 
 CURL_FLAGS=--disable --fail --location --create-dirs --progress-bar
 
 # macOS targets
 TARGETS-macOS=macosx.x86_64 macosx.arm64
+TRIPLE_OS-macOS=macos
 VERSION_MIN-macOS=11.0
 
 # iOS targets
 TARGETS-iOS=iphonesimulator.x86_64 iphonesimulator.arm64 iphoneos.arm64
+TRIPLE_OS-iOS=ios
 VERSION_MIN-iOS=13.0
 
 # tvOS targets
 TARGETS-tvOS=appletvsimulator.x86_64 appletvsimulator.arm64 appletvos.arm64
+TRIPLE_OS-tvOS=tvos
 VERSION_MIN-tvOS=12.0
 
 # watchOS targets
 TARGETS-watchOS=watchsimulator.x86_64 watchsimulator.arm64 watchos.arm64_32
+TRIPLE_OS-watchOS=watchos
 VERSION_MIN-watchOS=4.0
 
+TARGETS-visionOS=xrsimulator.arm64 xros.arm64
+TRIPLE_OS-visionOS=xros
+VERSION_MIN-visionOS=2.0
+
 # The architecture of the machine doing the build
 HOST_ARCH=$(shell uname -m)
 HOST_PYTHON=$(shell which python$(PYTHON_VER))
@@ -128,10 +137,10 @@ ARCH-$(target)=$$(subst .,,$$(suffix $(target)))
 
 ifneq ($(os),macOS)
 	ifeq ($$(findstring simulator,$$(SDK-$(target))),)
-TARGET_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(OS_LOWER-$(target))$$(VERSION_MIN-$(os))
+TARGET_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(TRIPLE_OS-$(os))$$(VERSION_MIN-$(os))
 IS_SIMULATOR-$(target)=False
 	else
-TARGET_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(OS_LOWER-$(target))$$(VERSION_MIN-$(os))-simulator
+TARGET_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(TRIPLE_OS-$(os))$$(VERSION_MIN-$(os))-simulator
 IS_SIMULATOR-$(target)=True
 	endif
 endif
@@ -398,15 +407,13 @@ define build-sdk
 sdk=$1
 os=$2
 
-OS_LOWER-$(sdk)=$(shell echo $(os) | tr '[:upper:]' '[:lower:]')
-
 SDK_TARGETS-$(sdk)=$$(filter $(sdk).%,$$(TARGETS-$(os)))
 SDK_ARCHES-$(sdk)=$$(sort $$(subst .,,$$(suffix $$(SDK_TARGETS-$(sdk)))))
 
 ifeq ($$(findstring simulator,$(sdk)),)
-SDK_SLICE-$(sdk)=$$(OS_LOWER-$(sdk))-$$(shell echo $$(SDK_ARCHES-$(sdk)) | sed "s/ /_/g")
+SDK_SLICE-$(sdk)=$$(TRIPLE_OS-$(os))-$$(shell echo $$(SDK_ARCHES-$(sdk)) | sed "s/ /_/g")
 else
-SDK_SLICE-$(sdk)=$$(OS_LOWER-$(sdk))-$$(shell echo $$(SDK_ARCHES-$(sdk)) | sed "s/ /_/g")-simulator
+SDK_SLICE-$(sdk)=$$(TRIPLE_OS-$(os))-$$(shell echo $$(SDK_ARCHES-$(sdk)) | sed "s/ /_/g")-simulator
 endif
 
 # Expand the build-target macro for target on this OS
@@ -481,11 +488,15 @@ $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h: $$(PYTHON_LIB-$(sdk))
 	mkdir -p $$(PYTHON_INSTALL-$(sdk))/include
 	ln -si ../Python.framework/Headers $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER)
 
+ifeq ($(os), visionOS)
+	echo "Skipping arch-specific header copying for visionOS"
+else
 	# Add the individual headers from each target in an arch-specific name
 	$$(foreach target,$$(SDK_TARGETS-$(sdk)),cp $$(PYTHON_INCLUDE-$$(target))/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig-$$(ARCH-$$(target)).h; )
 
 	# Copy the cross-target header from the source folder of the first target in the $(sdk) SDK
 	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/$(os)/Resources/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h
+endif
 
 
 $$(PYTHON_STDLIB-$(sdk))/LICENSE.TXT: $$(PYTHON_LIB-$(sdk)) $$(PYTHON_FRAMEWORK-$(sdk))/Info.plist $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h $$(foreach target,$$(SDK_TARGETS-$(sdk)),$$(PYTHON_PLATFORM_SITECUSTOMIZE-$$(target)))
@@ -650,7 +661,7 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/lib $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/platform-config $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 
-ifeq ($(os),iOS)
+ifeq ($(filter $(os),iOS visionOS),$(os))
 	@echo ">>> Clone testbed project for $(os)"
 	$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/iOS/testbed clone --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
 endif
diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index c9c0ef6f..4c59f844 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -1,8 +1,65 @@
+diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
+index bba08b99b95..8d03017c223 100644
+--- a/Lib/ctypes/__init__.py
++++ b/Lib/ctypes/__init__.py
+@@ -361,7 +361,7 @@
+         if name:
+             name = _os.fspath(name)
+ 
+-            # If the filename that has been provided is an iOS/tvOS/watchOS
++            # If the filename that has been provided is an iOS/tvOS/watchOS/visionOS
+             # .fwork file, dereference the location to the true origin of the
+             # binary.
+             if name.endswith(".fwork"):
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 99504911a3d..527c2f36dd0 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -126,7 +126,7 @@
+                         if (name := _get_module_filename(h)) is not None]
+         return libraries
+ 
+-elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
++elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos", "visionos"}:
+     from ctypes.macholib.dyld import dyld_find as _dyld_find
+     def find_library(name):
+         possible = ['lib%s.dylib' % name,
+@@ -425,7 +425,7 @@
+ # https://man.openbsd.org/dl_iterate_phdr
+ # https://docs.oracle.com/cd/E88353_01/html/E37843/dl-iterate-phdr-3c.html
+ if (os.name == "posix" and
+-    sys.platform not in {"darwin", "ios", "tvos", "watchos"}):
++    sys.platform not in {"darwin", "ios", "tvos", "watchos", "visionos"}):
+     import ctypes
+     if hasattr((_libc := ctypes.CDLL(None)), "dl_iterate_phdr"):
+ 
+diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
+index 8bcd741c446..d8a6f28edba 100644
+--- a/Lib/importlib/_bootstrap_external.py
++++ b/Lib/importlib/_bootstrap_external.py
+@@ -52,7 +52,7 @@
+ 
+ # Bootstrap-related code ######################################################
+ _CASE_INSENSITIVE_PLATFORMS_STR_KEY = 'win',
+-_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'watchos'
++_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'watchos', 'visionos'
+ _CASE_INSENSITIVE_PLATFORMS =  (_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY
+                                 + _CASE_INSENSITIVE_PLATFORMS_STR_KEY)
+ 
+@@ -1535,7 +1535,7 @@
+     """
+     extension_loaders = []
+     if hasattr(_imp, 'create_dynamic'):
+-        if sys.platform in {"ios", "tvos", "watchos"}:
++        if sys.platform in {"ios", "tvos", "watchos", "visionos"}:
+             extension_loaders = [(AppleFrameworkLoader, [
+                 suffix.replace(".so", ".fwork")
+                 for suffix in _imp.extension_suffixes()
 diff --git a/Lib/platform.py b/Lib/platform.py
-index 1f6baed66d3..235dd98c60a 100644
+index a62192589af..31f18b026b7 100644
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
-@@ -521,6 +521,54 @@
+@@ -528,6 +528,78 @@
      return IOSVersionInfo(system, release, model, is_simulator)
  
  
@@ -53,18 +110,51 @@ index 1f6baed66d3..235dd98c60a 100644
 +
 +    return WatchOSVersionInfo(system, release, model, is_simulator)
 +
++
++# A namedtuple for visionOS version information.
++VisionOSVersionInfo = collections.namedtuple(
++    "VisionOSVersionInfo",
++    ["system", "release", "model", "is_simulator"]
++)
++
++
++def visionos_ver(system="", release="", model="", is_simulator=False):
++    """Get visionOS version information, and return it as a namedtuple:
++        (system, release, model, is_simulator).
++
++    If values can't be determined, they are set to values provided as
++    parameters.
++    """
++    if sys.platform == "visionos":
++        # TODO: Can the iOS implementation be used here?
++        import _ios_support
++        result = _ios_support.get_platform_ios()
++        if result is not None:
++            return VisionOSVersionInfo(*result)
++
++    return VisionOSVersionInfo(system, release, model, is_simulator)
++
 +
  def _java_getprop(name, default):
      """This private helper is deprecated in 3.13 and will be removed in 3.15"""
      from java.lang import System
-@@ -884,14 +932,25 @@
+@@ -727,7 +799,7 @@
+         default in case the command should fail.
+ 
+     """
+-    if sys.platform in {'dos', 'win32', 'win16', 'ios', 'tvos', 'watchos'}:
++    if sys.platform in {'dos', 'win32', 'win16', 'ios', 'tvos', 'watchos', 'visionos'}:
+         # XXX Others too ?
+         return default
+ 
+@@ -891,14 +963,30 @@
              csid, cpu_number = vms_lib.getsyi('SYI$_CPU', 0)
              return 'Alpha' if cpu_number >= 128 else 'VAX'
  
 -    # On the iOS simulator, os.uname returns the architecture as uname.machine.
 -    # On device it returns the model name for some reason; but there's only one
 -    # CPU architecture for iOS devices, so we know the right answer.
-+    # On the iOS/tvOS/watchOS simulator, os.uname returns the architecture as
++    # On the iOS/tvOS/watchOS/visionOS simulator, os.uname returns the architecture as
 +    # uname.machine. On device it returns the model name for some reason; but
 +    # there's only one CPU architecture for devices, so we know the right
 +    # answer.
@@ -82,11 +172,16 @@ index 1f6baed66d3..235dd98c60a 100644
 +        if sys.implementation._multiarch.endswith("simulator"):
 +            return os.uname().machine
 +        return 'arm64_32'
++
++    def get_visionos():
++        if sys.implementation._multiarch.endswith("simulator"):
++            return os.uname().machine
++        return 'arm64'
 +
      def from_subprocess():
          """
          Fall back to `uname -p`
-@@ -1051,9 +1110,13 @@
+@@ -1058,9 +1146,15 @@
          system = 'Android'
          release = android_ver().release
  
@@ -98,10 +193,12 @@ index 1f6baed66d3..235dd98c60a 100644
 +        system, release, _, _ = tvos_ver()
 +    if sys.platform == 'watchos':
 +        system, release, _, _ = watchos_ver()
++    if sys.platform == 'visionos':
++        system, release, _, _ = visionos_ver()
  
      vals = system, node, release, version, machine
      # Replace 'unknown' values with the more portable ''
-@@ -1343,6 +1406,10 @@
+@@ -1350,6 +1444,12 @@
          # macOS and iOS both report as a "Darwin" kernel
          if sys.platform == "ios":
              system, release, _, _ = ios_ver()
@@ -109,14 +206,63 @@ index 1f6baed66d3..235dd98c60a 100644
 +            system, release, _, _ = tvos_ver()
 +        elif sys.platform == "watchos":
 +            system, release, _, _ = watchos_ver()
++        elif sys.platform == "visionos":
++            system, release, _, _ = visionos_ver()
          else:
              macos_release = mac_ver()[0]
              if macos_release:
+diff --git a/Lib/site.py b/Lib/site.py
+index 9da8b6724e1..345f55a5bde 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -297,8 +297,8 @@
+     if env_base:
+         return env_base
+ 
+-    # Emscripten, iOS, tvOS, VxWorks, WASI, and watchOS have no home directories
+-    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "wasi", "watchos"}:
++    # Emscripten, iOS, tvOS, visionOS, VxWorks, WASI, and watchOS have no home directories
++    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "visionos", "wasi", "watchos"}:
+         return None
+ 
+     def joinuser(*args):
+diff --git a/Lib/subprocess.py b/Lib/subprocess.py
+index da5f5729e09..7401ffbc987 100644
+--- a/Lib/subprocess.py
++++ b/Lib/subprocess.py
+@@ -75,7 +75,7 @@
+     _mswindows = True
+ 
+ # some platforms do not support subprocesses
+-_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos"}
++_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos", "visionos"}
+ 
+ if _mswindows:
+     import _winapi
 diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index 18e6b8d25e5..4994c56778c 100644
+index 18e6b8d25e5..64603fb1bb1 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
-@@ -719,6 +719,14 @@
+@@ -23,6 +23,9 @@
+ _ALWAYS_STR = {
+     'IPHONEOS_DEPLOYMENT_TARGET',
+     'MACOSX_DEPLOYMENT_TARGET',
++    'TVOS_DEPLOYMENT_TARGET',
++    'WATCHOS_DEPLOYMENT_TARGET',
++    'XROS_DEPLOYMENT_TARGET',
+ }
+ 
+ _INSTALL_SCHEMES = {
+@@ -119,7 +122,7 @@
+     # Emscripten, iOS, tvOS, VxWorks, WASI, and watchOS have no home directories.
+     # Use _PYTHON_HOST_PLATFORM to get the correct platform when cross-compiling.
+     system_name = os.environ.get('_PYTHON_HOST_PLATFORM', sys.platform).split('-')[0]
+-    if system_name in {"emscripten", "ios", "tvos", "vxworks", "wasi", "watchos"}:
++    if system_name in {"emscripten", "ios", "tvos", "visionos", "vxworks", "wasi", "watchos"}:
+         return None
+ 
+     def joinuser(*args):
+@@ -719,6 +722,18 @@
              release = get_config_vars().get("IPHONEOS_DEPLOYMENT_TARGET", "13.0")
              osname = sys.platform
              machine = sys.implementation._multiarch
@@ -127,15 +273,224 @@ index 18e6b8d25e5..4994c56778c 100644
 +        elif sys.platform == "watchos":
 +            release = get_config_vars().get("WATCHOS_DEPLOYMENT_TARGET", "4.0")
 +            osname = sys.platform
++            machine = sys.implementation._multiarch
++        elif sys.platform == "visionos":
++            release = get_config_vars().get("XROS_DEPLOYMENT_TARGET", "2.0")
++            osname = sys.platform
 +            machine = sys.implementation._multiarch
          else:
              import _osx_support
              osname, release, machine = _osx_support.get_platform_osx(
+diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
+index ecb37250ceb..67d04491072 100644
+--- a/Lib/test/datetimetester.py
++++ b/Lib/test/datetimetester.py
+@@ -7155,9 +7155,9 @@
+                     self.assertEqual(dt_orig, dt_rt)
+ 
+     def test_type_check_in_subinterp(self):
+-        # iOS requires the use of the custom framework loader,
++        # Apple mobile platforms require the use of the custom framework loader,
+         # not the ExtensionFileLoader.
+-        if sys.platform == "ios":
++        if support.is_apple_mobile:
+             extension_loader = "AppleFrameworkLoader"
+         else:
+             extension_loader = "ExtensionFileLoader"
+diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
+index 6d670a575b0..8d7d68d1ee1 100644
+--- a/Lib/test/support/__init__.py
++++ b/Lib/test/support/__init__.py
+@@ -551,7 +551,7 @@
+         sys.platform == "android", f"Android blocks {name} with SELinux"
+     )
+ 
+-if sys.platform not in {"win32", "vxworks", "ios", "tvos", "watchos"}:
++if sys.platform not in {"win32", "vxworks", "ios", "tvos", "watchos", "visionos"}:
+     unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
+ else:
+     unix_shell = None
+@@ -567,7 +567,7 @@
+ def skip_wasi_stack_overflow():
+     return unittest.skipIf(is_wasi, "Exhausts stack on WASI")
+ 
+-is_apple_mobile = sys.platform in {"ios", "tvos", "watchos"}
++is_apple_mobile = sys.platform in {"ios", "tvos", "watchos", "visionos"}
+ is_apple = is_apple_mobile or sys.platform == "darwin"
+ 
+ has_fork_support = hasattr(os, "fork") and not (
+diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
+index d82093e375c..2c45fe2369e 100644
+--- a/Lib/test/support/os_helper.py
++++ b/Lib/test/support/os_helper.py
+@@ -657,7 +657,7 @@
+     """
+     if sys.platform.startswith(('linux', 'android', 'freebsd', 'emscripten')):
+         fd_path = "/proc/self/fd"
+-    elif sys.platform == "darwin":
++    elif support.is_apple:
+         fd_path = "/dev/fd"
+     else:
+         fd_path = None
+diff --git a/Lib/test/test_ctypes/test_dllist.py b/Lib/test/test_ctypes/test_dllist.py
+index 15603dc3d77..bff6c0fb95f 100644
+--- a/Lib/test/test_ctypes/test_dllist.py
++++ b/Lib/test/test_ctypes/test_dllist.py
+@@ -7,7 +7,7 @@
+ 
+ 
+ WINDOWS = os.name == "nt"
+-APPLE = sys.platform in {"darwin", "ios", "tvos", "watchos"}
++APPLE = sys.platform in {"darwin", "ios", "tvos", "watchos", "visionos"}
+ 
+ if WINDOWS:
+     KNOWN_LIBRARIES = ["KERNEL32.DLL"]
+diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
+index 6ba630ad527..7b447744d12 100644
+--- a/Lib/test/test_platform.py
++++ b/Lib/test/test_platform.py
+@@ -268,13 +268,21 @@
+             if sys.platform == "android":
+                 self.assertEqual(res.system, "Android")
+                 self.assertEqual(res.release, platform.android_ver().release)
+-            elif sys.platform == "ios":
++            elif support.is_apple_mobile:
+                 # Platform module needs ctypes for full operation. If ctypes
+                 # isn't available, there's no ObjC module, and dummy values are
+                 # returned.
+                 if _ctypes:
+-                    self.assertIn(res.system, {"iOS", "iPadOS"})
+-                    self.assertEqual(res.release, platform.ios_ver().release)
++                    if sys.platform == "ios":
++                        # iPads also identify as iOS
++                        self.assertIn(res.system, {"iOS", "iPadOS"})
++                    else:
++                        # All other platforms - sys.platform is the lower case
++                        # form of system (e.g., visionOS->visionos)
++                        self.assertEqual(res.system.lower(), sys.platform)
++                    # Use the platform-specific version method
++                    platform_ver = getattr(platform, f"{sys.platform}_ver")
++                    self.assertEqual(res.release, platform_ver().release)
+                 else:
+                     self.assertEqual(res.system, "")
+                     self.assertEqual(res.release, "")
+diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
+index 4c3ea1cd8df..04a210e5c86 100644
+--- a/Lib/test/test_webbrowser.py
++++ b/Lib/test/test_webbrowser.py
+@@ -236,7 +236,8 @@
+                    arguments=[f'openURL({URL},new-tab)'])
+ 
+ 
+-@unittest.skipUnless(sys.platform == "ios", "Test only applicable to iOS")
++@unittest.skipUnless(sys.platform in {"ios", "visionOS"},
++                     "Test only applicable to iOS and visionOS")
+ class IOSBrowserTest(unittest.TestCase):
+     def _obj_ref(self, *args):
+         # Construct a string representation of the arguments that can be used
+diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
+index 232d3c3a9c5..e042c20ea54 100644
+--- a/Lib/webbrowser.py
++++ b/Lib/webbrowser.py
+@@ -488,7 +488,8 @@
+         # OS X can use below Unix support (but we prefer using the OS X
+         # specific stuff)
+ 
+-    if sys.platform == "ios":
++    if sys.platform in {"ios", "visionos"}:
++        # iOS and visionOS provide a browser; tvOS and watchOS don't.
+         register("iosbrowser", None, IOSBrowser(), preferred=True)
+ 
+     if sys.platform == "serenityos":
+@@ -640,9 +641,10 @@
+             return not rc
+ 
+ #
+-# Platform support for iOS
++# Platform support for Apple Mobile platforms that provide a browser
++# (i.e., iOS and visionOS)
+ #
+-if sys.platform == "ios":
++if sys.platform in {"ios", "visionos"}:
+     from _ios_support import objc
+     if objc:
+         # If objc exists, we know ctypes is also importable.
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e10c78d6403..920e707ab26 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -209,6 +209,12 @@
+ # the build, and is only listed here so it will be included in sysconfigdata.
+ IPHONEOS_DEPLOYMENT_TARGET=@IPHONEOS_DEPLOYMENT_TARGET@
+ 
++# visionOS Deployment target is *actually* used during the build, by the
++# compiler shims; export.
++XROS_DEPLOYMENT_TARGET=@XROS_DEPLOYMENT_TARGET@
++@EXPORT_XROS_DEPLOYMENT_TARGET@export XROS_DEPLOYMENT_TARGET
++
++
+ # Option to install to strip binaries
+ STRIPFLAG=-s
+ 
+@@ -2243,7 +2249,7 @@
+ # a full Xcode install that has an iPhone SE (3rd edition) simulator available.
+ # This must be run *after* a `make install` has completed the build. The
+ # `--with-framework-name` argument *cannot* be used when configuring the build.
+-XCFOLDER:=iOSTestbed.$(MULTIARCH).$(shell date +%s).$$PPID
++XCFOLDER-iOS:=iOSTestbed.$(MULTIARCH).$(shell date +%s).$$PPID
+ .PHONY: testios
+ testios:
+ 	@if test "$(MACHDEP)" != "ios"; then \
+@@ -2263,11 +2269,41 @@
+ 		exit 1;\
+ 	fi
+ 
+-	# Clone the testbed project into the XCFOLDER
+-	$(PYTHON_FOR_BUILD) $(srcdir)/iOS/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
++	# Clone the testbed project into the XCFOLDER-iOS
++	$(PYTHON_FOR_BUILD) $(srcdir)/iOS/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER-iOS)"
++
++	# Run the testbed project
++	$(PYTHON_FOR_BUILD) "$(XCFOLDER-iOS)" run --verbose -- test -uall --single-process --rerun -W
++
++# Run the test suite on the visionOS simulator. Must be run on a macOS machine with
++# a full Xcode install that has an Apple Vision Pro simulator available.
++# This must be run *after* a `make install` has completed the build. The
++# `--with-framework-name` argument *cannot* be used when configuring the build.
++XCFOLDER-visionOS:=visionOSTestbed.$(MULTIARCH).$(shell date +%s).$$PPID
++.PHONY: testvisionos
++testvisionos:
++	@if test "$(MACHDEP)" != "visionos"; then \
++		echo "Cannot run the visionOS testbed for a non-visionOS build."; \
++		exit 1;\
++	fi
++	@if test "$(findstring -xrsimulator,$(MULTIARCH))" != "-xrsimulator"; then \
++		echo "Cannot run the visionOS testbed for non-simulator builds."; \
++		exit 1;\
++	fi
++	@if test $(PYTHONFRAMEWORK) != "Python"; then \
++		echo "Cannot run the visionOS testbed with a non-default framework name."; \
++		exit 1;\
++	fi
++	@if ! test -d $(PYTHONFRAMEWORKPREFIX); then \
++		echo "Cannot find a finalized visionOS Python.framework. Have you run 'make install' to finalize the framework build?"; \
++		exit 1;\
++	fi
++
++	# Clone the testbed project into the XCFOLDER-visionOS
++	$(PYTHON_FOR_BUILD) $(srcdir)/visionOS/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER-visionOS)"
+ 
+ 	# Run the testbed project
+-	$(PYTHON_FOR_BUILD) "$(XCFOLDER)" run --verbose -- test -uall --single-process --rerun -W
++	$(PYTHON_FOR_BUILD) "$(XCFOLDER-visionOS)" run --verbose -- test -uall --single-process --rerun -W
+ 
+ # Like test, but using --slow-ci which enables all test resources and use
+ # longer timeout. Run an optional pybuildbot.identify script to include
 diff --git a/Misc/platform_triplet.c b/Misc/platform_triplet.c
-index ec0857a4a99..2350e9dc821 100644
+index ec0857a4a99..e52f486cdb3 100644
 --- a/Misc/platform_triplet.c
 +++ b/Misc/platform_triplet.c
-@@ -257,6 +257,26 @@
+@@ -257,6 +257,32 @@
  #    else
  PLATFORM_TRIPLET=arm64-iphoneos
  #    endif
@@ -158,24 +513,54 @@ index ec0857a4a99..2350e9dc821 100644
 +#      endif
 +#    else
 +PLATFORM_TRIPLET=arm64_32-watchos
++#    endif
++#  elif defined(TARGET_OS_VISION) && TARGET_OS_VISION
++#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
++PLATFORM_TRIPLET=arm64-xrsimulator
++#    else
++PLATFORM_TRIPLET=arm64-xros
 +#    endif
  // Older macOS SDKs do not define TARGET_OS_OSX
  #  elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX
  PLATFORM_TRIPLET=darwin
+diff --git a/config.sub b/config.sub
+index 1bb6a05dc11..49febd56a37 100755
+--- a/config.sub
++++ b/config.sub
+@@ -1743,7 +1743,7 @@
+ 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+ 	     | hiux* | abug | nacl* | netware* | windows* \
+-	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
++	     | os9* | macos* | osx* | ios* | tvos* | watchos* | xros* \
+ 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+ 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+ 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+@@ -1867,7 +1867,7 @@
+ 		;;
+ 	*-eabi*- | *-gnueabi*-)
+ 		;;
+-	ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
++	ios*-simulator- | tvos*-simulator- | watchos*-simulator- | xros*-simulator-)
+ 		;;
+ 	none--*)
+ 		# None (no kernel, i.e. freestanding / bare metal),
 diff --git a/configure b/configure
-index d0ae103014a..308124ef06d 100755
+index 1b75ddfa26d..7b79dfc424c 100755
 --- a/configure
 +++ b/configure
-@@ -974,6 +974,8 @@
+@@ -978,6 +978,10 @@
  CFLAGS
  CC
  HAS_XCRUN
++EXPORT_XROS_DEPLOYMENT_TARGET
++XROS_DEPLOYMENT_TARGET
 +WATCHOS_DEPLOYMENT_TARGET
 +TVOS_DEPLOYMENT_TARGET
  IPHONEOS_DEPLOYMENT_TARGET
  EXPORT_MACOSX_DEPLOYMENT_TARGET
  CONFIGURE_MACOSX_DEPLOYMENT_TARGET
-@@ -4100,6 +4102,12 @@
+@@ -4106,6 +4110,15 @@
  	*-apple-ios*)
  		ac_sys_system=iOS
  		;;
@@ -184,20 +569,23 @@ index d0ae103014a..308124ef06d 100755
 +		;;
 +	*-apple-watchos*)
 +		ac_sys_system=watchOS
++		;;
++	*-apple-xros*)
++		ac_sys_system=visionOS
 +		;;
  	*-*-darwin*)
  		ac_sys_system=Darwin
  		;;
-@@ -4181,7 +4189,7 @@
+@@ -4187,7 +4200,7 @@
  # On cross-compile builds, configure will look for a host-specific compiler by
  # prepending the user-provided host triple to the required binary name.
  #
 -# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
-+# On iOS/tvOS/watchOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
++# On iOS/tvOS/watchOS/visionOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
  # which isn't a binary that exists, and isn't very convenient, as it contains the
  # iOS version. As the default cross-compiler name won't exist, configure falls
  # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
-@@ -4196,6 +4204,14 @@
+@@ -4202,6 +4215,17 @@
  		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
  		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
  		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
@@ -209,10 +597,13 @@ index d0ae103014a..308124ef06d 100755
 +		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
 +		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
 +		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
++
++		aarch64-apple-xros*-simulator) AR=arm64-apple-xros-simulator-ar ;;
++		aarch64-apple-xros*)           AR=arm64-apple-xros-ar ;;
  		*)
  	esac
  fi
-@@ -4204,6 +4220,14 @@
+@@ -4210,6 +4234,17 @@
  		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
  		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
  		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
@@ -224,10 +615,13 @@ index d0ae103014a..308124ef06d 100755
 +		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
 +		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
 +		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
++
++		aarch64-apple-xros*-simulator) CC=arm64-apple-xros-simulator-clang ;;
++		aarch64-apple-xros*)           CC=arm64-apple-xros-clang ;;
  		*)
  	esac
  fi
-@@ -4212,6 +4236,14 @@
+@@ -4218,6 +4253,17 @@
  		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
  		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
  		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
@@ -239,10 +633,13 @@ index d0ae103014a..308124ef06d 100755
 +		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
 +		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
 +		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
++
++		aarch64-apple-xros*-simulator) CPP=arm64-apple-xros-simulator-cpp ;;
++		aarch64-apple-xros*)           CPP=arm64-apple-xros-cpp ;;
  		*)
  	esac
  fi
-@@ -4220,6 +4252,14 @@
+@@ -4226,6 +4272,17 @@
  		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
  		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
  		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
@@ -254,10 +651,13 @@ index d0ae103014a..308124ef06d 100755
 +		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
 +		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
 +		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
++
++		aarch64-apple-xros*-simulator) CXX=arm64-apple-xros-simulator-clang++ ;;
++		aarch64-apple-xros*)           CXX=arm64-apple-xros-clang++ ;;
  		*)
  	esac
  fi
-@@ -4342,8 +4382,10 @@
+@@ -4348,8 +4405,11 @@
  	case $enableval in
  	yes)
  		case $ac_sys_system in
@@ -267,19 +667,21 @@ index d0ae103014a..308124ef06d 100755
 +			iOS)     enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
 +			tvOS)    enableval=tvOS/Frameworks/\$\(MULTIARCH\) ;;
 +			watchOS) enableval=watchOS/Frameworks/\$\(MULTIARCH\) ;;
++			visionOS) enableval=visionOS/Frameworks/\$\(MULTIARCH\) ;;
  			*) as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
  		esac
  	esac
-@@ -4352,6 +4394,8 @@
+@@ -4358,6 +4418,9 @@
  	no)
  		case $ac_sys_system in
  			iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
 +			tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
 +			watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
++			visionOS) as_fn_error $? "visionOS builds must use --enable-framework" "$LINENO" 5 ;;
  			*)
  				PYTHONFRAMEWORK=
  				PYTHONFRAMEWORKDIR=no-framework
-@@ -4458,6 +4502,36 @@
+@@ -4464,6 +4527,51 @@
  
  				ac_config_files="$ac_config_files iOS/Resources/Info.plist"
  
@@ -312,42 +714,67 @@ index d0ae103014a..308124ef06d 100755
 +				RESSRCDIR=watchOS/Resources
 +
 +				ac_config_files="$ac_config_files watchOS/Resources/Info.plist"
++
++				;;
++			visionOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=visionOS/Resources
++
++				ac_config_files="$ac_config_files visionOS/Resources/Info.plist"
 +
  				;;
  			*)
  				as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
-@@ -4469,6 +4543,8 @@
+@@ -4475,6 +4583,9 @@
    e)
  	case $ac_sys_system in
  		iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
 +		tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
 +		watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
++		visionOS) as_fn_error $? "visionOS builds must use --enable-framework" "$LINENO" 5 ;;
  		*)
  			PYTHONFRAMEWORK=
  			PYTHONFRAMEWORKDIR=no-framework
-@@ -4523,8 +4599,8 @@
+@@ -4529,8 +4640,8 @@
      case "$withval" in
      yes)
        case $ac_sys_system in
 -        Darwin|iOS)
 -          # iOS is able to share the macOS patch
-+        Darwin|iOS|tvOS|watchOS)
-+          # iOS/tvOS/watchOS is able to share the macOS patch
++        Darwin|iOS|tvOS|watchOS|visionOS)
++          # iOS/tvOS/watchOS/visionOS is able to share the macOS patch
            APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
            ;;
          *) as_fn_error $? "no default app store compliance patch available for $ac_sys_system" "$LINENO" 5 ;;
-@@ -4542,8 +4618,8 @@
+@@ -4548,8 +4659,8 @@
  else case e in #(
    e)
      case $ac_sys_system in
 -      iOS)
 -        # Always apply the compliance patch on iOS; we can use the macOS patch
-+      iOS|tvOS|watchOS)
-+        # Always apply the compliance patch on iOS/tvOS/watchOS; we can use the macOS patch
++      iOS|tvOS|watchOS|visionOS)
++        # Always apply the compliance patch on iOS/tvOS/watchOS/visionOS; we can use the macOS patch
          APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: applying default app store compliance patch" >&5
  printf "%s\n" "applying default app store compliance patch" >&6; }
-@@ -4598,6 +4674,50 @@
+@@ -4567,6 +4678,8 @@
+ 
+ 
+ 
++EXPORT_XROS_DEPLOYMENT_TARGET='#'
++
+ 
+ if test "$cross_compiling" = yes; then
+ 	case "$host" in
+@@ -4604,6 +4717,78 @@
  				;;
  		esac
  		;;
@@ -394,38 +821,71 @@ index d0ae103014a..308124ef06d 100755
 +				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
 +				;;
 +		esac
++		;;
++	*-apple-xros*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# XROS_DEPLOYMENT_TARGET is the minimum supported visionOS version
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking visionOS deployment target" >&5
++printf %s "checking visionOS deployment target... " >&6; }
++		XROS_DEPLOYMENT_TARGET=${_host_os:8}
++		XROS_DEPLOYMENT_TARGET=${XROS_DEPLOYMENT_TARGET:=2.0}
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XROS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$XROS_DEPLOYMENT_TARGET" >&6; }
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking exporting flag of visionOS deployment target" >&5
++printf %s "checking exporting flag of visionOS deployment target... " >&6; }
++        	export XROS_DEPLOYMENT_TARGET
++		EXPORT_XROS_DEPLOYMENT_TARGET=''
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXPORT_XROS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$EXPORT_XROS_DEPLOYMENT_TARGET" >&6; }
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-arm64-xr${_host_device}
++				;;
++			*)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-$host_cpu-xr${_host_device}
++				;;
++		esac
 +		;;
  	*-*-darwin*)
  		case "$host_cpu" in
  		arm*)
-@@ -4688,9 +4808,13 @@
+@@ -4694,9 +4879,15 @@
      define_xopen_source=no;;
    Darwin/[12][0-9].*)
      define_xopen_source=no;;
 -  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
-+  # On iOS/tvOS/watchOS, defining _POSIX_C_SOURCE also disables platform specific features.
++  # On iOS/tvOS/watchOS/visionOS, defining _POSIX_C_SOURCE also disables platform specific features.
    iOS/*)
      define_xopen_source=no;;
 +  tvOS/*)
 +    define_xopen_source=no;;
 +  watchOS/*)
++    define_xopen_source=no;;
++  visionOS/*)
 +    define_xopen_source=no;;
    # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
    # defining NI_NUMERICHOST.
    QNX/6.3.2)
-@@ -4753,7 +4877,10 @@
+@@ -4759,7 +4950,13 @@
  CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
  EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
  
 -# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
 +# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
-+# WATCHOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++# WATCHOS_DEPLOYMENT_TARGET / XROS_DEPLOYMENT_TARGET enforced by the selected host triple.
++
 +
 +
++
++# XROS_DEPLOYMENT_TARGET should get exported
  
  
  # checks for alternative programs
-@@ -4794,6 +4921,16 @@
+@@ -4800,6 +4997,16 @@
      as_fn_append CFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
      as_fn_append LDFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
     ;; #(
@@ -442,27 +902,29 @@ index d0ae103014a..308124ef06d 100755
    *) :
       ;;
  esac
-@@ -7163,6 +7300,10 @@
+@@ -7169,6 +7376,12 @@
      MULTIARCH="" ;; #(
    iOS) :
      MULTIARCH="" ;; #(
 +  tvOS) :
 +    MULTIARCH="" ;; #(
 +  watchOS) :
++    MULTIARCH="" ;; #(
++  visionOS) :
 +    MULTIARCH="" ;; #(
    FreeBSD*) :
      MULTIARCH="" ;; #(
    *) :
-@@ -7183,7 +7324,7 @@
+@@ -7189,7 +7402,7 @@
  printf "%s\n" "$MULTIARCH" >&6; }
  
  case $ac_sys_system in #(
 -  iOS) :
-+  iOS|tvOS|watchOS) :
++  iOS|tvOS|watchOS|visionOS) :
      SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2` ;; #(
    *) :
      SOABI_PLATFORM=$PLATFORM_TRIPLET
-@@ -7234,6 +7375,14 @@
+@@ -7240,6 +7453,18 @@
      PY_SUPPORT_TIER=3 ;; #(
      aarch64-apple-ios*/clang) :
      PY_SUPPORT_TIER=3 ;; #(
@@ -473,65 +935,69 @@ index d0ae103014a..308124ef06d 100755
 +    aarch64-apple-watchos*-simulator/clang) :
 +    PY_SUPPORT_TIER=3 ;; #(
 +    arm64_32-apple-watchos*/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-xros*-simulator/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-xros*/clang) :
 +    PY_SUPPORT_TIER=3 ;; #(
      aarch64-*-linux-android/clang) :
      PY_SUPPORT_TIER=3 ;; #(
      x86_64-*-linux-android/clang) :
-@@ -7670,7 +7819,7 @@
+@@ -7676,7 +7901,7 @@
    case $ac_sys_system in
      Darwin)
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
 -    iOS)
-+    iOS|tvOS|watchOS)
++    iOS|tvOS|watchOS|visionOS)
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
      *)
        as_fn_error $? "Unknown platform for framework build" "$LINENO" 5;;
-@@ -7736,7 +7885,7 @@
+@@ -7742,7 +7967,7 @@
        BLDLIBRARY='-L. -lpython$(LDVERSION)'
        RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
        ;;
 -    iOS)
-+    iOS|tvOS|watchOS)
++    iOS|tvOS|watchOS|visionOS)
        LDLIBRARY='libpython$(LDVERSION).dylib'
        ;;
      AIX*)
-@@ -13544,7 +13693,7 @@
+@@ -13550,7 +13775,7 @@
  			BLDSHARED="$LDSHARED"
  		fi
  		;;
 -	iOS/*)
-+	iOS/*|tvOS/*|watchOS/*)
++	iOS/*|tvOS/*|watchOS/*|visionOS/*)
  		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		BLDSHARED="$LDSHARED"
-@@ -13677,7 +13826,7 @@
+@@ -13683,7 +13908,7 @@
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
  	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
  	# -u libsys_s pulls in all symbols in libsys
 -	Darwin/*|iOS/*)
-+	Darwin/*|iOS/*|tvOS/*|watchOS/*)
++	Darwin/*|iOS/*|tvOS/*|watchOS/*|visionOS/*)
  		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
  
  		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -13701,7 +13850,7 @@
+@@ -13707,7 +13932,7 @@
  				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			fi
  			LINKFORSHARED="$LINKFORSHARED"
 -		elif test $ac_sys_system = "iOS"; then
-+		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS"; then
++		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS" -o "$ac_sys_system" = "visionOS"; then
  			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
  		fi
  		;;
-@@ -15286,7 +15435,7 @@
+@@ -15292,7 +15517,7 @@
  
              ctypes_malloc_closure=yes
       ;; #(
 -  iOS) :
-+  iOS|tvOS|watchOS) :
++  iOS|tvOS|watchOS|visionOS) :
  
        ctypes_malloc_closure=yes
       ;; #(
-@@ -19038,12 +19187,6 @@
+@@ -19044,12 +19269,6 @@
  then :
    printf "%s\n" "#define HAVE_DUP3 1" >>confdefs.h
  
@@ -544,7 +1010,7 @@ index d0ae103014a..308124ef06d 100755
  fi
  ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
  if test "x$ac_cv_func_explicit_bzero" = xyes
-@@ -19104,18 +19247,6 @@
+@@ -19110,18 +19329,6 @@
  then :
    printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h
  
@@ -563,7 +1029,7 @@ index d0ae103014a..308124ef06d 100755
  fi
  ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
  if test "x$ac_cv_func_fpathconf" = xyes
-@@ -19542,24 +19673,6 @@
+@@ -19548,24 +19755,6 @@
  then :
    printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h
  
@@ -588,7 +1054,7 @@ index d0ae103014a..308124ef06d 100755
  fi
  ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
  if test "x$ac_cv_func_pread" = xyes
-@@ -19866,12 +19979,6 @@
+@@ -19884,12 +20073,6 @@
  then :
    printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
  
@@ -601,21 +1067,21 @@ index d0ae103014a..308124ef06d 100755
  fi
  ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
  if test "x$ac_cv_func_sigfillset" = xyes
-@@ -20140,11 +20247,11 @@
+@@ -20158,11 +20341,11 @@
  
  fi
  
 -# iOS defines some system methods that can be linked (so they are
-+# iOS/tvOS/watchOS define some system methods that can be linked (so they are
++# iOS/tvOS/watchOS/visionOS define some system methods that can be linked (so they are
  # found by configure), but either raise a compilation error (because the
  # header definition prevents usage - autoconf doesn't use the headers), or
  # raise an error if used at runtime. Force these symbols off.
 -if test "$ac_sys_system" != "iOS" ; then
-+if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
++if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" -a "$ac_sys_system" != "visionOS" ; then
    ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
  if test "x$ac_cv_func_getentropy" = xyes
  then :
-@@ -20166,6 +20273,53 @@
+@@ -20184,6 +20367,53 @@
  
  fi
  
@@ -669,7 +1135,7 @@ index d0ae103014a..308124ef06d 100755
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
  printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
  if test ${ac_cv_c_undeclared_builtin_options+y}
-@@ -23248,7 +23402,8 @@
+@@ -23266,7 +23496,8 @@
  
  
  # check for openpty, login_tty, and forkpty
@@ -679,7 +1145,7 @@ index d0ae103014a..308124ef06d 100755
  
    for ac_func in openpty
  do :
-@@ -23362,7 +23517,7 @@
+@@ -23380,7 +23611,7 @@
  fi
  
  done
@@ -688,7 +1154,7 @@ index d0ae103014a..308124ef06d 100755
  printf %s "checking for library containing login_tty... " >&6; }
  if test ${ac_cv_search_login_tty+y}
  then :
-@@ -23545,6 +23700,7 @@
+@@ -23563,6 +23794,7 @@
  fi
  
  done
@@ -696,71 +1162,90 @@ index d0ae103014a..308124ef06d 100755
  
  # check for long file support functions
  ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
-@@ -23810,10 +23966,10 @@
+@@ -23828,10 +24060,10 @@
  
  done
  
 -# On Android and iOS, clock_settime can be linked (so it is found by
-+# On Android, iOS, tvOS and watchOS, clock_settime can be linked (so it is found by
++# On Android, iOS, tvOS, watchOS, and visionOS, clock_settime can be linked (so it is found by
  # configure), but when used in an unprivileged process, it crashes rather than
  # returning an error. Force the symbol off.
 -if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
-+if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS"
++if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" -a "$ac_sys_system" != "visionOS"
  then
  
    for ac_func in clock_settime
-@@ -26152,8 +26308,8 @@
+@@ -24148,7 +24380,7 @@
+   e) if test "$cross_compiling" = yes
+ then :
+ 
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS" || test "$ac_sys_system" = "tvOS" || test "$ac_sys_system" = "watchOS" || test "$ac_sys_system" = "visionOS"; then
+   ac_cv_buggy_getaddrinfo="no"
+ elif test "${enable_ipv6+set}" = set; then
+   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
+@@ -26170,8 +26402,8 @@
    LIBPYTHON="\$(BLDLIBRARY)"
  fi
  
 -# On iOS the shared libraries must be linked with the Python framework
 -if test "$ac_sys_system" = "iOS"; then
 +# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
-+if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "watchOS"; then
++if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "watchOS" -o $ac_sys_system = "visionOS"; then
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
  
-@@ -29023,7 +29179,7 @@
+@@ -29041,7 +29273,7 @@
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
  printf "%s\n" "$as_me: checking for device files" >&6;}
  
 -if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
-+if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS" ; then
++if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS"  -o "$ac_sys_system" = "visionOS" ; then
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -29504,7 +29660,7 @@
+@@ -29550,7 +29782,7 @@
      with_ensurepip=no ;; #(
    WASI) :
      with_ensurepip=no ;; #(
 -  iOS) :
-+  iOS|tvOS|watchOS) :
++  iOS|tvOS|watchOS|visionOS) :
      with_ensurepip=no ;; #(
    *) :
      with_ensurepip=upgrade
-@@ -30484,7 +30640,7 @@
+@@ -30499,7 +30731,7 @@
+   SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
+   NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
+   Darwin) _PYTHREAD_NAME_MAXLEN=63;;
+-  iOS) _PYTHREAD_NAME_MAXLEN=63;;
++  iOS|tvOS|watchOS|visionOS) _PYTHREAD_NAME_MAXLEN=63;;
+   FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
+   OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
+   *) _PYTHREAD_NAME_MAXLEN=;;
+@@ -30531,7 +30763,7 @@
   ;; #(
      Darwin) :
       ;; #(
 -  iOS) :
-+  iOS|tvOS|watchOS) :
++  iOS|tvOS|watchOS|visionOS) :
  
  
  
-@@ -34487,6 +34643,8 @@
+@@ -34605,6 +34837,9 @@
      "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
      "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
      "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
 +    "tvOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES tvOS/Resources/Info.plist" ;;
 +    "watchOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES watchOS/Resources/Info.plist" ;;
++    "visionOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES visionOS/Resources/Info.plist" ;;
      "Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
      "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
      "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
 diff --git a/configure.ac b/configure.ac
-index 8bb0f1c6ef4..bfd67de48bb 100644
+index c449bb5ebb3..29b9a82374b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -330,6 +330,12 @@
+@@ -330,6 +330,15 @@
  	*-apple-ios*)
  		ac_sys_system=iOS
  		;;
@@ -769,20 +1254,23 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +		;;
 +	*-apple-watchos*)
 +		ac_sys_system=watchOS
++		;;
++	*-apple-xros*)
++		ac_sys_system=visionOS
 +		;;
  	*-*-darwin*)
  		ac_sys_system=Darwin
  		;;
-@@ -405,7 +411,7 @@
+@@ -405,7 +414,7 @@
  # On cross-compile builds, configure will look for a host-specific compiler by
  # prepending the user-provided host triple to the required binary name.
  #
 -# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
-+# On iOS/tvOS/watchOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
++# On iOS/tvOS/watchOS/visionOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
  # which isn't a binary that exists, and isn't very convenient, as it contains the
  # iOS version. As the default cross-compiler name won't exist, configure falls
  # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
-@@ -420,6 +426,14 @@
+@@ -420,6 +429,17 @@
  		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
  		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
  		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
@@ -794,10 +1282,13 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
 +		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
 +		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
++
++		aarch64-apple-xros*-simulator) AR=arm64-apple-xros-simulator-ar ;;
++		aarch64-apple-xros*)           AR=arm64-apple-xros-ar ;;
  		*)
  	esac
  fi
-@@ -428,6 +442,14 @@
+@@ -428,6 +448,17 @@
  		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
  		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
  		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
@@ -809,10 +1300,13 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
 +		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
 +		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
++
++		aarch64-apple-xros*-simulator) CC=arm64-apple-xros-simulator-clang ;;
++		aarch64-apple-xros*)           CC=arm64-apple-xros-clang ;;
  		*)
  	esac
  fi
-@@ -436,6 +458,14 @@
+@@ -436,6 +467,17 @@
  		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
  		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
  		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
@@ -824,10 +1318,13 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
 +		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
 +		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
++
++		aarch64-apple-xros*-simulator) CPP=arm64-apple-xros-simulator-cpp ;;
++		aarch64-apple-xros*)           CPP=arm64-apple-xros-cpp ;;
  		*)
  	esac
  fi
-@@ -444,6 +474,14 @@
+@@ -444,6 +486,17 @@
  		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
  		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
  		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
@@ -839,10 +1336,13 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
 +		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
 +		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
++
++		aarch64-apple-xros*-simulator) CXX=arm64-apple-xros-simulator-clang++ ;;
++		aarch64-apple-xros*)           CXX=arm64-apple-xros-clang++ ;;
  		*)
  	esac
  fi
-@@ -558,8 +596,10 @@
+@@ -558,8 +611,11 @@
  	case $enableval in
  	yes)
  		case $ac_sys_system in
@@ -852,19 +1352,21 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +			iOS)     enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
 +			tvOS)    enableval=tvOS/Frameworks/\$\(MULTIARCH\) ;;
 +			watchOS) enableval=watchOS/Frameworks/\$\(MULTIARCH\) ;;
++			visionOS) enableval=visionOS/Frameworks/\$\(MULTIARCH\) ;;
  			*) AC_MSG_ERROR([Unknown platform for framework build])
  		esac
  	esac
-@@ -568,6 +608,8 @@
+@@ -568,6 +624,9 @@
  	no)
  		case $ac_sys_system in
  			iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
 +			tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
 +			watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
++			visionOS) AC_MSG_ERROR([visionOS builds must use --enable-framework]) ;;
  			*)
  				PYTHONFRAMEWORK=
  				PYTHONFRAMEWORKDIR=no-framework
-@@ -670,6 +712,34 @@
+@@ -670,6 +729,48 @@
  
  				AC_CONFIG_FILES([iOS/Resources/Info.plist])
  				;;
@@ -895,42 +1397,66 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +				RESSRCDIR=watchOS/Resources
 +
 +				AC_CONFIG_FILES([watchOS/Resources/Info.plist])
++				;;
++			visionOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=visionOS/Resources
++
++				AC_CONFIG_FILES([visionOS/Resources/Info.plist])
 +				;;
  			*)
  				AC_MSG_ERROR([Unknown platform for framework build])
  				;;
-@@ -678,6 +748,8 @@
+@@ -678,6 +779,9 @@
  	],[
  	case $ac_sys_system in
  		iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
 +		tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
 +		watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
++		visionOS) AC_MSG_ERROR([visionOS builds must use --enable-framework]) ;;
  		*)
  			PYTHONFRAMEWORK=
  			PYTHONFRAMEWORKDIR=no-framework
-@@ -730,8 +802,8 @@
+@@ -730,8 +834,8 @@
      case "$withval" in
      yes)
        case $ac_sys_system in
 -        Darwin|iOS)
 -          # iOS is able to share the macOS patch
-+        Darwin|iOS|tvOS|watchOS)
-+          # iOS/tvOS/watchOS is able to share the macOS patch
++        Darwin|iOS|tvOS|watchOS|visionOS)
++          # iOS/tvOS/watchOS/visionOS is able to share the macOS patch
            APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
            ;;
          *) AC_MSG_ERROR([no default app store compliance patch available for $ac_sys_system]) ;;
-@@ -745,8 +817,8 @@
+@@ -745,8 +849,8 @@
      esac
    ],[
      case $ac_sys_system in
 -      iOS)
 -        # Always apply the compliance patch on iOS; we can use the macOS patch
-+      iOS|tvOS|watchOS)
-+        # Always apply the compliance patch on iOS/tvOS/watchOS; we can use the macOS patch
++      iOS|tvOS|watchOS|visionOS)
++        # Always apply the compliance patch on iOS/tvOS/watchOS/visionOS; we can use the macOS patch
          APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
          AC_MSG_RESULT([applying default app store compliance patch])
          ;;
-@@ -794,6 +866,46 @@
+@@ -759,6 +863,8 @@
+ ])
+ AC_SUBST([APP_STORE_COMPLIANCE_PATCH])
+ 
++EXPORT_XROS_DEPLOYMENT_TARGET='#'
++
+ AC_SUBST([_PYTHON_HOST_PLATFORM])
+ if test "$cross_compiling" = yes; then
+ 	case "$host" in
+@@ -794,6 +900,70 @@
  				;;
  		esac
  		;;
@@ -973,44 +1499,75 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
 +				;;
 +		esac
++		;;
++	*-apple-xros*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# XROS_DEPLOYMENT_TARGET is the minimum supported visionOS version
++		AC_MSG_CHECKING([visionOS deployment target])
++		XROS_DEPLOYMENT_TARGET=${_host_os:8}
++		XROS_DEPLOYMENT_TARGET=${XROS_DEPLOYMENT_TARGET:=2.0}
++		AC_MSG_RESULT([$XROS_DEPLOYMENT_TARGET])
++		AC_MSG_CHECKING([exporting flag of visionOS deployment target])
++        	export XROS_DEPLOYMENT_TARGET
++		EXPORT_XROS_DEPLOYMENT_TARGET=''
++		AC_MSG_RESULT([$EXPORT_XROS_DEPLOYMENT_TARGET])
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-arm64-xr${_host_device}
++				;;
++			*)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-$host_cpu-xr${_host_device}
++				;;
++		esac
 +		;;
  	*-*-darwin*)
  		case "$host_cpu" in
  		arm*)
-@@ -883,9 +995,13 @@
+@@ -883,9 +1053,15 @@
      define_xopen_source=no;;
    Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
      define_xopen_source=no;;
 -  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
-+  # On iOS/tvOS/watchOS, defining _POSIX_C_SOURCE also disables platform specific features.
++  # On iOS/tvOS/watchOS/visionOS, defining _POSIX_C_SOURCE also disables platform specific features.
    iOS/*)
      define_xopen_source=no;;
 +  tvOS/*)
 +    define_xopen_source=no;;
 +  watchOS/*)
++    define_xopen_source=no;;
++  visionOS/*)
 +    define_xopen_source=no;;
    # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
    # defining NI_NUMERICHOST.
    QNX/6.3.2)
-@@ -944,8 +1060,11 @@
+@@ -944,8 +1120,14 @@
  CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
  EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
  
 -# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
 +# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
-+# WATCHOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++# WATCHOS_DEPLOYMENT_TARGET / XROS_DEPLOYMENT_TARGET enforced by the selected host triple.
  AC_SUBST([IPHONEOS_DEPLOYMENT_TARGET])
 +AC_SUBST([TVOS_DEPLOYMENT_TARGET])
 +AC_SUBST([WATCHOS_DEPLOYMENT_TARGET])
++AC_SUBST([XROS_DEPLOYMENT_TARGET])
++# XROS_DEPLOYMENT_TARGET should get exported
++AC_SUBST([EXPORT_XROS_DEPLOYMENT_TARGET])
  
  # checks for alternative programs
  
-@@ -979,11 +1098,17 @@
+@@ -979,11 +1161,19 @@
    ],
  )
  
 -dnl Add the compiler flag for the iOS minimum supported OS version.
-+dnl Add the compiler flag for the iOS/tvOS/watchOS minimum supported OS version.
++dnl Add the compiler flag for the iOS/tvOS/watchOS minimum supported OS
++dnl version. visionOS doesn't use an explicit -mxros-version-min option -
++dnl it encodes the min version into the target triple.
  AS_CASE([$ac_sys_system],
    [iOS], [
      AS_VAR_APPEND([CFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
@@ -1024,25 +1581,26 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
    ],
  )
  
-@@ -1172,6 +1297,8 @@
+@@ -1172,6 +1362,9 @@
  AS_CASE([$ac_sys_system],
    [Darwin*], [MULTIARCH=""],
    [iOS], [MULTIARCH=""],
 +  [tvOS], [MULTIARCH=""],
 +  [watchOS], [MULTIARCH=""],
++  [visionOS], [MULTIARCH=""],
    [FreeBSD*], [MULTIARCH=""],
    [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
  )
-@@ -1193,7 +1320,7 @@
+@@ -1193,7 +1386,7 @@
  dnl use a single "fat" binary at runtime. SOABI_PLATFORM is the component of
  dnl the PLATFORM_TRIPLET that will be used in binary module extensions.
  AS_CASE([$ac_sys_system],
 -  [iOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
-+  [iOS|tvOS|watchOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
++  [iOS|tvOS|watchOS|visionOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
    [SOABI_PLATFORM=$PLATFORM_TRIPLET]
  )
  
-@@ -1227,6 +1354,10 @@
+@@ -1227,6 +1420,12 @@
    [x86_64-*-freebsd*/clang],         [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
    [aarch64-apple-ios*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
    [aarch64-apple-ios*/clang],             [PY_SUPPORT_TIER=3], dnl iOS on ARM64
@@ -1050,64 +1608,66 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +  [aarch64-apple-tvos*/clang],            [PY_SUPPORT_TIER=3], dnl tvOS on ARM64
 +  [aarch64-apple-watchos*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl watchOS Simulator on arm64
 +  [arm64_32-apple-watchos*/clang],            [PY_SUPPORT_TIER=3], dnl watchOS on ARM64
++  [aarch64-apple-xros*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl visionOS Simulator on arm64
++  [aarch64-apple-xros*/clang],            [PY_SUPPORT_TIER=3],    dnl visionOS on ARM64
    [aarch64-*-linux-android/clang],   [PY_SUPPORT_TIER=3], dnl Android on ARM64
    [x86_64-*-linux-android/clang],    [PY_SUPPORT_TIER=3], dnl Android on AMD64
  
-@@ -1536,7 +1667,7 @@
+@@ -1536,7 +1735,7 @@
    case $ac_sys_system in
      Darwin)
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
 -    iOS)
-+    iOS|tvOS|watchOS)
++    iOS|tvOS|watchOS|visionOS)
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
      *)
        AC_MSG_ERROR([Unknown platform for framework build]);;
-@@ -1601,7 +1732,7 @@
+@@ -1601,7 +1800,7 @@
        BLDLIBRARY='-L. -lpython$(LDVERSION)'
        RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
        ;;
 -    iOS)
-+    iOS|tvOS|watchOS)
++    iOS|tvOS|watchOS|visionOS)
        LDLIBRARY='libpython$(LDVERSION).dylib'
        ;;
      AIX*)
-@@ -3456,7 +3587,7 @@
+@@ -3456,7 +3655,7 @@
  			BLDSHARED="$LDSHARED"
  		fi
  		;;
 -	iOS/*)
-+	iOS/*|tvOS/*|watchOS/*)
++	iOS/*|tvOS/*|watchOS/*|visionOS/*)
  		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		BLDSHARED="$LDSHARED"
-@@ -3580,7 +3711,7 @@
+@@ -3580,7 +3779,7 @@
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
  	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
  	# -u libsys_s pulls in all symbols in libsys
 -	Darwin/*|iOS/*)
-+	Darwin/*|iOS/*|tvOS/*|watchOS/*)
++	Darwin/*|iOS/*|tvOS/*|watchOS/*|visionOS/*)
  		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
  
  		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -3604,7 +3735,7 @@
+@@ -3604,7 +3803,7 @@
  				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			fi
  			LINKFORSHARED="$LINKFORSHARED"
 -		elif test $ac_sys_system = "iOS"; then
-+		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS"; then
++		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS" -o "$ac_sys_system" = "visionOS"; then
  			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
  		fi
  		;;
-@@ -4024,7 +4155,7 @@
+@@ -4024,7 +4223,7 @@
        dnl when do we need USING_APPLE_OS_LIBFFI?
        ctypes_malloc_closure=yes
      ],
 -    [iOS], [
-+    [iOS|tvOS|watchOS], [
++    [iOS|tvOS|watchOS|visionOS], [
        ctypes_malloc_closure=yes
      ],
      [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]
-@@ -5133,9 +5264,9 @@
+@@ -5133,9 +5332,9 @@
  # checks for library functions
  AC_CHECK_FUNCS([ \
    accept4 alarm bind_textdomain_codeset chmod chown clock closefrom close_range confstr \
@@ -1119,7 +1679,7 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
    gai_strerror getegid geteuid getgid getgrent getgrgid getgrgid_r \
    getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin \
    getpeername getpgid getpid getppid getpriority _getpty \
-@@ -5143,8 +5274,7 @@
+@@ -5143,8 +5342,7 @@
    getspnam getuid getwd grantpt if_nameindex initgroups kill killpg lchown linkat \
    lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
    mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
@@ -1128,8 +1688,8 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
 +  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt \
    pread preadv preadv2 process_vm_readv \
    pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \
-   pthread_kill pthread_getname_np pthread_setname_np pthread_getattr_np \
-@@ -5153,7 +5283,7 @@
+   pthread_kill pthread_get_name_np pthread_getname_np pthread_set_name_np
+@@ -5154,7 +5352,7 @@
    sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \
    sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \
    setitimer setlocale setpgid setpgrp setpriority setregid setresgid \
@@ -1138,18 +1698,18 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
    sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
    sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
    sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
-@@ -5168,12 +5298,20 @@
+@@ -5169,12 +5367,20 @@
    AC_CHECK_FUNCS([lchmod])
  fi
  
 -# iOS defines some system methods that can be linked (so they are
-+# iOS/tvOS/watchOS define some system methods that can be linked (so they are
++# iOS/tvOS/watchOS/visionOS define some system methods that can be linked (so they are
  # found by configure), but either raise a compilation error (because the
  # header definition prevents usage - autoconf doesn't use the headers), or
  # raise an error if used at runtime. Force these symbols off.
 -if test "$ac_sys_system" != "iOS" ; then
 -  AC_CHECK_FUNCS([getentropy getgroups system])
-+if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
++if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" -a "$ac_sys_system" != "visionOS" ; then
 +  AC_CHECK_FUNCS([ getentropy getgroups system ])
 +fi
 +
@@ -1162,7 +1722,7 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
  fi
  
  AC_CHECK_DECL([dirfd],
-@@ -5427,20 +5565,22 @@
+@@ -5428,20 +5634,22 @@
  ])
  
  # check for openpty, login_tty, and forkpty
@@ -1199,54 +1759,72 @@ index 8bb0f1c6ef4..bfd67de48bb 100644
  
  # check for long file support functions
  AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
-@@ -5479,10 +5619,10 @@
+@@ -5480,10 +5688,10 @@
      ])
  ])
  
 -# On Android and iOS, clock_settime can be linked (so it is found by
-+# On Android, iOS, tvOS and watchOS, clock_settime can be linked (so it is found by
++# On Android, iOS, tvOS, watchOS, and visionOS, clock_settime can be linked (so it is found by
  # configure), but when used in an unprivileged process, it crashes rather than
  # returning an error. Force the symbol off.
 -if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
-+if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS"
++if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" -a "$ac_sys_system" != "visionOS"
  then
    AC_CHECK_FUNCS([clock_settime], [], [
        AC_CHECK_LIB([rt], [clock_settime], [
-@@ -6233,8 +6373,8 @@
+@@ -5641,7 +5849,7 @@
+ [ac_cv_buggy_getaddrinfo=no],
+ [ac_cv_buggy_getaddrinfo=yes],
+ [
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS" || test "$ac_sys_system" = "tvOS" || test "$ac_sys_system" = "watchOS" || test "$ac_sys_system" = "visionOS"; then
+   ac_cv_buggy_getaddrinfo="no"
+ elif test "${enable_ipv6+set}" = set; then
+   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
+@@ -6234,8 +6442,8 @@
    LIBPYTHON="\$(BLDLIBRARY)"
  fi
  
 -# On iOS the shared libraries must be linked with the Python framework
 -if test "$ac_sys_system" = "iOS"; then
 +# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
-+if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "watchOS"; then
++if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "watchOS" -o $ac_sys_system = "visionOS"; then
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
  
-@@ -6893,7 +7033,7 @@
+@@ -6894,7 +7102,7 @@
  dnl NOTE: Inform user how to proceed with files when cross compiling.
  dnl Some cross-compile builds are predictable; they won't ever
  dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
 -if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
-+if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS" ; then
++if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS"  -o "$ac_sys_system" = "visionOS" ; then
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -7174,7 +7314,7 @@
+@@ -7195,7 +7403,7 @@
        AS_CASE([$ac_sys_system],
          [Emscripten], [with_ensurepip=no],
          [WASI], [with_ensurepip=no],
 -        [iOS], [with_ensurepip=no],
-+        [iOS|tvOS|watchOS], [with_ensurepip=no],
++        [iOS|tvOS|watchOS|visionOS], [with_ensurepip=no],
          [with_ensurepip=upgrade]
        )
      ])
-@@ -7585,7 +7725,7 @@
+@@ -7582,7 +7790,7 @@
+   SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
+   NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
+   Darwin) _PYTHREAD_NAME_MAXLEN=63;;
+-  iOS) _PYTHREAD_NAME_MAXLEN=63;;
++  iOS|tvOS|watchOS|visionOS) _PYTHREAD_NAME_MAXLEN=63;;
+   FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
+   OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
+   *) _PYTHREAD_NAME_MAXLEN=;;
+@@ -7607,7 +7815,7 @@
    [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
    dnl The _scproxy module is available on macOS
    [Darwin], [],
 -  [iOS], [
-+  [iOS|tvOS|watchOS], [
++  [iOS|tvOS|watchOS|visionOS], [
      dnl subprocess and multiprocessing are not supported (no fork syscall).
      dnl curses and tkinter user interface are not available.
      dnl gdbm and nis aren't available
@@ -1518,6 +2096,1624 @@ index c3e261ecd9e..26ef7a95de4 100644
 +#include "pyconfig-x86_64.h"
 +#endif
 --- /dev/null
++++ b/visionOS/Resources/Info.plist.in
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
++<plist version="0.9">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string>Python</string>
++	<key>CFBundleGetInfoString</key>
++	<string>Python Runtime and Library</string>
++	<key>CFBundleIdentifier</key>
++	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>Python</string>
++	<key>CFBundlePackageType</key>
++	<string>FMWK</string>
++	<key>CFBundleShortVersionString</key>
++	<string>%VERSION%</string>
++	<key>CFBundleLongVersionString</key>
++	<string>%VERSION%, (c) 2001-2023 Python Software Foundation.</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>%VERSION%</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>xrOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>@XROS_DEPLOYMENT_TARGET@</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/visionOS/Resources/bin/arm64-apple-xros-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/visionOS/Resources/bin/arm64-apple-xros-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/visionOS/Resources/bin/arm64-apple-xros-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang++ -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/visionOS/Resources/bin/arm64-apple-xros-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} -E "$@"
+--- /dev/null
++++ b/visionOS/Resources/bin/arm64-apple-xros-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/visionOS/Resources/bin/arm64-apple-xros-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/visionOS/Resources/bin/arm64-apple-xros-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang++ -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/visionOS/Resources/bin/arm64-apple-xros-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/visionOS/Resources/dylib-Info-template.plist
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string></string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>xrOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>2.0</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/visionOS/testbed/Python.xcframework/Info.plist
+@@ -0,0 +1,43 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>AvailableLibraries</key>
++	<array>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>xros-arm64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>xros</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>xros-arm64</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>xros</string>
++		</dict>
++	</array>
++	<key>CFBundlePackageType</key>
++	<string>XFWK</string>
++	<key>XCFrameworkFormatVersion</key>
++	<string>1.0</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/visionOS/testbed/__main__.py
+@@ -0,0 +1,512 @@
++import argparse
++import asyncio
++import fcntl
++import json
++import os
++import plistlib
++import re
++import shutil
++import subprocess
++import sys
++import tempfile
++from contextlib import asynccontextmanager
++from datetime import datetime
++from pathlib import Path
++
++
++DECODE_ARGS = ("UTF-8", "backslashreplace")
++
++# The system log prefixes each line:
++#   2025-01-17 16:14:29.090 Df visionOSTestbed[23987:1fd393b4] (Python) ...
++#   2025-01-17 16:14:29.090 E  visionOSTestbed[23987:1fd393b4] (Python) ...
++
++LOG_PREFIX_REGEX = re.compile(
++    r"^\d{4}-\d{2}-\d{2}"  # YYYY-MM-DD
++    r"\s+\d+:\d{2}:\d{2}\.\d+"  # HH:MM:SS.sss
++    r"\s+\w+"  # Df/E
++    r"\s+visionOSTestbed\[\d+:\w+\]"  # Process/thread ID
++    r"\s+\(Python\)\s"  # Logger name
++)
++
++
++# Work around a bug involving sys.exit and TaskGroups
++# (https://github.com/python/cpython/issues/101515).
++def exit(*args):
++    raise MySystemExit(*args)
++
++
++class MySystemExit(Exception):
++    pass
++
++
++class SimulatorLock:
++    # An fcntl-based filesystem lock that can be used to ensure that
++    def __init__(self, timeout):
++        self.filename = Path(tempfile.gettempdir()) / "python-visionos-testbed"
++        self.timeout = timeout
++
++        self.fd = None
++
++    async def acquire(self):
++        # Ensure the lockfile exists
++        self.filename.touch(exist_ok=True)
++
++        # Try `timeout` times to acquire the lock file, with a 1 second pause
++        # between each attempt. Report status every 10 seconds.
++        for i in range(0, self.timeout):
++            try:
++                fd = os.open(self.filename, os.O_RDWR | os.O_TRUNC, 0o644)
++                fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
++            except OSError:
++                os.close(fd)
++                if i % 10 == 0:
++                    print("... waiting", flush=True)
++                await asyncio.sleep(1)
++            else:
++                self.fd = fd
++                return
++
++        # If we reach the end of the loop, we've exceeded the allowed number of
++        # attempts.
++        raise ValueError("Unable to obtain lock on visionOS simulator creation")
++
++    def release(self):
++        # If a lock is held, release it.
++        if self.fd is not None:
++            # Release the lock.
++            fcntl.flock(self.fd, fcntl.LOCK_UN)
++            os.close(self.fd)
++            self.fd = None
++
++
++# All subprocesses are executed through this context manager so that no matter
++# what happens, they can always be cancelled from another task, and they will
++# always be cleaned up on exit.
++@asynccontextmanager
++async def async_process(*args, **kwargs):
++    process = await asyncio.create_subprocess_exec(*args, **kwargs)
++    try:
++        yield process
++    finally:
++        if process.returncode is None:
++            # Allow a reasonably long time for Xcode to clean itself up,
++            # because we don't want stale emulators left behind.
++            timeout = 10
++            process.terminate()
++            try:
++                await asyncio.wait_for(process.wait(), timeout)
++            except TimeoutError:
++                print(
++                    f"Command {args} did not terminate after {timeout} seconds "
++                    f" - sending SIGKILL"
++                )
++                process.kill()
++
++                # Even after killing the process we must still wait for it,
++                # otherwise we'll get the warning "Exception ignored in __del__".
++                await asyncio.wait_for(process.wait(), timeout=1)
++
++
++async def async_check_output(*args, **kwargs):
++    async with async_process(
++        *args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs
++    ) as process:
++        stdout, stderr = await process.communicate()
++        if process.returncode == 0:
++            return stdout.decode(*DECODE_ARGS)
++        else:
++            raise subprocess.CalledProcessError(
++                process.returncode,
++                args,
++                stdout.decode(*DECODE_ARGS),
++                stderr.decode(*DECODE_ARGS),
++            )
++
++
++# Return a list of UDIDs associated with booted simulators
++async def list_devices():
++    try:
++        # List the testing simulators, in JSON format
++        raw_json = await async_check_output(
++            "xcrun", "simctl", "--set", "testing", "list", "-j"
++        )
++        json_data = json.loads(raw_json)
++
++        # Filter out the booted visionOS simulators
++        return [
++            simulator["udid"]
++            for runtime, simulators in json_data["devices"].items()
++            for simulator in simulators
++            if runtime.split(".")[-1].startswith("xrOS") and simulator["state"] == "Booted"
++        ]
++    except subprocess.CalledProcessError as e:
++        # If there's no ~/Library/Developer/XCTestDevices folder (which is the
++        # case on fresh installs, and in some CI environments), `simctl list`
++        # returns error code 1, rather than an empty list. Handle that case,
++        # but raise all other errors.
++        if e.returncode == 1:
++            return []
++        else:
++            raise
++
++
++async def find_device(initial_devices, lock):
++    while True:
++        new_devices = set(await list_devices()).difference(initial_devices)
++        if len(new_devices) == 0:
++            await asyncio.sleep(1)
++        elif len(new_devices) == 1:
++            udid = new_devices.pop()
++            print(f"{datetime.now():%Y-%m-%d %H:%M:%S}: New test simulator detected")
++            print(f"UDID: {udid}", flush=True)
++            lock.release()
++            return udid
++        else:
++            exit(f"Found more than one new device: {new_devices}")
++
++
++async def log_stream_task(initial_devices, lock):
++    # Wait up to 5 minutes for the build to complete and the simulator to boot.
++    udid = await asyncio.wait_for(find_device(initial_devices, lock), 5 * 60)
++
++    # Stream the visionOS device's logs, filtering out messages that come from the
++    # XCTest test suite (catching NSLog messages from the test method), or
++    # Python itself (catching stdout/stderr content routed to the system log
++    # with config->use_system_logger).
++    args = [
++        "xcrun",
++        "simctl",
++        "--set",
++        "testing",
++        "spawn",
++        udid,
++        "log",
++        "stream",
++        "--style",
++        "compact",
++        "--predicate",
++        (
++            'senderImagePath ENDSWITH "/visionOSTestbedTests.xctest/visionOSTestbedTests"'
++            ' OR senderImagePath ENDSWITH "/Python.framework/Python"'
++        ),
++    ]
++
++    async with async_process(
++        *args,
++        stdout=subprocess.PIPE,
++        stderr=subprocess.STDOUT,
++    ) as process:
++        suppress_dupes = False
++        while line := (await process.stdout.readline()).decode(*DECODE_ARGS):
++            # Strip the prefix from each log line
++            line = LOG_PREFIX_REGEX.sub("", line)
++            # The visionOS log streamer can sometimes lag; when it does, it outputs
++            # a warning about messages being dropped... often multiple times.
++            # Only print the first of these duplicated warnings.
++            if line.startswith("=== Messages dropped "):
++                if not suppress_dupes:
++                    suppress_dupes = True
++                    sys.stdout.write(line)
++            else:
++                suppress_dupes = False
++                sys.stdout.write(line)
++            sys.stdout.flush()
++
++
++async def xcode_test(location, simulator, verbose):
++    # Run the test suite on the named simulator
++    print("Starting xcodebuild...", flush=True)
++    args = [
++        "xcodebuild",
++        "test",
++        "-project",
++        str(location / "visionOSTestbed.xcodeproj"),
++        "-scheme",
++        "visionOSTestbed",
++        "-destination",
++        f"platform=visionOS Simulator,name={simulator}",
++        "-resultBundlePath",
++        str(location / f"{datetime.now():%Y%m%d-%H%M%S}.xcresult"),
++        "-derivedDataPath",
++        str(location / "DerivedData"),
++    ]
++    if not verbose:
++        args += ["-quiet"]
++
++    async with async_process(
++        *args,
++        stdout=subprocess.PIPE,
++        stderr=subprocess.STDOUT,
++    ) as process:
++        while line := (await process.stdout.readline()).decode(*DECODE_ARGS):
++            sys.stdout.write(line)
++            sys.stdout.flush()
++
++        status = await asyncio.wait_for(process.wait(), timeout=1)
++        exit(status)
++
++
++def clone_testbed(
++    source: Path,
++    target: Path,
++    framework: Path,
++    apps: list[Path],
++) -> None:
++    if target.exists():
++        print(f"{target} already exists; aborting without creating project.")
++        sys.exit(10)
++
++    if framework is None:
++        if not (
++            source / "Python.xcframework/xros-arm64-simulator/bin"
++        ).is_dir():
++            print(
++                f"The testbed being cloned ({source}) does not contain "
++                f"a simulator framework. Re-run with --framework"
++            )
++            sys.exit(11)
++    else:
++        if not framework.is_dir():
++            print(f"{framework} does not exist.")
++            sys.exit(12)
++        elif not (
++            framework.suffix == ".xcframework"
++            or (framework / "Python.framework").is_dir()
++        ):
++            print(
++                f"{framework} is not an XCframework, "
++                f"or a simulator slice of a framework build."
++            )
++            sys.exit(13)
++
++    print("Cloning testbed project:")
++    print(f"  Cloning {source}...", end="", flush=True)
++    shutil.copytree(source, target, symlinks=True)
++    print(" done")
++
++    xc_framework_path = target / "Python.xcframework"
++    sim_framework_path = xc_framework_path / "xros-arm64-simulator"
++    if framework is not None:
++        if framework.suffix == ".xcframework":
++            print("  Installing XCFramework...", end="", flush=True)
++            if xc_framework_path.is_dir():
++                shutil.rmtree(xc_framework_path)
++            else:
++                xc_framework_path.unlink(missing_ok=True)
++            xc_framework_path.symlink_to(
++                framework.relative_to(xc_framework_path.parent, walk_up=True)
++            )
++            print(" done")
++        else:
++            print("  Installing simulator framework...", end="", flush=True)
++            if sim_framework_path.is_dir():
++                shutil.rmtree(sim_framework_path)
++            else:
++                sim_framework_path.unlink(missing_ok=True)
++            sim_framework_path.symlink_to(
++                framework.relative_to(sim_framework_path.parent, walk_up=True)
++            )
++            print(" done")
++    else:
++        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 visionOS framework.")
++
++    for app_src in apps:
++        print(f"  Installing app {app_src.name!r}...", end="", flush=True)
++        app_target = target / f"visionOSTestbed/app/{app_src.name}"
++        if app_target.is_dir():
++            shutil.rmtree(app_target)
++        shutil.copytree(app_src, app_target)
++        print(" done")
++
++    print(f"Successfully cloned testbed: {target.resolve()}")
++
++
++def update_plist(testbed_path, args):
++    # Add the test runner arguments to the testbed's Info.plist file.
++    info_plist = testbed_path / "visionOSTestbed" / "visionOSTestbed-Info.plist"
++    with info_plist.open("rb") as f:
++        info = plistlib.load(f)
++
++    info["TestArgs"] = args
++
++    with info_plist.open("wb") as f:
++        plistlib.dump(info, f)
++
++
++async def run_testbed(simulator: str, args: list[str], verbose: bool=False):
++    location = Path(__file__).parent
++    print("Updating plist...", end="", flush=True)
++    update_plist(location, args)
++    print(" done.", flush=True)
++
++    # We need to get an exclusive lock on simulator creation, to avoid issues
++    # with multiple simulators starting and being unable to tell which
++    # simulator is due to which testbed instance. See
++    # https://github.com/python/cpython/issues/130294 for details. Wait up to
++    # 10 minutes for a simulator to boot.
++    print("Obtaining lock on simulator creation...", flush=True)
++    simulator_lock = SimulatorLock(timeout=10*60)
++    await simulator_lock.acquire()
++    print("Simulator lock acquired.", flush=True)
++
++    # Get the list of devices that are booted at the start of the test run.
++    # The simulator started by the test suite will be detected as the new
++    # entry that appears on the device list.
++    initial_devices = await list_devices()
++
++    try:
++        async with asyncio.TaskGroup() as tg:
++            tg.create_task(log_stream_task(initial_devices, simulator_lock))
++            tg.create_task(xcode_test(location, simulator=simulator, verbose=verbose))
++    except* MySystemExit as e:
++        raise SystemExit(*e.exceptions[0].args) from None
++    except* subprocess.CalledProcessError as e:
++        # Extract it from the ExceptionGroup so it can be handled by `main`.
++        raise e.exceptions[0]
++    finally:
++        simulator_lock.release()
++
++
++def main():
++    parser = argparse.ArgumentParser(
++        description=(
++            "Manages the process of testing a Python project in the visionOS simulator."
++        ),
++    )
++
++    subcommands = parser.add_subparsers(dest="subcommand")
++
++    clone = subcommands.add_parser(
++        "clone",
++        description=(
++            "Clone the testbed project, copying in an visionOS Python framework and"
++            "any specified application code."
++        ),
++        help="Clone a testbed project to a new location.",
++    )
++    clone.add_argument(
++        "--framework",
++        help=(
++            "The location of the XCFramework (or simulator-only slice of an "
++            "XCFramework) to use when running the testbed"
++        ),
++    )
++    clone.add_argument(
++        "--app",
++        dest="apps",
++        action="append",
++        default=[],
++        help="The location of any code to include in the testbed project",
++    )
++    clone.add_argument(
++        "location",
++        help="The path where the testbed will be cloned.",
++    )
++
++    run = subcommands.add_parser(
++        "run",
++        usage="%(prog)s [-h] [--simulator SIMULATOR] -- <test arg> [<test arg> ...]",
++        description=(
++            "Run a testbed project. The arguments provided after `--` will be "
++            "passed to the running visionOS process as if they were arguments to "
++            "`python -m`."
++        ),
++        help="Run a testbed project",
++    )
++    run.add_argument(
++        "--simulator",
++        default="Apple Vision Pro",
++        help="The name of the simulator to use (default: 'Apple Vision Pro')",
++    )
++    run.add_argument(
++        "-v", "--verbose",
++        action="store_true",
++        help="Enable verbose output",
++    )
++
++    try:
++        pos = sys.argv.index("--")
++        testbed_args = sys.argv[1:pos]
++        test_args = sys.argv[pos + 1 :]
++    except ValueError:
++        testbed_args = sys.argv[1:]
++        test_args = []
++
++    context = parser.parse_args(testbed_args)
++
++    if context.subcommand == "clone":
++        clone_testbed(
++            source=Path(__file__).parent.resolve(),
++            target=Path(context.location).resolve(),
++            framework=Path(context.framework).resolve() if context.framework else None,
++            apps=[Path(app) for app in context.apps],
++        )
++    elif context.subcommand == "run":
++        if test_args:
++            if not (
++                Path(__file__).parent / "Python.xcframework/xros-arm64-simulator/bin"
++            ).is_dir():
++                print(
++                    f"Testbed does not contain a compiled visionOS framework. Use "
++                    f"`python {sys.argv[0]} clone ...` to create a runnable "
++                    f"clone of this testbed."
++                )
++                sys.exit(20)
++
++            asyncio.run(
++                run_testbed(
++                    simulator=context.simulator,
++                    verbose=context.verbose,
++                    args=test_args,
++                )
++            )
++        else:
++            print(f"Must specify test arguments (e.g., {sys.argv[0]} run -- test)")
++            print()
++            parser.print_help(sys.stderr)
++            sys.exit(21)
++    else:
++        parser.print_help(sys.stderr)
++        sys.exit(1)
++
++
++if __name__ == "__main__":
++    main()
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed.xcodeproj/project.pbxproj
+@@ -0,0 +1,581 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 56;
++	objects = {
++
++/* Begin PBXBuildFile section */
++		607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66162B0EFA380010BFC8 /* AppDelegate.m */; };
++		607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607A66212B0EFA390010BFC8 /* Assets.xcassets */; };
++		607A66282B0EFA390010BFC8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66272B0EFA390010BFC8 /* main.m */; };
++		607A66322B0EFA3A0010BFC8 /* visionOSTestbedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66312B0EFA3A0010BFC8 /* visionOSTestbedTests.m */; };
++		607A66582B0F079F0010BFC8 /* dylib-Info-template.plist in Resources */ = {isa = PBXBuildFile; fileRef = 607A66572B0F079F0010BFC8 /* dylib-Info-template.plist */; };
++		608619542CB77BA900F46182 /* app_packages in Resources */ = {isa = PBXBuildFile; fileRef = 608619532CB77BA900F46182 /* app_packages */; };
++		608619562CB7819B00F46182 /* app in Resources */ = {isa = PBXBuildFile; fileRef = 608619552CB7819B00F46182 /* app */; };
++		EEB367CE2DADF5C900B9A1D7 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		EEB367CF2DADF5D300B9A1D7 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		EEE9C80D2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; };
++		EEE9C80E2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; };
++/* End PBXBuildFile section */
++
++/* Begin PBXContainerItemProxy section */
++		607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = 607A660A2B0EFA380010BFC8 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = 607A66112B0EFA380010BFC8;
++			remoteInfo = iOSTestbed;
++		};
++/* End PBXContainerItemProxy section */
++
++/* Begin PBXCopyFilesBuildPhase section */
++		607A664E2B0EFC080010BFC8 /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				EEB367CF2DADF5D300B9A1D7 /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A66522B0EFFE00010BFC8 /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				EEB367CE2DADF5C900B9A1D7 /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXCopyFilesBuildPhase section */
++
++/* Begin PBXFileReference section */
++		607A66122B0EFA380010BFC8 /* visionOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = visionOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66152B0EFA380010BFC8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
++		607A66162B0EFA380010BFC8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
++		607A66212B0EFA390010BFC8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
++		607A66272B0EFA390010BFC8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
++		607A662D2B0EFA3A0010BFC8 /* visionOSTestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = visionOSTestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66312B0EFA3A0010BFC8 /* visionOSTestbedTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = visionOSTestbedTests.m; sourceTree = "<group>"; };
++		607A66572B0F079F0010BFC8 /* dylib-Info-template.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "dylib-Info-template.plist"; sourceTree = "<group>"; };
++		607A66592B0F08600010BFC8 /* visionOSTestbed-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "visionOSTestbed-Info.plist"; sourceTree = "<group>"; };
++		608619532CB77BA900F46182 /* app_packages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app_packages; sourceTree = "<group>"; };
++		608619552CB7819B00F46182 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app; sourceTree = "<group>"; };
++		EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
++/* End PBXFileReference section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		607A660F2B0EFA380010BFC8 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EEE9C80D2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A662A2B0EFA3A0010BFC8 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EEE9C80E2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		607A66092B0EFA380010BFC8 = {
++			isa = PBXGroup;
++			children = (
++				EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */,
++				607A66142B0EFA380010BFC8 /* visionOSTestbed */,
++				607A66302B0EFA3A0010BFC8 /* visionOSTestbedTests */,
++				607A66132B0EFA380010BFC8 /* Products */,
++				607A664F2B0EFFE00010BFC8 /* Frameworks */,
++			);
++			sourceTree = "<group>";
++		};
++		607A66132B0EFA380010BFC8 /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				607A66122B0EFA380010BFC8 /* visionOSTestbed.app */,
++				607A662D2B0EFA3A0010BFC8 /* visionOSTestbedTests.xctest */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		607A66142B0EFA380010BFC8 /* visionOSTestbed */ = {
++			isa = PBXGroup;
++			children = (
++				608619552CB7819B00F46182 /* app */,
++				608619532CB77BA900F46182 /* app_packages */,
++				607A66592B0F08600010BFC8 /* visionOSTestbed-Info.plist */,
++				607A66572B0F079F0010BFC8 /* dylib-Info-template.plist */,
++				607A66152B0EFA380010BFC8 /* AppDelegate.h */,
++				607A66162B0EFA380010BFC8 /* AppDelegate.m */,
++				607A66212B0EFA390010BFC8 /* Assets.xcassets */,
++				607A66272B0EFA390010BFC8 /* main.m */,
++			);
++			path = visionOSTestbed;
++			sourceTree = "<group>";
++		};
++		607A66302B0EFA3A0010BFC8 /* visionOSTestbedTests */ = {
++			isa = PBXGroup;
++			children = (
++				607A66312B0EFA3A0010BFC8 /* visionOSTestbedTests.m */,
++			);
++			path = visionOSTestbedTests;
++			sourceTree = "<group>";
++		};
++		607A664F2B0EFFE00010BFC8 /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		607A66112B0EFA380010BFC8 /* visionOSTestbed */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbed" */;
++			buildPhases = (
++				607A660E2B0EFA380010BFC8 /* Sources */,
++				607A660F2B0EFA380010BFC8 /* Frameworks */,
++				607A66102B0EFA380010BFC8 /* Resources */,
++				607A66552B0F061D0010BFC8 /* Install Target Specific Python Standard Library */,
++				607A66562B0F06200010BFC8 /* Prepare Python Binary Modules */,
++				607A664E2B0EFC080010BFC8 /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = visionOSTestbed;
++			productName = iOSTestbed;
++			productReference = 607A66122B0EFA380010BFC8 /* visionOSTestbed.app */;
++			productType = "com.apple.product-type.application";
++		};
++		607A662C2B0EFA3A0010BFC8 /* visionOSTestbedTests */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbedTests" */;
++			buildPhases = (
++				607A66292B0EFA3A0010BFC8 /* Sources */,
++				607A662A2B0EFA3A0010BFC8 /* Frameworks */,
++				607A662B2B0EFA3A0010BFC8 /* Resources */,
++				607A66522B0EFFE00010BFC8 /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++				607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */,
++			);
++			name = visionOSTestbedTests;
++			productName = iOSTestbedTests;
++			productReference = 607A662D2B0EFA3A0010BFC8 /* visionOSTestbedTests.xctest */;
++			productType = "com.apple.product-type.bundle.unit-test";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		607A660A2B0EFA380010BFC8 /* Project object */ = {
++			isa = PBXProject;
++			attributes = {
++				BuildIndependentTargetsInParallel = 1;
++				LastUpgradeCheck = 1500;
++				TargetAttributes = {
++					607A66112B0EFA380010BFC8 = {
++						CreatedOnToolsVersion = 15.0.1;
++					};
++					607A662C2B0EFA3A0010BFC8 = {
++						CreatedOnToolsVersion = 15.0.1;
++						TestTargetID = 607A66112B0EFA380010BFC8;
++					};
++				};
++			};
++			buildConfigurationList = 607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "visionOSTestbed" */;
++			compatibilityVersion = "Xcode 14.0";
++			developmentRegion = en;
++			hasScannedForEncodings = 0;
++			knownRegions = (
++				en,
++				Base,
++			);
++			mainGroup = 607A66092B0EFA380010BFC8;
++			productRefGroup = 607A66132B0EFA380010BFC8 /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				607A66112B0EFA380010BFC8 /* visionOSTestbed */,
++				607A662C2B0EFA3A0010BFC8 /* visionOSTestbedTests */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		607A66102B0EFA380010BFC8 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66582B0F079F0010BFC8 /* dylib-Info-template.plist in Resources */,
++				608619562CB7819B00F46182 /* app in Resources */,
++				607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */,
++				608619542CB77BA900F46182 /* app_packages in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A662B2B0EFA3A0010BFC8 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXShellScriptBuildPhase section */
++		607A66552B0F061D0010BFC8 /* Install Target Specific Python Standard Library */ = {
++			isa = PBXShellScriptBuildPhase;
++			alwaysOutOfDate = 1;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputFileListPaths = (
++			);
++			inputPaths = (
++			);
++			name = "Install Target Specific Python Standard Library";
++			outputFileListPaths = (
++			);
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "set -e\n\nmkdir -p \"$CODESIGNING_FOLDER_PATH/python/lib\"\nif [ \"$EFFECTIVE_PLATFORM_NAME\" = \"-xrsimulator\" ]; then\n    echo \"Installing Python modules for xrOS Simulator\"\n    rsync -au --delete \"$PROJECT_DIR/Python.xcframework/xros-arm64-simulator/lib/\" \"$CODESIGNING_FOLDER_PATH/python/lib/\" \nelse\n    echo \"Installing Python modules for xrOS Device\"\n    rsync -au --delete \"$PROJECT_DIR/Python.xcframework/xros-arm64/lib/\" \"$CODESIGNING_FOLDER_PATH/python/lib/\" \nfi\n";
++			showEnvVarsInLog = 0;
++		};
++		607A66562B0F06200010BFC8 /* Prepare Python Binary Modules */ = {
++			isa = PBXShellScriptBuildPhase;
++			alwaysOutOfDate = 1;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputFileListPaths = (
++			);
++			inputPaths = (
++			);
++			name = "Prepare Python Binary Modules";
++			outputFileListPaths = (
++			);
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "set -e\n\ninstall_dylib () {\n    INSTALL_BASE=$1\n    FULL_EXT=$2\n\n    # The name of the extension file\n    EXT=$(basename \"$FULL_EXT\")\n    # The location of the extension file, relative to the bundle\n    RELATIVE_EXT=${FULL_EXT#$CODESIGNING_FOLDER_PATH/} \n    # The path to the extension file, relative to the install base\n    PYTHON_EXT=${RELATIVE_EXT/$INSTALL_BASE/}\n    # The full dotted name of the extension module, constructed from the file path.\n    FULL_MODULE_NAME=$(echo $PYTHON_EXT | cut -d \".\" -f 1 | tr \"/\" \".\"); \n    # A bundle identifier; not actually used, but required by Xcode framework packaging\n    FRAMEWORK_BUNDLE_ID=$(echo $PRODUCT_BUNDLE_IDENTIFIER.$FULL_MODULE_NAME | tr \"_\" \"-\")\n    # The name of the framework folder.\n    FRAMEWORK_FOLDER=\"Frameworks/$FULL_MODULE_NAME.framework\"\n\n    # If the framework folder doesn't exist, create it.\n    if [ ! -d \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER\" ]; then\n        echo \"Creating framework for $RELATIVE_EXT\" \n        mkdir -p \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER\"\n        cp \"$CODESIGNING_FOLDER_PATH/dylib-Info-template.plist\" \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist\"\n        plutil -replace CFBundleExecutable -string \"$FULL_MODULE_NAME\" \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist\"\n        plutil -replace CFBundleIdentifier -string \"$FRAMEWORK_BUNDLE_ID\" \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist\"\n    fi\n    \n    echo \"Installing binary for $FRAMEWORK_FOLDER/$FULL_MODULE_NAME\" \n    mv \"$FULL_EXT\" \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME\"\n    # Create a placeholder .fwork file where the .so was\n    echo \"$FRAMEWORK_FOLDER/$FULL_MODULE_NAME\" > ${FULL_EXT%.so}.fwork\n    # Create a back reference to the .so file location in the framework\n    echo \"${RELATIVE_EXT%.so}.fwork\" > \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME.origin\"             \n}\n\nPYTHON_VER=$(ls -1 \"$CODESIGNING_FOLDER_PATH/python/lib\")\necho \"Install Python $PYTHON_VER standard library extension modules...\"\nfind \"$CODESIGNING_FOLDER_PATH/python/lib/$PYTHON_VER/lib-dynload\" -name \"*.so\" | while read FULL_EXT; do\n    install_dylib python/lib/$PYTHON_VER/lib-dynload/ \"$FULL_EXT\"\ndone\necho \"Install app package extension modules...\"\nfind \"$CODESIGNING_FOLDER_PATH/app_packages\" -name \"*.so\" | while read FULL_EXT; do\n    install_dylib app_packages/ \"$FULL_EXT\"\ndone\necho \"Install app extension modules...\"\nfind \"$CODESIGNING_FOLDER_PATH/app\" -name \"*.so\" | while read FULL_EXT; do\n    install_dylib app/ \"$FULL_EXT\"\ndone\n\n# Clean up dylib template \nrm -f \"$CODESIGNING_FOLDER_PATH/dylib-Info-template.plist\"\necho \"Signing frameworks as $EXPANDED_CODE_SIGN_IDENTITY_NAME ($EXPANDED_CODE_SIGN_IDENTITY)...\"\nfind \"$CODESIGNING_FOLDER_PATH/Frameworks\" -name \"*.framework\" -exec /usr/bin/codesign --force --sign \"$EXPANDED_CODE_SIGN_IDENTITY\" ${OTHER_CODE_SIGN_FLAGS:-} -o runtime --timestamp=none --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der \"{}\" \\; \n";
++			showEnvVarsInLog = 0;
++		};
++/* End PBXShellScriptBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		607A660E2B0EFA380010BFC8 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */,
++				607A66282B0EFA390010BFC8 /* main.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A66292B0EFA3A0010BFC8 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66322B0EFA3A0010BFC8 /* visionOSTestbedTests.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin PBXTargetDependency section */
++		607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = 607A66112B0EFA380010BFC8 /* visionOSTestbed */;
++			targetProxy = 607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */;
++		};
++/* End PBXTargetDependency section */
++
++/* Begin XCBuildConfiguration section */
++		607A663F2B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = dwarf;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = YES;
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = (
++					"DEBUG=1",
++					"$(inherited)",
++				);
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
++				MTL_FAST_MATH = YES;
++				ONLY_ACTIVE_ARCH = YES;
++				SDKROOT = xros;
++			};
++			name = Debug;
++		};
++		607A66402B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				ENABLE_NS_ASSERTIONS = NO;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = YES;
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = NO;
++				MTL_FAST_MATH = YES;
++				SDKROOT = xros;
++				VALIDATE_PRODUCT = YES;
++			};
++			name = Release;
++		};
++		607A66422B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = "";
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				INFOPLIST_FILE = "visionOSTestbed/visionOSTestbed-Info.plist";
++				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 3.13.0a1;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 7;
++				XROS_DEPLOYMENT_TARGET = 2.0;
++			};
++			name = Debug;
++		};
++		607A66432B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = "";
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				INFOPLIST_FILE = "visionOSTestbed/visionOSTestbed-Info.plist";
++				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 3.13.0a1;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 7;
++				XROS_DEPLOYMENT_TARGET = 2.0;
++			};
++			name = Release;
++		};
++		607A66452B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = 3HEZE76D99;
++				GENERATE_INFOPLIST_FILE = YES;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 7;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestbed";
++			};
++			name = Debug;
++		};
++		607A66462B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = 3HEZE76D99;
++				GENERATE_INFOPLIST_FILE = YES;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 7;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestbed";
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "visionOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A663F2B0EFA3A0010BFC8 /* Debug */,
++				607A66402B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A66422B0EFA3A0010BFC8 /* Debug */,
++				607A66432B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbedTests" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A66452B0EFA3A0010BFC8 /* Debug */,
++				607A66462B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = 607A660A2B0EFA380010BFC8 /* Project object */;
++}
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/AppDelegate.h
+@@ -0,0 +1,11 @@
++//
++//  AppDelegate.h
++//  visionOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++
++@interface AppDelegate : UIResponder <UIApplicationDelegate>
++
++
++@end
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/AppDelegate.m
+@@ -0,0 +1,19 @@
++//
++//  AppDelegate.m
++//  visionOSTestbed
++//
++
++#import "AppDelegate.h"
++
++@interface AppDelegate ()
++
++@end
++
++@implementation AppDelegate
++
++
++- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
++    return YES;
++}
++
++@end
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/Assets.xcassets/AccentColor.colorset/Contents.json
+@@ -0,0 +1,11 @@
++{
++  "colors" : [
++    {
++      "idiom" : "universal"
++    }
++  ],
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/Assets.xcassets/AppIcon.appiconset/Contents.json
+@@ -0,0 +1,13 @@
++{
++  "images" : [
++    {
++      "idiom" : "universal",
++      "platform" : "ios",
++      "size" : "1024x1024"
++    }
++  ],
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/Assets.xcassets/Contents.json
+@@ -0,0 +1,6 @@
++{
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/app/README
+@@ -0,0 +1,7 @@
++This folder can contain any Python application code.
++
++During the build, any binary modules found in this folder will be processed into
++iOS Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH, and will be the
++working directory for the test suite.
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/app_packages/README
+@@ -0,0 +1,7 @@
++This folder can be a target for installing any Python dependencies needed by the
++test suite.
++
++During the build, any binary modules found in this folder will be processed into
++iOS Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH.
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/dylib-Info-template.plist
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string></string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>VisionOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>12.0</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/main.m
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  visionOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++#import "AppDelegate.h"
++
++int main(int argc, char * argv[]) {
++    NSString * appDelegateClassName;
++    @autoreleasepool {
++        appDelegateClassName = NSStringFromClass([AppDelegate class]);
++
++        return UIApplicationMain(argc, argv, nil, appDelegateClassName);
++    }
++}
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbed/visionOSTestbed-Info.plist
+@@ -0,0 +1,56 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIdentifier</key>
++	<string>org.python.visionOSTestbed</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++	<key>TestArgs</key>
++	<array>
++		<string>test</string>
++		<string>-uall</string>
++		<string>--single-process</string>
++		<string>--rerun</string>
++		<string>-W</string>
++	</array>
++	<key>UIApplicationSceneManifest</key>
++	<dict>
++		<key>UIApplicationSupportsMultipleScenes</key>
++		<false/>
++		<key>UISceneConfigurations</key>
++		<dict/>
++	</dict>
++	<key>UIRequiresFullScreen</key>
++	<true/>
++	<key>UISupportedInterfaceOrientations</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++	<key>UISupportedInterfaceOrientations~ipad</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationPortraitUpsideDown</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++</dict>
++</plist>
+--- /dev/null
++++ b/visionOS/testbed/visionOSTestbedTests/visionOSTestbedTests.m
+@@ -0,0 +1,162 @@
++#import <XCTest/XCTest.h>
++#import <Python/Python.h>
++
++@interface visionOSTestbedTests : XCTestCase
++
++@end
++
++@implementation visionOSTestbedTests
++
++
++- (void)testPython {
++    const char **argv;
++    int exit_code;
++    int failed;
++    PyStatus status;
++    PyPreConfig preconfig;
++    PyConfig config;
++    PyObject *sys_module;
++    PyObject *sys_path_attr;
++    NSArray *test_args;
++    NSString *python_home;
++    NSString *path;
++    wchar_t *wtmp_str;
++
++    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
++
++    // Set some other common environment indicators to disable color, as the
++    // Xcode log can't display color. Stdout will report that it is *not* a
++    // TTY.
++    setenv("NO_COLOR", "1", true);
++    setenv("PYTHON_COLORS", "0", true);
++
++    // Arguments to pass into the test suite runner.
++    // argv[0] must identify the process; any subsequent arg
++    // will be handled as if it were an argument to `python -m test`
++    test_args = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"TestArgs"];
++    if (test_args == NULL) {
++        NSLog(@"Unable to identify test arguments.");
++    }
++    argv = malloc(sizeof(char *) * ([test_args count] + 1));
++    argv[0] = "visionOSTestbed";
++    for (int i = 1; i < [test_args count]; i++) {
++        argv[i] = [[test_args objectAtIndex:i] UTF8String];
++    }
++    NSLog(@"Test command: %@", test_args);
++
++    // Generate an isolated Python configuration.
++    NSLog(@"Configuring isolated Python...");
++    PyPreConfig_InitIsolatedConfig(&preconfig);
++    PyConfig_InitIsolatedConfig(&config);
++
++    // Configure the Python interpreter:
++    // Enforce UTF-8 encoding for stderr, stdout, file-system encoding and locale.
++    // See https://docs.python.org/3/library/os.html#python-utf-8-mode.
++    preconfig.utf8_mode = 1;
++    // Use the system logger for stdout/err
++    config.use_system_logger = 1;
++    // Don't buffer stdio. We want output to appears in the log immediately
++    config.buffered_stdio = 0;
++    // Don't write bytecode; we can't modify the app bundle
++    // after it has been signed.
++    config.write_bytecode = 0;
++    // Ensure that signal handlers are installed
++    config.install_signal_handlers = 1;
++    // Run the test module.
++    config.run_module = Py_DecodeLocale([[test_args objectAtIndex:0] UTF8String], NULL);
++    // For debugging - enable verbose mode.
++    // config.verbose = 1;
++
++    NSLog(@"Pre-initializing Python runtime...");
++    status = Py_PreInitialize(&preconfig);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to pre-initialize Python interpreter: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    // Set the home for the Python interpreter
++    python_home = [NSString stringWithFormat:@"%@/python", resourcePath, nil];
++    NSLog(@"PythonHome: %@", python_home);
++    wtmp_str = Py_DecodeLocale([python_home UTF8String], NULL);
++    status = PyConfig_SetString(&config, &config.home, wtmp_str);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to set PYTHONHOME: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
++
++    // Read the site config
++    status = PyConfig_Read(&config);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to read site config: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    NSLog(@"Configure argc/argv...");
++    status = PyConfig_SetBytesArgv(&config, [test_args count], (char**) argv);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to configure argc/argv: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    NSLog(@"Initializing Python runtime...");
++    status = Py_InitializeFromConfig(&config);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to initialize Python interpreter: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    sys_module = PyImport_ImportModule("sys");
++    if (sys_module == NULL) {
++        XCTFail(@"Could not import sys module");
++        return;
++    }
++
++    sys_path_attr = PyObject_GetAttrString(sys_module, "path");
++    if (sys_path_attr == NULL) {
++        XCTFail(@"Could not access sys.path");
++        return;
++    }
++
++    // Add the app packages path
++    path = [NSString stringWithFormat:@"%@/app_packages", resourcePath, nil];
++    NSLog(@"App packages path: %@", path);
++    wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
++    failed = PyList_Insert(sys_path_attr, 0, PyUnicode_FromString([path UTF8String]));
++    if (failed) {
++        XCTFail(@"Unable to add app packages to sys.path");
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
++
++    path = [NSString stringWithFormat:@"%@/app", resourcePath, nil];
++    NSLog(@"App path: %@", path);
++    wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
++    failed = PyList_Insert(sys_path_attr, 0, PyUnicode_FromString([path UTF8String]));
++    if (failed) {
++        XCTFail(@"Unable to add app to sys.path");
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
++
++    // Ensure the working directory is the app folder.
++    chdir([path UTF8String]);
++
++    // Start the test suite. Print a separator to differentiate Python startup logs from app logs
++    NSLog(@"---------------------------------------------------------------------------");
++
++    exit_code = Py_RunMain();
++    XCTAssertEqual(exit_code, 0, @"Test suite did not pass");
++
++    NSLog(@"---------------------------------------------------------------------------");
++
++    Py_Finalize();
++}
++
++
++@end
+--- /dev/null
 +++ b/watchOS/README.rst
 @@ -0,0 +1,108 @@
 +========================
diff --git a/patch/Python/release.visionOS.exclude b/patch/Python/release.visionOS.exclude
new file mode 100644
index 00000000..f1d0f75e
--- /dev/null
+++ b/patch/Python/release.visionOS.exclude
@@ -0,0 +1,6 @@
+# This is a list of support package path patterns that we exclude
+# from all Python-Apple-support tarballs.
+# It is used by `tar -X` during the Makefile build.
+# Remove pyc files. These take up space, but since most stdlib modules are
+# never imported by user code, they mostly have no value.
+*/__pycache__

From f8fd68641122bd637be7038a3d50069271541a8c Mon Sep 17 00:00:00 2001
From: John <john-xyz@outlook.com>
Date: Wed, 23 Apr 2025 18:14:03 -0500
Subject: [PATCH 12/40] Fix an iOS reference in testbed cloning. (#272)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 72994c0b..3796f843 100644
--- a/Makefile
+++ b/Makefile
@@ -663,7 +663,7 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 
 ifeq ($(filter $(os),iOS visionOS),$(os))
 	@echo ">>> Clone testbed project for $(os)"
-	$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/iOS/testbed clone --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
+	$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/$(os)/testbed clone --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
 endif
 
 	@echo ">>> Create VERSIONS file for $(os)"

From 344aaf6dfe3d0c7c4e3c89ab15b7bb5d9a6a2da4 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 25 Apr 2025 11:32:00 +0800
Subject: [PATCH 13/40] Update patch to include visionOS plist changes.

---
 patch/Python/Python.patch | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index 4c59f844..270bf5c0 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -2126,7 +2126,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +	<string>%VERSION%</string>
 +	<key>CFBundleSupportedPlatforms</key>
 +	<array>
-+		<string>xrOS</string>
++		<string>XROS</string>
 +	</array>
 +	<key>MinimumOSVersion</key>
 +	<string>@XROS_DEPLOYMENT_TARGET@</string>
@@ -2174,31 +2174,35 @@ index c3e261ecd9e..26ef7a95de4 100644
 +xcrun --sdk xrsimulator clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator -E "$@"
 --- /dev/null
 +++ b/visionOS/Resources/dylib-Info-template.plist
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,30 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 +<plist version="1.0">
 +<dict>
 +	<key>CFBundleDevelopmentRegion</key>
 +	<string>en</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
 +	<key>CFBundleExecutable</key>
 +	<string></string>
 +	<key>CFBundleIdentifier</key>
 +	<string></string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
 +	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
++	<string>FMWK</string>
 +	<key>CFBundleShortVersionString</key>
 +	<string>1.0</string>
 +	<key>CFBundleSupportedPlatforms</key>
 +	<array>
-+		<string>xrOS</string>
++		<string>XROS</string>
 +	</array>
-+	<key>MinimumOSVersion</key>
-+	<string>2.0</string>
 +	<key>CFBundleVersion</key>
 +	<string>1</string>
++	<key>MinimumOSVersion</key>
++	<string>2.0</string>
++	<key>UIDeviceFamily</key>
++	<array>
++		<integer>7</integer>
++	</array>
 +</dict>
 +</plist>
 --- /dev/null
@@ -3443,31 +3447,35 @@ index c3e261ecd9e..26ef7a95de4 100644
 +When the test suite runs, this folder will be on the PYTHONPATH.
 --- /dev/null
 +++ b/visionOS/testbed/visionOSTestbed/dylib-Info-template.plist
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,30 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 +<plist version="1.0">
 +<dict>
 +	<key>CFBundleDevelopmentRegion</key>
 +	<string>en</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
 +	<key>CFBundleExecutable</key>
 +	<string></string>
 +	<key>CFBundleIdentifier</key>
 +	<string></string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
 +	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
++	<string>FMWK</string>
 +	<key>CFBundleShortVersionString</key>
 +	<string>1.0</string>
 +	<key>CFBundleSupportedPlatforms</key>
 +	<array>
-+		<string>VisionOS</string>
++		<string>XROS</string>
 +	</array>
-+	<key>MinimumOSVersion</key>
-+	<string>12.0</string>
 +	<key>CFBundleVersion</key>
 +	<string>1</string>
++	<key>MinimumOSVersion</key>
++	<string>2.0</string>
++	<key>UIDeviceFamily</key>
++	<array>
++		<integer>7</integer>
++	</array>
 +</dict>
 +</plist>
 --- /dev/null

From 515625c54edf15843d503ba00d1bc2e0e6b9f5e9 Mon Sep 17 00:00:00 2001
From: John <john-xyz@outlook.com>
Date: Sat, 26 Apr 2025 21:20:56 -0500
Subject: [PATCH 14/40] visionOS Support and Other Fixes (#276)

Add documentation for visionOS support.
---
 README.rst | 44 +++++++++++++++++++++++++-------------------
 USAGE.md   | 13 +++++++------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/README.rst b/README.rst
index 2317b749..06fde6c9 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@ Python Apple Support
 ====================
 
 This is a meta-package for building a version of Python that can be embedded
-into a macOS, iOS, tvOS or watchOS project.
+into a macOS, iOS, tvOS, watchOS, or visionOS project.
 
 **This branch builds a packaged version of Python 3.14**.
 Other Python versions are available by cloning other branches of the main
@@ -16,21 +16,24 @@ repository:
 
 It works by downloading, patching, and building a fat binary of Python and
 selected pre-requisites, and packaging them as frameworks that can be
-incorporated into an XCode project. The binary modules in the Python standard
+incorporated into an Xcode project. The binary modules in the Python standard
 library are distributed as binaries that can be dynamically loaded at runtime.
 
 The macOS package is a re-bundling of the official macOS binary, modified so that
 it is relocatable, with the IDLE, Tkinter and turtle packages removed, and the
 App Store compliance patch applied.
 
-The iOS, tvOS and watchOS packages compiled by this project use the official
-`PEP 730 <https://peps.python.org/pep-0730/>`__ code that is part of Python 3.13
-to provide iOS support; the relevant patches have been backported to 3.9-3.12.
-Additional patches have been applied to add tvOS and watchOS support.
+The iOS, tvOS, watchOS, and visionOS packages compiled by this project use the
+official `PEP 730 <https://peps.python.org/pep-0730/>`__ code that is part of
+Python 3.13 to provide iOS support; the relevant patches have been backported
+to 3.9-3.12. Additional patches have been applied to add tvOS, watchOS, and
+visionOS support.
 
 The binaries support x86_64 and arm64 for macOS; arm64 for iOS and appleTV
-devices; and arm64_32 for watchOS devices. It also supports device simulators on
-both x86_64 and M1 hardware. This should enable the code to run on:
+devices; arm64_32 for watchOS devices; and arm64 for visionOS devices. It also
+supports device simulators on both x86_64 and M1 hardware, except for visionOS,
+for which x86_64 simulators are officially unsupported. This should enable the
+code to run on:
 
 * macOS 11 (Big Sur) or later, on:
     * MacBook (including MacBooks using Apple Silicon)
@@ -49,6 +52,8 @@ both x86_64 and M1 hardware. This should enable the code to run on:
     * Apple TV (4th gen or later)
 * watchOS 4.0 or later, on:
     * Apple Watch (4th gen or later)
+* visionOS 2.0 or later, on:
+    * Apple Vision Pro
 
 Quickstart
 ----------
@@ -69,6 +74,7 @@ repository, and then in the root directory, and run:
 * ``make iOS`` to build everything for iOS.
 * ``make tvOS`` to build everything for tvOS.
 * ``make watchOS`` to build everything for watchOS.
+* ``make visionOS`` to build everything for visionOS.
 
 This should:
 
@@ -76,16 +82,16 @@ This should:
 2. Patch them as required for compatibility with the selected OS
 3. Build the packages as Xcode-compatible XCFrameworks.
 
-The resulting support packages will be packaged as a ``.tar.gz`` file
+The resulting support packages will be packaged as ``.tar.gz`` files
 in the ``dist`` folder.
 
 Each support package contains:
 
 * ``VERSIONS``, a text file describing the specific versions of code used to build the
   support package;
-* ``Python.xcframework``, a multi-architecture build of the Python runtime library
+* ``Python.xcframework``, a multi-architecture build of the Python runtime library.
 
-On iOS/tvOS/watchOS, the ``Python.xcframework`` contains a
+On iOS/tvOS/watchOS/visionOS, the ``Python.xcframework`` contains a
 slice for each supported ABI (device and simulator). The folder containing the
 slice can also be used as a ``PYTHONHOME``, as it contains a ``bin``, ``include``
 and ``lib`` directory.
@@ -96,11 +102,11 @@ needed to build packages. This is required because Xcode uses the ``xcrun``
 alias to dynamically generate the name of binaries, but a lot of C tooling
 expects that ``CC`` will not contain spaces.
 
-Each slice of an iOS/tvOS/watchOS XCframework also contains a
+Each slice of an iOS/tvOS/watchOS/visionOS XCframework also contains a
 ``platform-config`` folder with a subfolder for each supported architecture in
 that slice. These subfolders can be used to make a macOS Python environment
-behave as if it were on an iOS/tvOS/watchOS device. This works in one of two
-ways:
+behave as if it were on an iOS/tvOS/watchOS/visionOS device. This works in one
+of two ways:
 
 1. **A sitecustomize.py script**. If the ``platform-config`` subfolder is on
    your ``PYTHONPATH`` when a Python interpreter is started, a site
@@ -116,9 +122,9 @@ ways:
    environment to build a wheel, these patches will also be applied to the
    isolated build environment that is created.
 
-iOS distributions also contain a copy of the iOS ``testbed`` project - an Xcode
-project that can be used to run test suites of Python code. See the `CPython
-documentation on testing packages
+iOS and visionOS distributions also contain a copy of the iOS or visionOS
+``testbed`` project - an Xcode project that can be used to run test suites of
+Python code. See the `CPython documentation on testing packages
 <https://docs.python.org/3/using/ios.html#testing-a-python-package>`__ for
 details on how to use this testbed.
 
@@ -131,8 +137,8 @@ Building binary wheels
 This project packages the Python standard library, but does not address building
 binary wheels. Binary wheels for macOS can be obtained from PyPI. `Mobile Forge
 <https://github.com/beeware/mobile-forge>`__ is a project that provides the
-tooling to build build binary wheels for iOS (and potentially for tvOS and
-watchOS, although that hasn't been tested).
+tooling to build build binary wheels for iOS (and potentially for tvOS, watchOS,
+and visionOS, although that hasn't been tested).
 
 Historical support
 ------------------
diff --git a/USAGE.md b/USAGE.md
index 096f71b0..6565dd40 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -2,10 +2,10 @@
 
 ## The easy way
 
-The easist way to use these packages is by creating a project with `Briefcase
-<https://github.com/beeware/briefcase>`__. Briefcase will download pre-compiled
-versions of these support packages, and add them to an Xcode project (or
-pre-build stub application, in the case of macOS).
+The easist way to use these packages is by creating a project with
+(Briefcase)[https://github.com/beeware/briefcase]. Briefcase will download
+pre-compiled versions of these support packages, and add them to an Xcode project
+(or pre-build stub application, in the case of macOS).
 
 ## The manual way
 
@@ -22,8 +22,9 @@ guides:
 * [macOS](https://docs.python.org/3/using/mac.html)
 * [iOS](https://docs.python.org/3/using/ios.html#adding-python-to-an-ios-project)
 
-For tvOS and watchOS, you should be able to broadly follow the instructions in
-the iOS guide.
+For tvOS, watchOS, and visionOS, you should be able to broadly follow the instructions
+in the iOS guide. The testbed projects generated on iOS and visionOS may be used as
+rough references as well.
 
 ### Using Objective C
 

From e29c0fd9cb7d0c2bce222829255faf6523971e73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Apr 2025 06:43:51 +0800
Subject: [PATCH 15/40] Bump actions/setup-python from 5.5.0 to 5.6.0 (#277)

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.5.0 to 5.6.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5.5.0...v5.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yaml      | 2 +-
 .github/workflows/publish.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1f53f4cc..924ce566 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -105,7 +105,7 @@ jobs:
     - uses: actions/checkout@v4.1.7
 
     - name: Set up Python
-      uses: actions/setup-python@v5.5.0
+      uses: actions/setup-python@v5.6.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index c06a6e06..587abe83 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python environment
-      uses: actions/setup-python@v5.5.0
+      uses: actions/setup-python@v5.6.0
       with:
         python-version: "3.X"
 

From 80296f03e68b805ebf7cd8254a50f9d0a3692ea4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Apr 2025 06:44:13 +0800
Subject: [PATCH 16/40] Bump actions/download-artifact from 4.2.1 to 4.3.0
 (#278)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.2.1 to 4.3.0.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4.2.1...v4.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index e4da86bc..fd78eeec 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -40,7 +40,7 @@ jobs:
     needs: [ config, ci ]
     steps:
     - name: Get build artifacts
-      uses: actions/download-artifact@v4.2.1
+      uses: actions/download-artifact@v4.3.0
       with:
         pattern: Python-*
         path: dist

From b5bed64e1b6ecb0d8322d41dc46648566f59501c Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Thu, 1 May 2025 10:26:15 +0800
Subject: [PATCH 17/40] Ensure base_prefix is set in a cross-venv. (#279)

---
 patch/Python/_cross_target.py.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/patch/Python/_cross_target.py.tmpl b/patch/Python/_cross_target.py.tmpl
index 9f75af53..fbe178fc 100644
--- a/patch/Python/_cross_target.py.tmpl
+++ b/patch/Python/_cross_target.py.tmpl
@@ -11,6 +11,8 @@ import sysconfig
 sys.cross_compiling = True
 sys.platform = "{{platform}}"
 sys.implementation._multiarch = "{{arch}}-{{sdk}}"
+sys.base_prefix = sysconfig.get_config_var("prefix")
+sys.base_exec_prefix = sysconfig.get_config_var("prefix")
 
 ###########################################################################
 # subprocess module patches
@@ -67,5 +69,9 @@ def cross_get_sysconfigdata_name():
 sysconfig.get_platform = cross_get_platform
 sysconfig._get_sysconfigdata_name = cross_get_sysconfigdata_name
 
+# Ensure module-level values cached at time of import are updated.
+sysconfig._BASE_PREFIX = sys.prefix
+sysconfig._BASE_EXEC_PREFIX = sys.base_exec_prefix
+
 # Force sysconfig data to be loaded (and cached).
 sysconfig._init_config_vars()

From 7a7aad1e167082a260b491598a3e35ef4a76d283 Mon Sep 17 00:00:00 2001
From: John <john-xyz@outlook.com>
Date: Sat, 3 May 2025 22:25:35 -0500
Subject: [PATCH 18/40] Document the Patch Tree Approach. (#281)

---
 CONTRIBUTING.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 10402ae6..47a30757 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,9 +23,22 @@ repository](https://github.com/python/cpython). macOS and iOS are both
 officially supported Python platforms, and the code distributed by this project
 for those platforms is unmodified from the official repository.
 
-Changes to to support other platforms can be included in this PR, but they must
-also be submitted as a pull request against the `MAJOR.MINOR-patched` branch on
-[the `freakboy3742` fork of the CPython
+Changes to to support other platforms can be included in a PR for this repo, but
+they must also be submitted as a pull request against the `MAJOR.MINOR-patched`
+branch on [the `freakboy3742` fork of the CPython
 repo](https://github.com/freakboy3742/cpython). This is required to ensure that
 any contributed changes can be easily reproduced in future patches as more
 changes are made.
+
+Note that the `MAJOR.MINOR-patched` branch of that fork is maintained in the format
+of a *patch tree*, which is a branch that has an entirely linear sequence of
+commits applied on top of another branch (in the case of the fork, `MAJOR.MINOR`),
+each of which adding a new feature. Therefore, bug fixes to the patches applied
+*will* be merged, but their changes gets squashed into the commit applying the
+feature. Feature additions to the patch will be squashed into a single commit,
+and then merged.
+
+This also means that if another contributor on the fork gets a pull request merged
+into the fork, you must *rebase*, not merge, your changes on top of the newly pulled
+`MAJOR.MINOR-patched` branch, since the "history" of a patch tree branch might
+change in a way that is incompatible with merge commits.

From 6583edf016d419217a0331a22abc4689bc5c8e1f Mon Sep 17 00:00:00 2001
From: John <john-xyz@outlook.com>
Date: Sun, 4 May 2025 18:10:02 -0500
Subject: [PATCH 19/40] Update CONTRIBUTING.md for Grammar + Clarity (#282)

---
 CONTRIBUTING.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 47a30757..dfed555e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,14 +31,15 @@ any contributed changes can be easily reproduced in future patches as more
 changes are made.
 
 Note that the `MAJOR.MINOR-patched` branch of that fork is maintained in the format
-of a *patch tree*, which is a branch that has an entirely linear sequence of
+of a *patch tree*, which is a branch that consists of an entirely linear sequence of
 commits applied on top of another branch (in the case of the fork, `MAJOR.MINOR`),
-each of which adding a new feature. Therefore, bug fixes to the patches applied
-*will* be merged, but their changes gets squashed into the commit applying the
-feature. Feature additions to the patch will be squashed into a single commit,
-and then merged.
-
-This also means that if another contributor on the fork gets a pull request merged
-into the fork, you must *rebase*, not merge, your changes on top of the newly pulled
-`MAJOR.MINOR-patched` branch, since the "history" of a patch tree branch might
-change in a way that is incompatible with merge commits.
+each of which adds a significant new feature. Therefore, a bug fix for an existing commit
+in the patch tree *will* be merged when appropriate, but its changes will get combined
+with that existing commit that adds the feature. A feature addition PR will be squashed
+into a single, new commit, and then put on top of the patch tree.
+
+This also means that if another contributor gets a pull request merged into
+`MAJOR.MINOR-patched`, you must *rebase* your changes on top of the updated
+`MAJOR.MINOR-patched` branch, as opposed to *merging* `MAJOR.MINOR-patched` into your
+branch, since the "history" of a patch tree is likely to change in a way that is
+incompatible with merge commits.

From a0419056635f76a14207014ea7da83a6d69ea35c Mon Sep 17 00:00:00 2001
From: John <john-xyz@outlook.com>
Date: Mon, 5 May 2025 19:15:06 -0500
Subject: [PATCH 20/40] Remove some useless PATHs in Usage.md (#284)

Updated example configuration to remove paths implied by a normal PYTHONHOME configuration.
---
 USAGE.md | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/USAGE.md b/USAGE.md
index 6565dd40..072ae1ec 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -23,8 +23,8 @@ guides:
 * [iOS](https://docs.python.org/3/using/ios.html#adding-python-to-an-ios-project)
 
 For tvOS, watchOS, and visionOS, you should be able to broadly follow the instructions
-in the iOS guide. The testbed projects generated on iOS and visionOS may be used as
-rough references as well.
+in the iOS guide, changing some platform names in the first script. The testbed projects
+generated on iOS and visionOS may be used as rough references as well.
 
 ### Using Objective C
 
@@ -45,19 +45,15 @@ As a *bare minimum*, you can do the following:
    ```objc
    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
    NSString *pythonHome = [NSString stringWithFormat:@"%@/python", resourcePath, nil];
-   NSString *pythonPath = [NSString stringWithFormat:@"%@/lib/python3.13", python_home, nil];
-   NSString *libDynloadPath = [NSString stringWithFormat:@"%@/lib/python3.13/lib-dynload", python_home, nil];
    NSString *appPath = [NSString stringWithFormat:@"%@/app", resourcePath, nil];
 
-   setenv("PYTHONHOME", pythonHome, 1);
-   setenv("PYTHONPATH", [NSString stringWithFormat:@"%@:%@:%@", pythonpath, libDynloadPath, appPath, nil]);
+   setenv("PYTHONHOME", [pythonHome UTF8String], 1);
+   setenv("PYTHONPATH", [appPath UTF8String], 1);
 
    Py_Initialize();
 
    // we now have a Python interpreter ready to be used
    ```
-   References to a specific Python version should reflect the version of
-   Python you are using.
 
 Again - this is the *bare minimum* initialization. In practice, you will likely
 need to configure other aspects of the Python interpreter using the
@@ -81,12 +77,10 @@ code will look something like this:
 2. Initialize the Python interpreter:
    ```swift
    guard let pythonHome = Bundle.main.path(forResource: "python", ofType: nil) else { return }
-   guard let pythonPath = Bundle.main.path(forResource: "python/lib/python3.13", ofType: nil) else { return }
-   guard let libDynloadPath = Bundle.main.path(forResource: "python/lib/python3.13/lib-dynload", ofType: nil) else { return }
    let appPath = Bundle.main.path(forResource: "app", ofType: nil)
 
    setenv("PYTHONHOME", pythonHome, 1)
-   setenv("PYTHONPATH", [pythonPath, libDynloadPath, appPath].compactMap { $0 }.joined(separator: ":"), 1)
+   setenv("PYTHONPATH", appPath, 1)
    Py_Initialize()
    // we now have a Python interpreter ready to be used
    ```

From 76b7f30fbecd8f1e72cfc42b605828b253242f77 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 3 Jun 2025 13:21:23 +0800
Subject: [PATCH 21/40] Bump patch to Python 3.14.0b2. (#290)

---
 Makefile                  |   2 +-
 patch/Python/Python.patch | 195 +++++++++++++++++++-------------------
 2 files changed, 99 insertions(+), 98 deletions(-)

diff --git a/Makefile b/Makefile
index 3796f843..79c2f19f 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ BUILD_NUMBER=custom
 # of a release cycle, as official binaries won't be published.
 # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
 # PYTHON_VER is the major/minor version (e.g., 3.10)
-PYTHON_VERSION=3.14.0a7
+PYTHON_VERSION=3.14.0b2
 PYTHON_PKG_VERSION=$(PYTHON_VERSION)
 PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index 270bf5c0..8db5c523 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -1,8 +1,8 @@
 diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
-index bba08b99b95..8d03017c223 100644
+index 823a3692fd1..00639dd8488 100644
 --- a/Lib/ctypes/__init__.py
 +++ b/Lib/ctypes/__init__.py
-@@ -361,7 +361,7 @@
+@@ -419,7 +419,7 @@
          if name:
              name = _os.fspath(name)
  
@@ -56,7 +56,7 @@ index 8bcd741c446..d8a6f28edba 100644
                  suffix.replace(".so", ".fwork")
                  for suffix in _imp.extension_suffixes()
 diff --git a/Lib/platform.py b/Lib/platform.py
-index a62192589af..31f18b026b7 100644
+index 55e211212d4..cad919bc0c4 100644
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
 @@ -528,6 +528,78 @@
@@ -212,10 +212,10 @@ index a62192589af..31f18b026b7 100644
              macos_release = mac_ver()[0]
              if macos_release:
 diff --git a/Lib/site.py b/Lib/site.py
-index 9da8b6724e1..345f55a5bde 100644
+index f9327197159..74899abecb0 100644
 --- a/Lib/site.py
 +++ b/Lib/site.py
-@@ -297,8 +297,8 @@
+@@ -298,8 +298,8 @@
      if env_base:
          return env_base
  
@@ -227,7 +227,7 @@ index 9da8b6724e1..345f55a5bde 100644
  
      def joinuser(*args):
 diff --git a/Lib/subprocess.py b/Lib/subprocess.py
-index da5f5729e09..7401ffbc987 100644
+index 54c2eb515b6..03896a234bf 100644
 --- a/Lib/subprocess.py
 +++ b/Lib/subprocess.py
 @@ -75,7 +75,7 @@
@@ -240,7 +240,7 @@ index da5f5729e09..7401ffbc987 100644
  if _mswindows:
      import _winapi
 diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index 18e6b8d25e5..64603fb1bb1 100644
+index f93b98dd681..0db3dbdce05 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
 @@ -23,6 +23,9 @@
@@ -262,7 +262,7 @@ index 18e6b8d25e5..64603fb1bb1 100644
          return None
  
      def joinuser(*args):
-@@ -719,6 +722,18 @@
+@@ -730,6 +733,18 @@
              release = get_config_vars().get("IPHONEOS_DEPLOYMENT_TARGET", "13.0")
              osname = sys.platform
              machine = sys.implementation._multiarch
@@ -282,10 +282,10 @@ index 18e6b8d25e5..64603fb1bb1 100644
              import _osx_support
              osname, release, machine = _osx_support.get_platform_osx(
 diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
-index ecb37250ceb..67d04491072 100644
+index 1b551254f86..8594f92c097 100644
 --- a/Lib/test/datetimetester.py
 +++ b/Lib/test/datetimetester.py
-@@ -7155,9 +7155,9 @@
+@@ -7159,9 +7159,9 @@
                      self.assertEqual(dt_orig, dt_rt)
  
      def test_type_check_in_subinterp(self):
@@ -298,10 +298,10 @@ index ecb37250ceb..67d04491072 100644
          else:
              extension_loader = "ExtensionFileLoader"
 diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
-index 6d670a575b0..8d7d68d1ee1 100644
+index b7cd7940eb1..32243a49e7a 100644
 --- a/Lib/test/support/__init__.py
 +++ b/Lib/test/support/__init__.py
-@@ -551,7 +551,7 @@
+@@ -558,7 +558,7 @@
          sys.platform == "android", f"Android blocks {name} with SELinux"
      )
  
@@ -310,7 +310,7 @@ index 6d670a575b0..8d7d68d1ee1 100644
      unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
  else:
      unix_shell = None
-@@ -567,7 +567,7 @@
+@@ -574,7 +574,7 @@
  def skip_wasi_stack_overflow():
      return unittest.skipIf(is_wasi, "Exhausts stack on WASI")
  
@@ -319,19 +319,6 @@ index 6d670a575b0..8d7d68d1ee1 100644
  is_apple = is_apple_mobile or sys.platform == "darwin"
  
  has_fork_support = hasattr(os, "fork") and not (
-diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
-index d82093e375c..2c45fe2369e 100644
---- a/Lib/test/support/os_helper.py
-+++ b/Lib/test/support/os_helper.py
-@@ -657,7 +657,7 @@
-     """
-     if sys.platform.startswith(('linux', 'android', 'freebsd', 'emscripten')):
-         fd_path = "/proc/self/fd"
--    elif sys.platform == "darwin":
-+    elif support.is_apple:
-         fd_path = "/dev/fd"
-     else:
-         fd_path = None
 diff --git a/Lib/test/test_ctypes/test_dllist.py b/Lib/test/test_ctypes/test_dllist.py
 index 15603dc3d77..bff6c0fb95f 100644
 --- a/Lib/test/test_ctypes/test_dllist.py
@@ -346,10 +333,10 @@ index 15603dc3d77..bff6c0fb95f 100644
  if WINDOWS:
      KNOWN_LIBRARIES = ["KERNEL32.DLL"]
 diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
-index 6ba630ad527..7b447744d12 100644
+index 719c4feace6..92a831a9148 100644
 --- a/Lib/test/test_platform.py
 +++ b/Lib/test/test_platform.py
-@@ -268,13 +268,21 @@
+@@ -271,13 +271,21 @@
              if sys.platform == "android":
                  self.assertEqual(res.system, "Android")
                  self.assertEqual(res.release, platform.android_ver().release)
@@ -389,11 +376,11 @@ index 4c3ea1cd8df..04a210e5c86 100644
      def _obj_ref(self, *args):
          # Construct a string representation of the arguments that can be used
 diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
-index 232d3c3a9c5..e042c20ea54 100644
+index f2e2394089d..2efbbfb0014 100644
 --- a/Lib/webbrowser.py
 +++ b/Lib/webbrowser.py
 @@ -488,7 +488,8 @@
-         # OS X can use below Unix support (but we prefer using the OS X
+         # macOS can use below Unix support (but we prefer using the macOS
          # specific stuff)
  
 -    if sys.platform == "ios":
@@ -402,7 +389,7 @@ index 232d3c3a9c5..e042c20ea54 100644
          register("iosbrowser", None, IOSBrowser(), preferred=True)
  
      if sys.platform == "serenityos":
-@@ -640,9 +641,10 @@
+@@ -653,9 +654,10 @@
              return not rc
  
  #
@@ -416,7 +403,7 @@ index 232d3c3a9c5..e042c20ea54 100644
      if objc:
          # If objc exists, we know ctypes is also importable.
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index e10c78d6403..920e707ab26 100644
+index b5703fbe6ae..e436b2efb8e 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -209,6 +209,12 @@
@@ -432,7 +419,7 @@ index e10c78d6403..920e707ab26 100644
  # Option to install to strip binaries
  STRIPFLAG=-s
  
-@@ -2243,7 +2249,7 @@
+@@ -2264,7 +2270,7 @@
  # a full Xcode install that has an iPhone SE (3rd edition) simulator available.
  # This must be run *after* a `make install` has completed the build. The
  # `--with-framework-name` argument *cannot* be used when configuring the build.
@@ -441,7 +428,7 @@ index e10c78d6403..920e707ab26 100644
  .PHONY: testios
  testios:
  	@if test "$(MACHDEP)" != "ios"; then \
-@@ -2263,11 +2269,41 @@
+@@ -2284,11 +2290,41 @@
  		exit 1;\
  	fi
  
@@ -487,7 +474,7 @@ index e10c78d6403..920e707ab26 100644
  # Like test, but using --slow-ci which enables all test resources and use
  # longer timeout. Run an optional pybuildbot.identify script to include
 diff --git a/Misc/platform_triplet.c b/Misc/platform_triplet.c
-index ec0857a4a99..e52f486cdb3 100644
+index f5cd73bdea8..6c1863c943b 100644
 --- a/Misc/platform_triplet.c
 +++ b/Misc/platform_triplet.c
 @@ -257,6 +257,32 @@
@@ -546,10 +533,10 @@ index 1bb6a05dc11..49febd56a37 100755
  	none--*)
  		# None (no kernel, i.e. freestanding / bare metal),
 diff --git a/configure b/configure
-index 1b75ddfa26d..7b79dfc424c 100755
+index 884f8a4b068..7c93d36e717 100755
 --- a/configure
 +++ b/configure
-@@ -978,6 +978,10 @@
+@@ -982,6 +982,10 @@
  CFLAGS
  CC
  HAS_XCRUN
@@ -560,7 +547,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  IPHONEOS_DEPLOYMENT_TARGET
  EXPORT_MACOSX_DEPLOYMENT_TARGET
  CONFIGURE_MACOSX_DEPLOYMENT_TARGET
-@@ -4106,6 +4110,15 @@
+@@ -4116,6 +4120,15 @@
  	*-apple-ios*)
  		ac_sys_system=iOS
  		;;
@@ -576,7 +563,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  	*-*-darwin*)
  		ac_sys_system=Darwin
  		;;
-@@ -4187,7 +4200,7 @@
+@@ -4197,7 +4210,7 @@
  # On cross-compile builds, configure will look for a host-specific compiler by
  # prepending the user-provided host triple to the required binary name.
  #
@@ -585,7 +572,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  # which isn't a binary that exists, and isn't very convenient, as it contains the
  # iOS version. As the default cross-compiler name won't exist, configure falls
  # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
-@@ -4202,6 +4215,17 @@
+@@ -4212,6 +4225,17 @@
  		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
  		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
  		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
@@ -603,7 +590,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  		*)
  	esac
  fi
-@@ -4210,6 +4234,17 @@
+@@ -4220,6 +4244,17 @@
  		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
  		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
  		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
@@ -621,7 +608,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  		*)
  	esac
  fi
-@@ -4218,6 +4253,17 @@
+@@ -4228,6 +4263,17 @@
  		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
  		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
  		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
@@ -639,7 +626,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  		*)
  	esac
  fi
-@@ -4226,6 +4272,17 @@
+@@ -4236,6 +4282,17 @@
  		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
  		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
  		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
@@ -657,7 +644,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  		*)
  	esac
  fi
-@@ -4348,8 +4405,11 @@
+@@ -4358,8 +4415,11 @@
  	case $enableval in
  	yes)
  		case $ac_sys_system in
@@ -671,7 +658,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  			*) as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
  		esac
  	esac
-@@ -4358,6 +4418,9 @@
+@@ -4368,6 +4428,9 @@
  	no)
  		case $ac_sys_system in
  			iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
@@ -681,7 +668,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  			*)
  				PYTHONFRAMEWORK=
  				PYTHONFRAMEWORKDIR=no-framework
-@@ -4464,6 +4527,51 @@
+@@ -4474,6 +4537,51 @@
  
  				ac_config_files="$ac_config_files iOS/Resources/Info.plist"
  
@@ -733,7 +720,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  				;;
  			*)
  				as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
-@@ -4475,6 +4583,9 @@
+@@ -4485,6 +4593,9 @@
    e)
  	case $ac_sys_system in
  		iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
@@ -743,7 +730,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  		*)
  			PYTHONFRAMEWORK=
  			PYTHONFRAMEWORKDIR=no-framework
-@@ -4529,8 +4640,8 @@
+@@ -4539,8 +4650,8 @@
      case "$withval" in
      yes)
        case $ac_sys_system in
@@ -754,7 +741,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
            APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
            ;;
          *) as_fn_error $? "no default app store compliance patch available for $ac_sys_system" "$LINENO" 5 ;;
-@@ -4548,8 +4659,8 @@
+@@ -4558,8 +4669,8 @@
  else case e in #(
    e)
      case $ac_sys_system in
@@ -765,7 +752,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
          APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: applying default app store compliance patch" >&5
  printf "%s\n" "applying default app store compliance patch" >&6; }
-@@ -4567,6 +4678,8 @@
+@@ -4577,6 +4688,8 @@
  
  
  
@@ -774,7 +761,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  
  if test "$cross_compiling" = yes; then
  	case "$host" in
-@@ -4604,6 +4717,78 @@
+@@ -4614,6 +4727,78 @@
  				;;
  		esac
  		;;
@@ -853,7 +840,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  	*-*-darwin*)
  		case "$host_cpu" in
  		arm*)
-@@ -4694,9 +4879,15 @@
+@@ -4704,9 +4889,15 @@
      define_xopen_source=no;;
    Darwin/[12][0-9].*)
      define_xopen_source=no;;
@@ -870,7 +857,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
    # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
    # defining NI_NUMERICHOST.
    QNX/6.3.2)
-@@ -4759,7 +4950,13 @@
+@@ -4769,7 +4960,13 @@
  CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
  EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
  
@@ -885,7 +872,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  
  
  # checks for alternative programs
-@@ -4800,6 +4997,16 @@
+@@ -4810,6 +5007,16 @@
      as_fn_append CFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
      as_fn_append LDFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
     ;; #(
@@ -902,7 +889,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
    *) :
       ;;
  esac
-@@ -7169,6 +7376,12 @@
+@@ -7179,6 +7386,12 @@
      MULTIARCH="" ;; #(
    iOS) :
      MULTIARCH="" ;; #(
@@ -915,7 +902,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
    FreeBSD*) :
      MULTIARCH="" ;; #(
    *) :
-@@ -7189,7 +7402,7 @@
+@@ -7199,7 +7412,7 @@
  printf "%s\n" "$MULTIARCH" >&6; }
  
  case $ac_sys_system in #(
@@ -924,7 +911,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
      SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2` ;; #(
    *) :
      SOABI_PLATFORM=$PLATFORM_TRIPLET
-@@ -7240,6 +7453,18 @@
+@@ -7250,6 +7463,18 @@
      PY_SUPPORT_TIER=3 ;; #(
      aarch64-apple-ios*/clang) :
      PY_SUPPORT_TIER=3 ;; #(
@@ -943,7 +930,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
      aarch64-*-linux-android/clang) :
      PY_SUPPORT_TIER=3 ;; #(
      x86_64-*-linux-android/clang) :
-@@ -7676,7 +7901,7 @@
+@@ -7686,7 +7911,7 @@
    case $ac_sys_system in
      Darwin)
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
@@ -952,7 +939,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
      *)
        as_fn_error $? "Unknown platform for framework build" "$LINENO" 5;;
-@@ -7742,7 +7967,7 @@
+@@ -7752,7 +7977,7 @@
        BLDLIBRARY='-L. -lpython$(LDVERSION)'
        RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
        ;;
@@ -961,7 +948,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
        LDLIBRARY='libpython$(LDVERSION).dylib'
        ;;
      AIX*)
-@@ -13550,7 +13775,7 @@
+@@ -13574,7 +13799,7 @@
  			BLDSHARED="$LDSHARED"
  		fi
  		;;
@@ -970,7 +957,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		BLDSHARED="$LDSHARED"
-@@ -13683,7 +13908,7 @@
+@@ -13707,7 +13932,7 @@
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
  	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
  	# -u libsys_s pulls in all symbols in libsys
@@ -979,7 +966,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
  
  		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -13707,7 +13932,7 @@
+@@ -13731,7 +13956,7 @@
  				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			fi
  			LINKFORSHARED="$LINKFORSHARED"
@@ -988,7 +975,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
  		fi
  		;;
-@@ -15292,7 +15517,7 @@
+@@ -15508,7 +15733,7 @@
  
              ctypes_malloc_closure=yes
       ;; #(
@@ -997,7 +984,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  
        ctypes_malloc_closure=yes
       ;; #(
-@@ -19044,12 +19269,6 @@
+@@ -19260,12 +19485,6 @@
  then :
    printf "%s\n" "#define HAVE_DUP3 1" >>confdefs.h
  
@@ -1010,7 +997,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  fi
  ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
  if test "x$ac_cv_func_explicit_bzero" = xyes
-@@ -19110,18 +19329,6 @@
+@@ -19326,18 +19545,6 @@
  then :
    printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h
  
@@ -1029,7 +1016,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  fi
  ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
  if test "x$ac_cv_func_fpathconf" = xyes
-@@ -19548,24 +19755,6 @@
+@@ -19764,24 +19971,6 @@
  then :
    printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h
  
@@ -1054,7 +1041,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  fi
  ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
  if test "x$ac_cv_func_pread" = xyes
-@@ -19884,12 +20073,6 @@
+@@ -20100,12 +20289,6 @@
  then :
    printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
  
@@ -1067,7 +1054,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  fi
  ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
  if test "x$ac_cv_func_sigfillset" = xyes
-@@ -20158,11 +20341,11 @@
+@@ -20374,11 +20557,11 @@
  
  fi
  
@@ -1081,7 +1068,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
    ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
  if test "x$ac_cv_func_getentropy" = xyes
  then :
-@@ -20184,6 +20367,53 @@
+@@ -20400,6 +20583,53 @@
  
  fi
  
@@ -1135,7 +1122,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
  printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
  if test ${ac_cv_c_undeclared_builtin_options+y}
-@@ -23266,7 +23496,8 @@
+@@ -23844,7 +24074,8 @@
  
  
  # check for openpty, login_tty, and forkpty
@@ -1145,7 +1132,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  
    for ac_func in openpty
  do :
-@@ -23380,7 +23611,7 @@
+@@ -23958,7 +24189,7 @@
  fi
  
  done
@@ -1154,7 +1141,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  printf %s "checking for library containing login_tty... " >&6; }
  if test ${ac_cv_search_login_tty+y}
  then :
-@@ -23563,6 +23794,7 @@
+@@ -24141,6 +24372,7 @@
  fi
  
  done
@@ -1162,7 +1149,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  
  # check for long file support functions
  ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
-@@ -23828,10 +24060,10 @@
+@@ -24406,10 +24638,10 @@
  
  done
  
@@ -1175,7 +1162,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  then
  
    for ac_func in clock_settime
-@@ -24148,7 +24380,7 @@
+@@ -24726,7 +24958,7 @@
    e) if test "$cross_compiling" = yes
  then :
  
@@ -1184,7 +1171,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
    ac_cv_buggy_getaddrinfo="no"
  elif test "${enable_ipv6+set}" = set; then
    ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
-@@ -26170,8 +26402,8 @@
+@@ -26748,8 +26980,8 @@
    LIBPYTHON="\$(BLDLIBRARY)"
  fi
  
@@ -1195,7 +1182,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
  
-@@ -29041,7 +29273,7 @@
+@@ -29619,7 +29851,7 @@
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
  printf "%s\n" "$as_me: checking for device files" >&6;}
  
@@ -1204,7 +1191,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -29550,7 +29782,7 @@
+@@ -30129,7 +30361,7 @@
      with_ensurepip=no ;; #(
    WASI) :
      with_ensurepip=no ;; #(
@@ -1213,7 +1200,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
      with_ensurepip=no ;; #(
    *) :
      with_ensurepip=upgrade
-@@ -30499,7 +30731,7 @@
+@@ -31078,7 +31310,7 @@
    SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
    NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
    Darwin) _PYTHREAD_NAME_MAXLEN=63;;
@@ -1222,7 +1209,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
    FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
    OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
    *) _PYTHREAD_NAME_MAXLEN=;;
-@@ -30531,7 +30763,7 @@
+@@ -31110,7 +31342,7 @@
   ;; #(
      Darwin) :
       ;; #(
@@ -1231,7 +1218,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
  
  
  
-@@ -34605,6 +34837,9 @@
+@@ -35272,6 +35504,9 @@
      "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
      "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
      "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
@@ -1242,7 +1229,7 @@ index 1b75ddfa26d..7b79dfc424c 100755
      "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
      "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
 diff --git a/configure.ac b/configure.ac
-index c449bb5ebb3..29b9a82374b 100644
+index cf25148bad2..7ab0609bf8a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -330,6 +330,15 @@
@@ -1631,7 +1618,7 @@ index c449bb5ebb3..29b9a82374b 100644
        LDLIBRARY='libpython$(LDVERSION).dylib'
        ;;
      AIX*)
-@@ -3456,7 +3655,7 @@
+@@ -3470,7 +3669,7 @@
  			BLDSHARED="$LDSHARED"
  		fi
  		;;
@@ -1640,7 +1627,7 @@ index c449bb5ebb3..29b9a82374b 100644
  		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		BLDSHARED="$LDSHARED"
-@@ -3580,7 +3779,7 @@
+@@ -3594,7 +3793,7 @@
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
  	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
  	# -u libsys_s pulls in all symbols in libsys
@@ -1649,7 +1636,7 @@ index c449bb5ebb3..29b9a82374b 100644
  		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
  
  		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -3604,7 +3803,7 @@
+@@ -3618,7 +3817,7 @@
  				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			fi
  			LINKFORSHARED="$LINKFORSHARED"
@@ -1658,7 +1645,7 @@ index c449bb5ebb3..29b9a82374b 100644
  			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
  		fi
  		;;
-@@ -4024,7 +4223,7 @@
+@@ -4106,7 +4305,7 @@
        dnl when do we need USING_APPLE_OS_LIBFFI?
        ctypes_malloc_closure=yes
      ],
@@ -1667,7 +1654,7 @@ index c449bb5ebb3..29b9a82374b 100644
        ctypes_malloc_closure=yes
      ],
      [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]
-@@ -5133,9 +5332,9 @@
+@@ -5215,9 +5414,9 @@
  # checks for library functions
  AC_CHECK_FUNCS([ \
    accept4 alarm bind_textdomain_codeset chmod chown clock closefrom close_range confstr \
@@ -1679,7 +1666,7 @@ index c449bb5ebb3..29b9a82374b 100644
    gai_strerror getegid geteuid getgid getgrent getgrgid getgrgid_r \
    getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin \
    getpeername getpgid getpid getppid getpriority _getpty \
-@@ -5143,8 +5342,7 @@
+@@ -5225,8 +5424,7 @@
    getspnam getuid getwd grantpt if_nameindex initgroups kill killpg lchown linkat \
    lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
    mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
@@ -1689,7 +1676,7 @@ index c449bb5ebb3..29b9a82374b 100644
    pread preadv preadv2 process_vm_readv \
    pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \
    pthread_kill pthread_get_name_np pthread_getname_np pthread_set_name_np
-@@ -5154,7 +5352,7 @@
+@@ -5236,7 +5434,7 @@
    sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \
    sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \
    setitimer setlocale setpgid setpgrp setpriority setregid setresgid \
@@ -1698,7 +1685,7 @@ index c449bb5ebb3..29b9a82374b 100644
    sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
    sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
    sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
-@@ -5169,12 +5367,20 @@
+@@ -5251,12 +5449,20 @@
    AC_CHECK_FUNCS([lchmod])
  fi
  
@@ -1722,7 +1709,7 @@ index c449bb5ebb3..29b9a82374b 100644
  fi
  
  AC_CHECK_DECL([dirfd],
-@@ -5428,20 +5634,22 @@
+@@ -5539,20 +5745,22 @@
  ])
  
  # check for openpty, login_tty, and forkpty
@@ -1759,7 +1746,7 @@ index c449bb5ebb3..29b9a82374b 100644
  
  # check for long file support functions
  AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
-@@ -5480,10 +5688,10 @@
+@@ -5591,10 +5799,10 @@
      ])
  ])
  
@@ -1772,7 +1759,7 @@ index c449bb5ebb3..29b9a82374b 100644
  then
    AC_CHECK_FUNCS([clock_settime], [], [
        AC_CHECK_LIB([rt], [clock_settime], [
-@@ -5641,7 +5849,7 @@
+@@ -5752,7 +5960,7 @@
  [ac_cv_buggy_getaddrinfo=no],
  [ac_cv_buggy_getaddrinfo=yes],
  [
@@ -1781,7 +1768,7 @@ index c449bb5ebb3..29b9a82374b 100644
    ac_cv_buggy_getaddrinfo="no"
  elif test "${enable_ipv6+set}" = set; then
    ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
-@@ -6234,8 +6442,8 @@
+@@ -6345,8 +6553,8 @@
    LIBPYTHON="\$(BLDLIBRARY)"
  fi
  
@@ -1792,7 +1779,7 @@ index c449bb5ebb3..29b9a82374b 100644
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
  
-@@ -6894,7 +7102,7 @@
+@@ -7005,7 +7213,7 @@
  dnl NOTE: Inform user how to proceed with files when cross compiling.
  dnl Some cross-compile builds are predictable; they won't ever
  dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
@@ -1801,7 +1788,7 @@ index c449bb5ebb3..29b9a82374b 100644
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -7195,7 +7403,7 @@
+@@ -7307,7 +7515,7 @@
        AS_CASE([$ac_sys_system],
          [Emscripten], [with_ensurepip=no],
          [WASI], [with_ensurepip=no],
@@ -1810,7 +1797,7 @@ index c449bb5ebb3..29b9a82374b 100644
          [with_ensurepip=upgrade]
        )
      ])
-@@ -7582,7 +7790,7 @@
+@@ -7694,7 +7902,7 @@
    SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
    NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
    Darwin) _PYTHREAD_NAME_MAXLEN=63;;
@@ -1819,7 +1806,7 @@ index c449bb5ebb3..29b9a82374b 100644
    FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
    OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
    *) _PYTHREAD_NAME_MAXLEN=;;
-@@ -7607,7 +7815,7 @@
+@@ -7719,7 +7927,7 @@
    [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
    dnl The _scproxy module is available on macOS
    [Darwin], [],
@@ -2252,6 +2239,20 @@ index c3e261ecd9e..26ef7a95de4 100644
 +</dict>
 +</plist>
 --- /dev/null
++++ b/visionOS/testbed/Python.xcframework/xros-arm64-simulator/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling an visionOS simulator
++build for testing purposes (either x86_64 or ARM64).
+--- /dev/null
++++ b/visionOS/testbed/Python.xcframework/xros-arm64/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling an visionOS on-device
++build for testing purposes.
+--- /dev/null
 +++ b/visionOS/testbed/__main__.py
 @@ -0,0 +1,512 @@
 +import argparse

From c012e5d4309b3a6767bcc5787f9cd57cfbcd48e9 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 3 Jun 2025 15:23:46 +0800
Subject: [PATCH 22/40] Add xcprivacy and dSYM handling (#285)

Adds xcprivacy handling for modules that link OpenSSL, and includes dSYM files as part of build.
---
 Makefile                       | 10 ++++++++++
 patch/Python/OpenSSL.xcprivacy | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 patch/Python/OpenSSL.xcprivacy

diff --git a/Makefile b/Makefile
index 79c2f19f..44170ec6 100644
--- a/Makefile
+++ b/Makefile
@@ -457,6 +457,7 @@ $$(PYTHON_LIB-$(sdk)): $$(foreach target,$$(SDK_TARGETS-$(sdk)),$$(PYTHON_LIB-$$
 	mkdir -p $$(dir $$(PYTHON_LIB-$(sdk)))
 	lipo -create -output $$@ $$^ \
 		2>&1 | tee -a install/$(os)/$(sdk)/python-$(PYTHON_VERSION).lipo.log
+	dsymutil $$@ -o $$(PYTHON_INSTALL-$(sdk))/Python.dSYM
 
 $$(PYTHON_FRAMEWORK-$(sdk))/Info.plist: $$(PYTHON_LIB-$(sdk))
 	@echo ">>> Install Info.plist for the $(sdk) SDK"
@@ -523,6 +524,14 @@ $$(PYTHON_STDLIB-$(sdk))/LICENSE.TXT: $$(PYTHON_LIB-$(sdk)) $$(PYTHON_FRAMEWORK-
 	# Merge the binary modules from each target in the $(sdk) SDK into a single binary
 	$$(foreach module,$$(wildcard $$(PYTHON_STDLIB-$$(firstword $$(SDK_TARGETS-$(sdk))))/lib-dynload/*),lipo -create -output $$(PYTHON_STDLIB-$(sdk))/lib-dynload/$$(notdir $$(module)) $$(foreach target,$$(SDK_TARGETS-$(sdk)),$$(PYTHON_STDLIB-$$(target))/lib-dynload/$$(notdir $$(module))); )
 
+	# Create dSYM files for each module
+	$$(foreach module,$$(wildcard $$(PYTHON_STDLIB-$$(firstword $$(SDK_TARGETS-$(sdk))))/lib-dynload/*),dsymutil $$(PYTHON_STDLIB-$(sdk))/lib-dynload/$$(notdir $$(module)); )
+
+	# Copy in known-required xcprivacy files.
+	# Libraries linking OpenSSL must provide a privacy manifest. The one in this repository
+	# has been sourced from https://github.com/openssl/openssl/blob/openssl-3.0/os-dep/Apple/PrivacyInfo.xcprivacy
+	cp $(PROJECT_DIR)/patch/Python/OpenSSL.xcprivacy $$(PYTHON_STDLIB-$(sdk))/lib-dynload/_hashlib.xcprivacy
+	cp $(PROJECT_DIR)/patch/Python/OpenSSL.xcprivacy $$(PYTHON_STDLIB-$(sdk))/lib-dynload/_ssl.xcprivacy
 endif
 
 $(sdk): $$(PYTHON_STDLIB-$(sdk))/LICENSE.TXT
@@ -660,6 +669,7 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/bin $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/lib $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/platform-config $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
+	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/Python.dSYM $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 
 ifeq ($(filter $(os),iOS visionOS),$(os))
 	@echo ">>> Clone testbed project for $(os)"
diff --git a/patch/Python/OpenSSL.xcprivacy b/patch/Python/OpenSSL.xcprivacy
new file mode 100644
index 00000000..95780a09
--- /dev/null
+++ b/patch/Python/OpenSSL.xcprivacy
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+    <key>NSPrivacyAccessedAPITypes</key>
+    <array>
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>C617.1</string>
+            </array>
+        </dict>
+    </array>
+    <key>NSPrivacyCollectedDataTypes</key>
+    <array/>
+    <key>NSPrivacyTrackingDomains</key>
+    <array/>
+    <key>NSPrivacyTracking</key>
+    <false/>
+    </dict>
+</plist>

From 80198354e18fc3d808be1ef2a42ca10c3cfb3fe3 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 3 Jun 2025 21:12:10 +0800
Subject: [PATCH 23/40] Temporarily disable dSYM production. (#293)

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 44170ec6..ab0b3563 100644
--- a/Makefile
+++ b/Makefile
@@ -457,7 +457,8 @@ $$(PYTHON_LIB-$(sdk)): $$(foreach target,$$(SDK_TARGETS-$(sdk)),$$(PYTHON_LIB-$$
 	mkdir -p $$(dir $$(PYTHON_LIB-$(sdk)))
 	lipo -create -output $$@ $$^ \
 		2>&1 | tee -a install/$(os)/$(sdk)/python-$(PYTHON_VERSION).lipo.log
-	dsymutil $$@ -o $$(PYTHON_INSTALL-$(sdk))/Python.dSYM
+	# Disable dSYM production (for now)
+	# dsymutil $$@ -o $$(PYTHON_INSTALL-$(sdk))/Python.dSYM
 
 $$(PYTHON_FRAMEWORK-$(sdk))/Info.plist: $$(PYTHON_LIB-$(sdk))
 	@echo ">>> Install Info.plist for the $(sdk) SDK"
@@ -524,8 +525,9 @@ $$(PYTHON_STDLIB-$(sdk))/LICENSE.TXT: $$(PYTHON_LIB-$(sdk)) $$(PYTHON_FRAMEWORK-
 	# Merge the binary modules from each target in the $(sdk) SDK into a single binary
 	$$(foreach module,$$(wildcard $$(PYTHON_STDLIB-$$(firstword $$(SDK_TARGETS-$(sdk))))/lib-dynload/*),lipo -create -output $$(PYTHON_STDLIB-$(sdk))/lib-dynload/$$(notdir $$(module)) $$(foreach target,$$(SDK_TARGETS-$(sdk)),$$(PYTHON_STDLIB-$$(target))/lib-dynload/$$(notdir $$(module))); )
 
-	# Create dSYM files for each module
-	$$(foreach module,$$(wildcard $$(PYTHON_STDLIB-$$(firstword $$(SDK_TARGETS-$(sdk))))/lib-dynload/*),dsymutil $$(PYTHON_STDLIB-$(sdk))/lib-dynload/$$(notdir $$(module)); )
+	# # Disable dSYM production (for now)
+	# # Create dSYM files for each module
+	# $$(foreach module,$$(wildcard $$(PYTHON_STDLIB-$$(firstword $$(SDK_TARGETS-$(sdk))))/lib-dynload/*),dsymutil $$(PYTHON_STDLIB-$(sdk))/lib-dynload/$$(notdir $$(module)); )
 
 	# Copy in known-required xcprivacy files.
 	# Libraries linking OpenSSL must provide a privacy manifest. The one in this repository
@@ -669,7 +671,8 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/bin $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/lib $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/platform-config $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
-	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/Python.dSYM $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
+	# Disable dSYM production (for now)
+	# $$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/Python.dSYM $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 
 ifeq ($(filter $(os),iOS visionOS),$(os))
 	@echo ">>> Clone testbed project for $(os)"

From a7aaafeb767c600b243dce02876503ec398a549f Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 4 Jun 2025 12:29:51 +0800
Subject: [PATCH 24/40] Correct issues with testing in CI (#295)

Adds a patch to account for empty testing simulator sets.

Also adds CI to confirm the testbed works in a CI environment.
---
 .github/workflows/ci.yaml | 94 +++++++++++++++++++++++++++++++++------
 patch/Python/Python.patch | 13 ++++++
 2 files changed, 94 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 924ce566..717febef 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -90,16 +90,6 @@ jobs:
       fail-fast: false
       matrix:
         target: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS']
-        include:
-            - briefcase-run-args:
-            - run-tests: false
-
-            - target: macOS
-              run-tests: true
-
-            - target: iOS
-              briefcase-run-args: ' -d "iPhone SE (3rd generation)"'
-              run-tests: true
 
     steps:
     - uses: actions/checkout@v4.1.7
@@ -125,20 +115,98 @@ jobs:
         name: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
 
+  briefcase-testbed:
+    name: Briefcase testbed (${{ matrix.target }})
+    runs-on: macOS-latest
+    needs: [ config, build ]
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ["macOS", "iOS"]
+        include:
+            - briefcase-run-args:
+
+            - target: iOS
+              briefcase-run-args: ' -d "iPhone SE (3rd generation)"'
+
+    steps:
+    - uses: actions/checkout@v4.1.7
+
+    - name: Get build artifact
+      uses: actions/download-artifact@v4.3.0
+      with:
+        pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+        path: dist
+        merge-multiple: true
+
+    - name: Set up Python
+      uses: actions/setup-python@v5.6.0
+      with:
+        # Appending -dev ensures that we can always build the dev release.
+        # It's a no-op for versions that have been published.
+        python-version: ${{ needs.config.outputs.PYTHON_VER }}-dev
+        # Ensure that we *always* use the latest build, not a cached version.
+        # It's an edge case, but when a new alpha is released, we need to use it ASAP.
+        check-latest: true
+
     - uses: actions/checkout@v4.1.7
-      if: matrix.run-tests
       with:
         repository: beeware/Python-support-testbed
         path: Python-support-testbed
 
     - name: Install dependencies
-      if: matrix.run-tests
       run: |
         # Use the development version of Briefcase
         python -m pip install git+https://github.com/beeware/briefcase.git
 
     - name: Run support testbed check
-      if: matrix.run-tests
       timeout-minutes: 10
       working-directory: Python-support-testbed
       run: briefcase run ${{ matrix.target }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\'
+
+  cpython-testbed:
+    name: CPython testbed (${{ matrix.target }})
+    runs-on: macOS-latest
+    needs: [ config, build ]
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ["iOS", "visionOS"]
+
+    steps:
+    - uses: actions/checkout@v4.1.7
+
+    - name: Get build artifact
+      uses: actions/download-artifact@v4.3.0
+      with:
+        pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+        path: dist
+        merge-multiple: true
+
+    - name: Set up Python
+      uses: actions/setup-python@v5.6.0
+      with:
+        # Appending -dev ensures that we can always build the dev release.
+        # It's a no-op for versions that have been published.
+        python-version: ${{ needs.config.outputs.PYTHON_VER }}-dev
+        # Ensure that we *always* use the latest build, not a cached version.
+        # It's an edge case, but when a new alpha is released, we need to use it ASAP.
+        check-latest: true
+
+    - name: Unpack support package
+      run: |
+        mkdir support
+        cd support
+        tar zxvf ../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+
+    - name: Run CPython testbed
+      timeout-minutes: 10
+      working-directory: support
+      run: |
+        # Run a representative subset of CPython core tests:
+        # - test_builtin as a test of core language tools
+        # - test_grammar as a test of core language features
+        # - test_os as a test of system library calls
+        # - test_bz2 as a simple test of third party libraries
+        # - test_ctypes as a test of FFI
+        python -m testbed run -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes
diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index 8db5c523..73c5b5a6 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -1835,6 +1835,19 @@ index c3e261ecd9e..26ef7a95de4 100644
  	<key>CFBundleSupportedPlatforms</key>
  	<array>
  		<string>iPhoneOS</string>
+diff --git a/iOS/testbed/__main__.py b/iOS/testbed/__main__.py
+index c05497ede3a..1146bf3b988 100644
+--- a/iOS/testbed/__main__.py
++++ b/iOS/testbed/__main__.py
+@@ -127,7 +127,7 @@
+ async def select_simulator_device():
+     # List the testing simulators, in JSON format
+     raw_json = await async_check_output(
+-        "xcrun", "simctl", "--set", "testing", "list", "-j"
++        "xcrun", "simctl", "list", "-j"
+     )
+     json_data = json.loads(raw_json)
+ 
 --- /dev/null
 +++ b/tvOS/README.rst
 @@ -0,0 +1,108 @@

From 119de47c967156df1d8c77936bcedc027b1909b0 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 6 Jun 2025 09:49:17 +0800
Subject: [PATCH 25/40] Correct handling of sysconfig._BASE_PREFIX in cross
 environments. (#297)

Ensure that sysconfig._BASE_PREFIX is bound to base_prefix, not prefix.
---
 patch/Python/_cross_target.py.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch/Python/_cross_target.py.tmpl b/patch/Python/_cross_target.py.tmpl
index fbe178fc..458ec074 100644
--- a/patch/Python/_cross_target.py.tmpl
+++ b/patch/Python/_cross_target.py.tmpl
@@ -70,7 +70,7 @@ sysconfig.get_platform = cross_get_platform
 sysconfig._get_sysconfigdata_name = cross_get_sysconfigdata_name
 
 # Ensure module-level values cached at time of import are updated.
-sysconfig._BASE_PREFIX = sys.prefix
+sysconfig._BASE_PREFIX = sys.base_prefix
 sysconfig._BASE_EXEC_PREFIX = sys.base_exec_prefix
 
 # Force sysconfig data to be loaded (and cached).

From 5b1bb20974edd9f6bffcf495d959e134493cc2c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 06:25:01 +1000
Subject: [PATCH 26/40] Bump ncipollo/release-action from 1.16.0 to 1.17.0
 (#299)

Bumps [ncipollo/release-action](https://github.com/ncipollo/release-action) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/ncipollo/release-action/releases)
- [Commits](https://github.com/ncipollo/release-action/compare/v1.16.0...v1.17.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index fd78eeec..7c89ab5a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -47,7 +47,7 @@ jobs:
         merge-multiple: true
 
     - name: Create Release
-      uses: ncipollo/release-action@v1.16.0
+      uses: ncipollo/release-action@v1.17.0
       with:
         name: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}
         tag: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}

From 6366590c4c79d1df145b2e16bd3306c96d0d6fb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 07:52:16 +1000
Subject: [PATCH 27/40] Bump ncipollo/release-action from 1.17.0 to 1.18.0
 (#300)

Bumps [ncipollo/release-action](https://github.com/ncipollo/release-action) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/ncipollo/release-action/releases)
- [Commits](https://github.com/ncipollo/release-action/compare/v1.17.0...v1.18.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7c89ab5a..6767d2ef 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -47,7 +47,7 @@ jobs:
         merge-multiple: true
 
     - name: Create Release
-      uses: ncipollo/release-action@v1.17.0
+      uses: ncipollo/release-action@v1.18.0
       with:
         name: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}
         tag: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}

From 42c9975afc220a80364cde386724ab174b2acd58 Mon Sep 17 00:00:00 2001
From: John <john-xyz@outlook.com>
Date: Tue, 8 Jul 2025 13:15:17 -0500
Subject: [PATCH 28/40] Fix markdown (#302)

---
 USAGE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/USAGE.md b/USAGE.md
index 072ae1ec..3ea37aca 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -3,7 +3,7 @@
 ## The easy way
 
 The easist way to use these packages is by creating a project with
-(Briefcase)[https://github.com/beeware/briefcase]. Briefcase will download
+[Briefcase](https://github.com/beeware/briefcase). Briefcase will download
 pre-compiled versions of these support packages, and add them to an Xcode project
 (or pre-build stub application, in the case of macOS).
 

From 162523d08d8b2d7dcfa4821ba1a2fafcf4b0a53b Mon Sep 17 00:00:00 2001
From: Andrew Murray <3112309+radarhere@users.noreply.github.com>
Date: Tue, 15 Jul 2025 13:11:43 +1000
Subject: [PATCH 29/40] Fixed typos (#305)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ab0b3563..5c0a97d8 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ update-patch:
 	# comparing between the current state of the 3.X branch against the v3.X.Y
 	# tag associated with the release being built. This allows you to
 	# maintain a branch that contains custom patches against the default Python.
-	# The patch archived in this respository is based on github.com/freakboy3742/cpython
+	# The patch archived in this repository is based on github.com/freakboy3742/cpython
 	# Requires patchutils (installable via `brew install patchutils`); this
 	# also means we need to re-introduce homebrew to the path for the filterdiff
 	# call
@@ -333,7 +333,7 @@ $$(PYTHON_LIB-$(target)): $$(PYTHON_SRCDIR-$(target))/python.exe
 
 
 $$(PYTHON_PLATFORM_SITECUSTOMIZE-$(target)):
-	@echo ">>> Create cross-plaform config for $(target)"
+	@echo ">>> Create cross-platform config for $(target)"
 	mkdir -p $$(PYTHON_PLATFORM_CONFIG-$(target))
 	# Create the cross-platform site definition
 	echo "import _cross_$$(ARCH-$(target))_$$(SDK-$(target)); import _cross_venv;" \

From 207110a862a56d34a6876ddfe58c44c7e0e781e4 Mon Sep 17 00:00:00 2001
From: yoorimgye-dw <yoo-rim.gye@dw.com>
Date: Sun, 20 Jul 2025 11:53:15 +0200
Subject: [PATCH 30/40] convert README from .rst to .md (#306)

---
 README.md  | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.rst | 154 ------------------------------------------------
 2 files changed, 168 insertions(+), 154 deletions(-)
 create mode 100644 README.md
 delete mode 100644 README.rst

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..33e689de
--- /dev/null
+++ b/README.md
@@ -0,0 +1,168 @@
+# Python Apple Support
+
+This is a meta-package for building a version of Python that can be
+embedded into a macOS, iOS, tvOS, watchOS, or visionOS project.
+
+**This branch builds a packaged version of Python 3.14**. Other Python
+versions are available by cloning other branches of the main repository:
+
+- [Python 3.9](https://github.com/beeware/Python-Apple-support/tree/3.9)
+- [Python
+  3.10](https://github.com/beeware/Python-Apple-support/tree/3.10)
+- [Python
+  3.11](https://github.com/beeware/Python-Apple-support/tree/3.11)
+- [Python
+  3.12](https://github.com/beeware/Python-Apple-support/tree/3.12)
+- [Python
+  3.13](https://github.com/beeware/Python-Apple-support/tree/3.13)
+
+It works by downloading, patching, and building a fat binary of Python
+and selected pre-requisites, and packaging them as frameworks that can
+be incorporated into an Xcode project. The binary modules in the Python
+standard library are distributed as binaries that can be dynamically
+loaded at runtime.
+
+The macOS package is a re-bundling of the official macOS binary,
+modified so that it is relocatable, with the IDLE, Tkinter and turtle
+packages removed, and the App Store compliance patch applied.
+
+The iOS, tvOS, watchOS, and visionOS packages compiled by this project
+use the official [PEP 730](https://peps.python.org/pep-0730/) code that
+is part of Python 3.13 to provide iOS support; the relevant patches have
+been backported to 3.9-3.12. Additional patches have been applied to add
+tvOS, watchOS, and visionOS support.
+
+The binaries support x86_64 and arm64 for macOS; arm64 for iOS and
+appleTV devices; arm64_32 for watchOS devices; and arm64 for visionOS
+devices. It also supports device simulators on both x86_64 and M1
+hardware, except for visionOS, for which x86_64 simulators are
+officially unsupported. This should enable the code to run on:
+
+- macOS 11 (Big Sur) or later, on:  
+  - MacBook (including MacBooks using Apple Silicon)
+  - iMac (including iMacs using Apple Silicon)
+  - Mac Mini (including Apple Silicon Mac minis)
+  - Mac Studio (all models)
+  - Mac Pro (all models)
+
+- iOS 13.0 or later, on:  
+  - iPhone (6s or later)
+  - iPad (5th gen or later)
+  - iPad Air (all models)
+  - iPad Mini (2 or later)
+  - iPad Pro (all models)
+  - iPod Touch (7th gen or later)
+
+- tvOS 12.0 or later, on:  
+  - Apple TV (4th gen or later)
+
+- watchOS 4.0 or later, on:  
+  - Apple Watch (4th gen or later)
+
+- visionOS 2.0 or later, on:  
+  - Apple Vision Pro
+
+## Quickstart
+
+The easist way to use these packages is by creating a project with
+[Briefcase](https://github.com/beeware/briefcase). Briefcase will
+download pre-compiled versions of these support packages, and add them
+to an Xcode project (or pre-build stub application, in the case of
+macOS).
+
+Pre-built versions of the frameworks can be downloaded from the [Github
+releases page](https://github.com/beeware/Python-Apple-support/releases)
+and added to your project.
+
+Alternatively, to build the frameworks on your own, download/clone this
+repository, and then in the root directory, and run:
+
+- `make` (or `make all`) to build everything.
+- `make macOS` to build everything for macOS.
+- `make iOS` to build everything for iOS.
+- `make tvOS` to build everything for tvOS.
+- `make watchOS` to build everything for watchOS.
+- `make visionOS` to build everything for visionOS.
+
+This should:
+
+1.  Download the original source packages
+2.  Patch them as required for compatibility with the selected OS
+3.  Build the packages as Xcode-compatible XCFrameworks.
+
+The resulting support packages will be packaged as `.tar.gz` files in
+the `dist` folder.
+
+Each support package contains:
+
+- `VERSIONS`, a text file describing the specific versions of code used
+  to build the support package;
+- `Python.xcframework`, a multi-architecture build of the Python runtime
+  library.
+
+On iOS/tvOS/watchOS/visionOS, the `Python.xcframework` contains a slice
+for each supported ABI (device and simulator). The folder containing the
+slice can also be used as a `PYTHONHOME`, as it contains a `bin`,
+`include` and `lib` directory.
+
+The `bin` folder does not contain Python executables (as they can't be
+invoked). However, it *does* contain shell aliases for the compilers
+that are needed to build packages. This is required because Xcode uses
+the `xcrun` alias to dynamically generate the name of binaries, but a
+lot of C tooling expects that `CC` will not contain spaces.
+
+Each slice of an iOS/tvOS/watchOS/visionOS XCframework also contains a
+`platform-config` folder with a subfolder for each supported
+architecture in that slice. These subfolders can be used to make a macOS
+Python environment behave as if it were on an iOS/tvOS/watchOS/visionOS
+device. This works in one of two ways:
+
+1.  **A sitecustomize.py script**. If the `platform-config` subfolder is
+    on your `PYTHONPATH` when a Python interpreter is started, a site
+    customization will be applied that patches methods in `sys`,
+    `sysconfig` and `platform` that are used to identify the system.
+2.  **A make_cross_venv.py script**. If you call `make_cross_venv.py`,
+    providing the location of a virtual environment, the script will add
+    some files to the `site-packages` folder of that environment that
+    will automatically apply the same set of patches as the
+    `sitecustomize.py` script whenever the environment is activated,
+    without any need to modify `PYTHONPATH`. If you use `build` to
+    create an isolated PEP 517 environment to build a wheel, these
+    patches will also be applied to the isolated build environment that
+    is created.
+
+iOS and visionOS distributions also contain a copy of the iOS or
+visionOS `testbed` project - an Xcode project that can be used to run
+test suites of Python code. See the [CPython documentation on testing
+packages](https://docs.python.org/3/using/ios.html#testing-a-python-package)
+for details on how to use this testbed.
+
+For a detailed instructions on using the support package in your own
+project, see the [usage guide](./USAGE.md)
+
+## Building binary wheels
+
+This project packages the Python standard library, but does not address
+building binary wheels. Binary wheels for macOS can be obtained from
+PyPI. [Mobile Forge](https://github.com/beeware/mobile-forge) is a
+project that provides the tooling to build build binary wheels for iOS
+(and potentially for tvOS, watchOS, and visionOS, although that hasn't
+been tested).
+
+## Historical support
+
+The following versions were supported in the past, but are no longer
+maintained:
+
+- [Python 2.7](https://github.com/beeware/Python-Apple-support/tree/2.7)
+  (EOL January 2020)
+- [Python 3.4](https://github.com/beeware/Python-Apple-support/tree/3.4)
+  (EOL March 2019)
+- [Python 3.5](https://github.com/beeware/Python-Apple-support/tree/3.5)
+  (EOL February 2021)
+- [Python 3.6](https://github.com/beeware/Python-Apple-support/tree/3.6)
+  (EOL December 2021)
+- [Python 3.7](https://github.com/beeware/Python-Apple-support/tree/3.7)
+  (EOL September 2022)
+- [Python 3.8](https://github.com/beeware/Python-Apple-support/tree/3.8)
+  (EOL October 2024)
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 06fde6c9..00000000
--- a/README.rst
+++ /dev/null
@@ -1,154 +0,0 @@
-Python Apple Support
-====================
-
-This is a meta-package for building a version of Python that can be embedded
-into a macOS, iOS, tvOS, watchOS, or visionOS project.
-
-**This branch builds a packaged version of Python 3.14**.
-Other Python versions are available by cloning other branches of the main
-repository:
-
-* `Python 3.9 <https://github.com/beeware/Python-Apple-support/tree/3.9>`__
-* `Python 3.10 <https://github.com/beeware/Python-Apple-support/tree/3.10>`__
-* `Python 3.11 <https://github.com/beeware/Python-Apple-support/tree/3.11>`__
-* `Python 3.12 <https://github.com/beeware/Python-Apple-support/tree/3.12>`__
-* `Python 3.13 <https://github.com/beeware/Python-Apple-support/tree/3.13>`__
-
-It works by downloading, patching, and building a fat binary of Python and
-selected pre-requisites, and packaging them as frameworks that can be
-incorporated into an Xcode project. The binary modules in the Python standard
-library are distributed as binaries that can be dynamically loaded at runtime.
-
-The macOS package is a re-bundling of the official macOS binary, modified so that
-it is relocatable, with the IDLE, Tkinter and turtle packages removed, and the
-App Store compliance patch applied.
-
-The iOS, tvOS, watchOS, and visionOS packages compiled by this project use the
-official `PEP 730 <https://peps.python.org/pep-0730/>`__ code that is part of
-Python 3.13 to provide iOS support; the relevant patches have been backported
-to 3.9-3.12. Additional patches have been applied to add tvOS, watchOS, and
-visionOS support.
-
-The binaries support x86_64 and arm64 for macOS; arm64 for iOS and appleTV
-devices; arm64_32 for watchOS devices; and arm64 for visionOS devices. It also
-supports device simulators on both x86_64 and M1 hardware, except for visionOS,
-for which x86_64 simulators are officially unsupported. This should enable the
-code to run on:
-
-* macOS 11 (Big Sur) or later, on:
-    * MacBook (including MacBooks using Apple Silicon)
-    * iMac (including iMacs using Apple Silicon)
-    * Mac Mini (including Apple Silicon Mac minis)
-    * Mac Studio (all models)
-    * Mac Pro (all models)
-* iOS 13.0 or later, on:
-    * iPhone (6s or later)
-    * iPad (5th gen or later)
-    * iPad Air (all models)
-    * iPad Mini (2 or later)
-    * iPad Pro (all models)
-    * iPod Touch (7th gen or later)
-* tvOS 12.0 or later, on:
-    * Apple TV (4th gen or later)
-* watchOS 4.0 or later, on:
-    * Apple Watch (4th gen or later)
-* visionOS 2.0 or later, on:
-    * Apple Vision Pro
-
-Quickstart
-----------
-
-The easist way to use these packages is by creating a project with `Briefcase
-<https://github.com/beeware/briefcase>`__. Briefcase will download pre-compiled
-versions of these support packages, and add them to an Xcode project (or
-pre-build stub application, in the case of macOS).
-
-Pre-built versions of the frameworks can be downloaded from the `Github releases page
-<https://github.com/beeware/Python-Apple-support/releases>`__ and added to your project.
-
-Alternatively, to build the frameworks on your own, download/clone this
-repository, and then in the root directory, and run:
-
-* ``make`` (or ``make all``) to build everything.
-* ``make macOS`` to build everything for macOS.
-* ``make iOS`` to build everything for iOS.
-* ``make tvOS`` to build everything for tvOS.
-* ``make watchOS`` to build everything for watchOS.
-* ``make visionOS`` to build everything for visionOS.
-
-This should:
-
-1. Download the original source packages
-2. Patch them as required for compatibility with the selected OS
-3. Build the packages as Xcode-compatible XCFrameworks.
-
-The resulting support packages will be packaged as ``.tar.gz`` files
-in the ``dist`` folder.
-
-Each support package contains:
-
-* ``VERSIONS``, a text file describing the specific versions of code used to build the
-  support package;
-* ``Python.xcframework``, a multi-architecture build of the Python runtime library.
-
-On iOS/tvOS/watchOS/visionOS, the ``Python.xcframework`` contains a
-slice for each supported ABI (device and simulator). The folder containing the
-slice can also be used as a ``PYTHONHOME``, as it contains a ``bin``, ``include``
-and ``lib`` directory.
-
-The ``bin`` folder does not contain Python executables (as they can't be
-invoked). However, it *does* contain shell aliases for the compilers that are
-needed to build packages. This is required because Xcode uses the ``xcrun``
-alias to dynamically generate the name of binaries, but a lot of C tooling
-expects that ``CC`` will not contain spaces.
-
-Each slice of an iOS/tvOS/watchOS/visionOS XCframework also contains a
-``platform-config`` folder with a subfolder for each supported architecture in
-that slice. These subfolders can be used to make a macOS Python environment
-behave as if it were on an iOS/tvOS/watchOS/visionOS device. This works in one
-of two ways:
-
-1. **A sitecustomize.py script**. If the ``platform-config`` subfolder is on
-   your ``PYTHONPATH`` when a Python interpreter is started, a site
-   customization will be applied that patches methods in ``sys``, ``sysconfig``
-   and ``platform`` that are used to identify the system.
-
-2. **A make_cross_venv.py script**. If you call ``make_cross_venv.py``,
-   providing the location of a virtual environment, the script will add some
-   files to the ``site-packages`` folder of that environment that will
-   automatically apply the same set of patches as the ``sitecustomize.py``
-   script whenever the environment is activated, without any need to modify
-   ``PYTHONPATH``. If you use ``build`` to create an isolated PEP 517
-   environment to build a wheel, these patches will also be applied to the
-   isolated build environment that is created.
-
-iOS and visionOS distributions also contain a copy of the iOS or visionOS
-``testbed`` project - an Xcode project that can be used to run test suites of
-Python code. See the `CPython documentation on testing packages
-<https://docs.python.org/3/using/ios.html#testing-a-python-package>`__ for
-details on how to use this testbed.
-
-For a detailed instructions on using the support package in your own project,
-see the `usage guide <./USAGE.md>`__
-
-Building binary wheels
-----------------------
-
-This project packages the Python standard library, but does not address building
-binary wheels. Binary wheels for macOS can be obtained from PyPI. `Mobile Forge
-<https://github.com/beeware/mobile-forge>`__ is a project that provides the
-tooling to build build binary wheels for iOS (and potentially for tvOS, watchOS,
-and visionOS, although that hasn't been tested).
-
-Historical support
-------------------
-
-The following versions were supported in the past, but are no longer
-maintained:
-
-* `Python 2.7 <https://github.com/beeware/Python-Apple-support/tree/2.7>`__ (EOL January 2020)
-* `Python 3.4 <https://github.com/beeware/Python-Apple-support/tree/3.4>`__ (EOL March 2019)
-* `Python 3.5 <https://github.com/beeware/Python-Apple-support/tree/3.5>`__ (EOL February 2021)
-* `Python 3.6 <https://github.com/beeware/Python-Apple-support/tree/3.6>`__ (EOL December 2021)
-* `Python 3.7 <https://github.com/beeware/Python-Apple-support/tree/3.7>`__ (EOL September 2022)
-* `Python 3.8 <https://github.com/beeware/Python-Apple-support/tree/3.8>`__ (EOL October 2024)

From b65dbf5df8c681b103ead427a86bf454272bc3fe Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Thu, 24 Jul 2025 11:01:02 +0800
Subject: [PATCH 31/40] Update patch for 3.14.0rc1 (#307)

---
 Makefile                  |   2 +-
 patch/Python/Python.patch | 165 ++++++++++++++++++++------------------
 2 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/Makefile b/Makefile
index 5c0a97d8..3579649c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ BUILD_NUMBER=custom
 # of a release cycle, as official binaries won't be published.
 # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
 # PYTHON_VER is the major/minor version (e.g., 3.10)
-PYTHON_VERSION=3.14.0b2
+PYTHON_VERSION=3.14.0rc1
 PYTHON_PKG_VERSION=$(PYTHON_VERSION)
 PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index 73c5b5a6..f9f6d8e2 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -56,7 +56,7 @@ index 8bcd741c446..d8a6f28edba 100644
                  suffix.replace(".so", ".fwork")
                  for suffix in _imp.extension_suffixes()
 diff --git a/Lib/platform.py b/Lib/platform.py
-index 55e211212d4..cad919bc0c4 100644
+index 7dd64de6025..a7e3c77f803 100644
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
 @@ -528,6 +528,78 @@
@@ -282,7 +282,7 @@ index f93b98dd681..0db3dbdce05 100644
              import _osx_support
              osname, release, machine = _osx_support.get_platform_osx(
 diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
-index 1b551254f86..8594f92c097 100644
+index 1c1cbd03d02..1378985de4a 100644
 --- a/Lib/test/datetimetester.py
 +++ b/Lib/test/datetimetester.py
 @@ -7159,9 +7159,9 @@
@@ -298,10 +298,10 @@ index 1b551254f86..8594f92c097 100644
          else:
              extension_loader = "ExtensionFileLoader"
 diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
-index b7cd7940eb1..32243a49e7a 100644
+index 001ecec4dcd..e46a5661fe8 100644
 --- a/Lib/test/support/__init__.py
 +++ b/Lib/test/support/__init__.py
-@@ -558,7 +558,7 @@
+@@ -559,7 +559,7 @@
          sys.platform == "android", f"Android blocks {name} with SELinux"
      )
  
@@ -310,7 +310,7 @@ index b7cd7940eb1..32243a49e7a 100644
      unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
  else:
      unix_shell = None
-@@ -574,7 +574,7 @@
+@@ -575,7 +575,7 @@
  def skip_wasi_stack_overflow():
      return unittest.skipIf(is_wasi, "Exhausts stack on WASI")
  
@@ -403,7 +403,7 @@ index f2e2394089d..2efbbfb0014 100644
      if objc:
          # If objc exists, we know ctypes is also importable.
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index b5703fbe6ae..e436b2efb8e 100644
+index 01e10d1ab20..ddc430beb80 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -209,6 +209,12 @@
@@ -419,7 +419,7 @@ index b5703fbe6ae..e436b2efb8e 100644
  # Option to install to strip binaries
  STRIPFLAG=-s
  
-@@ -2264,7 +2270,7 @@
+@@ -2294,7 +2300,7 @@
  # a full Xcode install that has an iPhone SE (3rd edition) simulator available.
  # This must be run *after* a `make install` has completed the build. The
  # `--with-framework-name` argument *cannot* be used when configuring the build.
@@ -428,7 +428,7 @@ index b5703fbe6ae..e436b2efb8e 100644
  .PHONY: testios
  testios:
  	@if test "$(MACHDEP)" != "ios"; then \
-@@ -2284,11 +2290,41 @@
+@@ -2314,11 +2320,41 @@
  		exit 1;\
  	fi
  
@@ -533,7 +533,7 @@ index 1bb6a05dc11..49febd56a37 100755
  	none--*)
  		# None (no kernel, i.e. freestanding / bare metal),
 diff --git a/configure b/configure
-index 884f8a4b068..7c93d36e717 100755
+index 345822a6c6d..11acfe0ac9f 100755
 --- a/configure
 +++ b/configure
 @@ -982,6 +982,10 @@
@@ -930,7 +930,7 @@ index 884f8a4b068..7c93d36e717 100755
      aarch64-*-linux-android/clang) :
      PY_SUPPORT_TIER=3 ;; #(
      x86_64-*-linux-android/clang) :
-@@ -7686,7 +7911,7 @@
+@@ -7688,7 +7913,7 @@
    case $ac_sys_system in
      Darwin)
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
@@ -939,7 +939,7 @@ index 884f8a4b068..7c93d36e717 100755
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
      *)
        as_fn_error $? "Unknown platform for framework build" "$LINENO" 5;;
-@@ -7752,7 +7977,7 @@
+@@ -7754,7 +7979,7 @@
        BLDLIBRARY='-L. -lpython$(LDVERSION)'
        RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
        ;;
@@ -948,7 +948,7 @@ index 884f8a4b068..7c93d36e717 100755
        LDLIBRARY='libpython$(LDVERSION).dylib'
        ;;
      AIX*)
-@@ -13574,7 +13799,7 @@
+@@ -13570,7 +13795,7 @@
  			BLDSHARED="$LDSHARED"
  		fi
  		;;
@@ -957,7 +957,7 @@ index 884f8a4b068..7c93d36e717 100755
  		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		BLDSHARED="$LDSHARED"
-@@ -13707,7 +13932,7 @@
+@@ -13703,7 +13928,7 @@
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
  	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
  	# -u libsys_s pulls in all symbols in libsys
@@ -966,7 +966,7 @@ index 884f8a4b068..7c93d36e717 100755
  		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
  
  		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -13731,7 +13956,7 @@
+@@ -13727,7 +13952,7 @@
  				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			fi
  			LINKFORSHARED="$LINKFORSHARED"
@@ -975,7 +975,7 @@ index 884f8a4b068..7c93d36e717 100755
  			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
  		fi
  		;;
-@@ -15508,7 +15733,7 @@
+@@ -15504,7 +15729,7 @@
  
              ctypes_malloc_closure=yes
       ;; #(
@@ -984,7 +984,7 @@ index 884f8a4b068..7c93d36e717 100755
  
        ctypes_malloc_closure=yes
       ;; #(
-@@ -19260,12 +19485,6 @@
+@@ -19256,12 +19481,6 @@
  then :
    printf "%s\n" "#define HAVE_DUP3 1" >>confdefs.h
  
@@ -997,7 +997,7 @@ index 884f8a4b068..7c93d36e717 100755
  fi
  ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
  if test "x$ac_cv_func_explicit_bzero" = xyes
-@@ -19326,18 +19545,6 @@
+@@ -19322,18 +19541,6 @@
  then :
    printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h
  
@@ -1016,7 +1016,7 @@ index 884f8a4b068..7c93d36e717 100755
  fi
  ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
  if test "x$ac_cv_func_fpathconf" = xyes
-@@ -19764,24 +19971,6 @@
+@@ -19766,24 +19973,6 @@
  then :
    printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h
  
@@ -1041,7 +1041,7 @@ index 884f8a4b068..7c93d36e717 100755
  fi
  ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
  if test "x$ac_cv_func_pread" = xyes
-@@ -20100,12 +20289,6 @@
+@@ -20102,12 +20291,6 @@
  then :
    printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
  
@@ -1054,7 +1054,7 @@ index 884f8a4b068..7c93d36e717 100755
  fi
  ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
  if test "x$ac_cv_func_sigfillset" = xyes
-@@ -20374,11 +20557,11 @@
+@@ -20376,11 +20559,11 @@
  
  fi
  
@@ -1068,7 +1068,7 @@ index 884f8a4b068..7c93d36e717 100755
    ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
  if test "x$ac_cv_func_getentropy" = xyes
  then :
-@@ -20400,6 +20583,53 @@
+@@ -20402,6 +20585,53 @@
  
  fi
  
@@ -1122,7 +1122,7 @@ index 884f8a4b068..7c93d36e717 100755
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
  printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
  if test ${ac_cv_c_undeclared_builtin_options+y}
-@@ -23844,7 +24074,8 @@
+@@ -23873,7 +24103,8 @@
  
  
  # check for openpty, login_tty, and forkpty
@@ -1132,7 +1132,7 @@ index 884f8a4b068..7c93d36e717 100755
  
    for ac_func in openpty
  do :
-@@ -23958,7 +24189,7 @@
+@@ -23987,7 +24218,7 @@
  fi
  
  done
@@ -1141,7 +1141,7 @@ index 884f8a4b068..7c93d36e717 100755
  printf %s "checking for library containing login_tty... " >&6; }
  if test ${ac_cv_search_login_tty+y}
  then :
-@@ -24141,6 +24372,7 @@
+@@ -24170,6 +24401,7 @@
  fi
  
  done
@@ -1149,7 +1149,7 @@ index 884f8a4b068..7c93d36e717 100755
  
  # check for long file support functions
  ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
-@@ -24406,10 +24638,10 @@
+@@ -24435,10 +24667,10 @@
  
  done
  
@@ -1162,7 +1162,7 @@ index 884f8a4b068..7c93d36e717 100755
  then
  
    for ac_func in clock_settime
-@@ -24726,7 +24958,7 @@
+@@ -24755,7 +24987,7 @@
    e) if test "$cross_compiling" = yes
  then :
  
@@ -1171,7 +1171,7 @@ index 884f8a4b068..7c93d36e717 100755
    ac_cv_buggy_getaddrinfo="no"
  elif test "${enable_ipv6+set}" = set; then
    ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
-@@ -26748,8 +26980,8 @@
+@@ -26777,8 +27009,8 @@
    LIBPYTHON="\$(BLDLIBRARY)"
  fi
  
@@ -1182,7 +1182,7 @@ index 884f8a4b068..7c93d36e717 100755
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
  
-@@ -29619,7 +29851,7 @@
+@@ -29648,7 +29880,7 @@
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
  printf "%s\n" "$as_me: checking for device files" >&6;}
  
@@ -1191,7 +1191,7 @@ index 884f8a4b068..7c93d36e717 100755
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -30129,7 +30361,7 @@
+@@ -30155,7 +30387,7 @@
      with_ensurepip=no ;; #(
    WASI) :
      with_ensurepip=no ;; #(
@@ -1200,7 +1200,7 @@ index 884f8a4b068..7c93d36e717 100755
      with_ensurepip=no ;; #(
    *) :
      with_ensurepip=upgrade
-@@ -31078,7 +31310,7 @@
+@@ -31104,7 +31336,7 @@
    SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
    NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
    Darwin) _PYTHREAD_NAME_MAXLEN=63;;
@@ -1209,7 +1209,7 @@ index 884f8a4b068..7c93d36e717 100755
    FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
    OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
    *) _PYTHREAD_NAME_MAXLEN=;;
-@@ -31110,7 +31342,7 @@
+@@ -31136,7 +31368,7 @@
   ;; #(
      Darwin) :
       ;; #(
@@ -1218,7 +1218,7 @@ index 884f8a4b068..7c93d36e717 100755
  
  
  
-@@ -35272,6 +35504,9 @@
+@@ -35304,6 +35536,9 @@
      "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
      "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
      "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
@@ -1229,7 +1229,7 @@ index 884f8a4b068..7c93d36e717 100755
      "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
      "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
 diff --git a/configure.ac b/configure.ac
-index cf25148bad2..7ab0609bf8a 100644
+index d6059471771..7e1a5ffe604 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -330,6 +330,15 @@
@@ -1587,20 +1587,40 @@ index cf25148bad2..7ab0609bf8a 100644
    [SOABI_PLATFORM=$PLATFORM_TRIPLET]
  )
  
-@@ -1227,6 +1420,12 @@
-   [x86_64-*-freebsd*/clang],         [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
-   [aarch64-apple-ios*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
-   [aarch64-apple-ios*/clang],             [PY_SUPPORT_TIER=3], dnl iOS on ARM64
-+  [aarch64-apple-tvos*-simulator/clang],  [PY_SUPPORT_TIER=3], dnl tvOS Simulator on arm64
-+  [aarch64-apple-tvos*/clang],            [PY_SUPPORT_TIER=3], dnl tvOS on ARM64
-+  [aarch64-apple-watchos*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl watchOS Simulator on arm64
-+  [arm64_32-apple-watchos*/clang],            [PY_SUPPORT_TIER=3], dnl watchOS on ARM64
-+  [aarch64-apple-xros*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl visionOS Simulator on arm64
-+  [aarch64-apple-xros*/clang],            [PY_SUPPORT_TIER=3],    dnl visionOS on ARM64
-   [aarch64-*-linux-android/clang],   [PY_SUPPORT_TIER=3], dnl Android on ARM64
-   [x86_64-*-linux-android/clang],    [PY_SUPPORT_TIER=3], dnl Android on AMD64
- 
-@@ -1536,7 +1735,7 @@
+@@ -1220,16 +1413,22 @@
+   [wasm32-unknown-wasip1/clang],         [PY_SUPPORT_TIER=2], dnl WebAssembly System Interface preview1, clang
+   [x86_64-*-linux-gnu/clang],            [PY_SUPPORT_TIER=2], dnl Linux on AMD64, any vendor, glibc, clang
+ 
+-  [aarch64-pc-windows-msvc/msvc],        [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC
+-  [armv7l-*-linux-gnueabihf/gcc],        [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
+-  [powerpc64le-*-linux-gnu/clang],       [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
+-  [s390x-*-linux-gnu/gcc],               [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
+-  [x86_64-*-freebsd*/clang],             [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
+-  [aarch64-apple-ios*-simulator/clang],  [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
+-  [aarch64-apple-ios*/clang],            [PY_SUPPORT_TIER=3], dnl iOS on ARM64
+-  [aarch64-*-linux-android/clang],       [PY_SUPPORT_TIER=3], dnl Android on ARM64
+-  [x86_64-*-linux-android/clang],        [PY_SUPPORT_TIER=3], dnl Android on AMD64
+-  [wasm32-*-emscripten/emcc],            [PY_SUPPORT_TIER=3], dnl Emscripten
++  [aarch64-pc-windows-msvc/msvc],           [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC
++  [armv7l-*-linux-gnueabihf/gcc],           [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
++  [powerpc64le-*-linux-gnu/clang],          [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
++  [s390x-*-linux-gnu/gcc],                  [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
++  [x86_64-*-freebsd*/clang],                [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
++  [aarch64-apple-ios*-simulator/clang],     [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
++  [aarch64-apple-ios*/clang],               [PY_SUPPORT_TIER=3], dnl iOS on ARM64
++  [aarch64-apple-tvos*-simulator/clang],    [PY_SUPPORT_TIER=3], dnl tvOS Simulator on arm64
++  [aarch64-apple-tvos*/clang],              [PY_SUPPORT_TIER=3], dnl tvOS on ARM64
++  [aarch64-apple-watchos*-simulator/clang], [PY_SUPPORT_TIER=3], dnl watchOS Simulator on arm64
++  [arm64_32-apple-watchos*/clang],          [PY_SUPPORT_TIER=3], dnl watchOS on ARM64
++  [aarch64-apple-xros*-simulator/clang],    [PY_SUPPORT_TIER=3], dnl visionOS Simulator on arm64
++  [aarch64-apple-xros*/clang],              [PY_SUPPORT_TIER=3],    dnl visionOS on ARM64
++  [aarch64-*-linux-android/clang],          [PY_SUPPORT_TIER=3], dnl Android on ARM64
++  [x86_64-*-linux-android/clang],           [PY_SUPPORT_TIER=3], dnl Android on AMD64
++  [wasm32-*-emscripten/emcc],               [PY_SUPPORT_TIER=3], dnl Emscripten
+ 
+   [PY_SUPPORT_TIER=0]
+ )
+@@ -1537,7 +1736,7 @@
    case $ac_sys_system in
      Darwin)
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
@@ -1609,7 +1629,7 @@ index cf25148bad2..7ab0609bf8a 100644
        LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
      *)
        AC_MSG_ERROR([Unknown platform for framework build]);;
-@@ -1601,7 +1800,7 @@
+@@ -1602,7 +1801,7 @@
        BLDLIBRARY='-L. -lpython$(LDVERSION)'
        RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
        ;;
@@ -1618,7 +1638,7 @@ index cf25148bad2..7ab0609bf8a 100644
        LDLIBRARY='libpython$(LDVERSION).dylib'
        ;;
      AIX*)
-@@ -3470,7 +3669,7 @@
+@@ -3469,7 +3668,7 @@
  			BLDSHARED="$LDSHARED"
  		fi
  		;;
@@ -1627,7 +1647,7 @@ index cf25148bad2..7ab0609bf8a 100644
  		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
  		BLDSHARED="$LDSHARED"
-@@ -3594,7 +3793,7 @@
+@@ -3593,7 +3792,7 @@
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
  	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
  	# -u libsys_s pulls in all symbols in libsys
@@ -1636,7 +1656,7 @@ index cf25148bad2..7ab0609bf8a 100644
  		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
  
  		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -3618,7 +3817,7 @@
+@@ -3617,7 +3816,7 @@
  				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			fi
  			LINKFORSHARED="$LINKFORSHARED"
@@ -1645,7 +1665,7 @@ index cf25148bad2..7ab0609bf8a 100644
  			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
  		fi
  		;;
-@@ -4106,7 +4305,7 @@
+@@ -4105,7 +4304,7 @@
        dnl when do we need USING_APPLE_OS_LIBFFI?
        ctypes_malloc_closure=yes
      ],
@@ -1654,7 +1674,7 @@ index cf25148bad2..7ab0609bf8a 100644
        ctypes_malloc_closure=yes
      ],
      [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]
-@@ -5215,9 +5414,9 @@
+@@ -5214,9 +5413,9 @@
  # checks for library functions
  AC_CHECK_FUNCS([ \
    accept4 alarm bind_textdomain_codeset chmod chown clock closefrom close_range confstr \
@@ -1664,9 +1684,9 @@ index cf25148bad2..7ab0609bf8a 100644
 -  fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
 +  fpathconf fstatat ftime ftruncate futimens futimes futimesat \
    gai_strerror getegid geteuid getgid getgrent getgrgid getgrgid_r \
-   getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin \
+   getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin getlogin_r \
    getpeername getpgid getpid getppid getpriority _getpty \
-@@ -5225,8 +5424,7 @@
+@@ -5224,8 +5423,7 @@
    getspnam getuid getwd grantpt if_nameindex initgroups kill killpg lchown linkat \
    lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
    mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
@@ -1676,7 +1696,7 @@ index cf25148bad2..7ab0609bf8a 100644
    pread preadv preadv2 process_vm_readv \
    pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \
    pthread_kill pthread_get_name_np pthread_getname_np pthread_set_name_np
-@@ -5236,7 +5434,7 @@
+@@ -5235,7 +5433,7 @@
    sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \
    sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \
    setitimer setlocale setpgid setpgrp setpriority setregid setresgid \
@@ -1685,7 +1705,7 @@ index cf25148bad2..7ab0609bf8a 100644
    sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
    sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
    sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
-@@ -5251,12 +5449,20 @@
+@@ -5250,12 +5448,20 @@
    AC_CHECK_FUNCS([lchmod])
  fi
  
@@ -1709,8 +1729,8 @@ index cf25148bad2..7ab0609bf8a 100644
  fi
  
  AC_CHECK_DECL([dirfd],
-@@ -5539,20 +5745,22 @@
- ])
+@@ -5550,20 +5756,22 @@
+               [@%:@include <utmp.h>])
  
  # check for openpty, login_tty, and forkpty
 -
@@ -1746,7 +1766,7 @@ index cf25148bad2..7ab0609bf8a 100644
  
  # check for long file support functions
  AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
-@@ -5591,10 +5799,10 @@
+@@ -5602,10 +5810,10 @@
      ])
  ])
  
@@ -1759,7 +1779,7 @@ index cf25148bad2..7ab0609bf8a 100644
  then
    AC_CHECK_FUNCS([clock_settime], [], [
        AC_CHECK_LIB([rt], [clock_settime], [
-@@ -5752,7 +5960,7 @@
+@@ -5763,7 +5971,7 @@
  [ac_cv_buggy_getaddrinfo=no],
  [ac_cv_buggy_getaddrinfo=yes],
  [
@@ -1768,7 +1788,7 @@ index cf25148bad2..7ab0609bf8a 100644
    ac_cv_buggy_getaddrinfo="no"
  elif test "${enable_ipv6+set}" = set; then
    ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
-@@ -6345,8 +6553,8 @@
+@@ -6356,8 +6564,8 @@
    LIBPYTHON="\$(BLDLIBRARY)"
  fi
  
@@ -1779,7 +1799,7 @@ index cf25148bad2..7ab0609bf8a 100644
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
  
-@@ -7005,7 +7213,7 @@
+@@ -7016,7 +7224,7 @@
  dnl NOTE: Inform user how to proceed with files when cross compiling.
  dnl Some cross-compile builds are predictable; they won't ever
  dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
@@ -1788,7 +1808,7 @@ index cf25148bad2..7ab0609bf8a 100644
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -7307,7 +7515,7 @@
+@@ -7316,7 +7524,7 @@
        AS_CASE([$ac_sys_system],
          [Emscripten], [with_ensurepip=no],
          [WASI], [with_ensurepip=no],
@@ -1797,7 +1817,7 @@ index cf25148bad2..7ab0609bf8a 100644
          [with_ensurepip=upgrade]
        )
      ])
-@@ -7694,7 +7902,7 @@
+@@ -7703,7 +7911,7 @@
    SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
    NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
    Darwin) _PYTHREAD_NAME_MAXLEN=63;;
@@ -1806,7 +1826,7 @@ index cf25148bad2..7ab0609bf8a 100644
    FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
    OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
    *) _PYTHREAD_NAME_MAXLEN=;;
-@@ -7719,7 +7927,7 @@
+@@ -7728,7 +7936,7 @@
    [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
    dnl The _scproxy module is available on macOS
    [Darwin], [],
@@ -1835,19 +1855,6 @@ index c3e261ecd9e..26ef7a95de4 100644
  	<key>CFBundleSupportedPlatforms</key>
  	<array>
  		<string>iPhoneOS</string>
-diff --git a/iOS/testbed/__main__.py b/iOS/testbed/__main__.py
-index c05497ede3a..1146bf3b988 100644
---- a/iOS/testbed/__main__.py
-+++ b/iOS/testbed/__main__.py
-@@ -127,7 +127,7 @@
- async def select_simulator_device():
-     # List the testing simulators, in JSON format
-     raw_json = await async_check_output(
--        "xcrun", "simctl", "--set", "testing", "list", "-j"
-+        "xcrun", "simctl", "list", "-j"
-     )
-     json_data = json.loads(raw_json)
- 
 --- /dev/null
 +++ b/tvOS/README.rst
 @@ -0,0 +1,108 @@

From d9eeafc53ef4b4cbe7df5661d5609beac7933b9d Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 28 Jul 2025 13:38:20 +0800
Subject: [PATCH 32/40] Correct cross-platform venv path handling (#310)

Corrects for changes in Python 3.14's handling of sysconfig._init_config_vars(),
ensuring that cross-platform virtual environments have correct include paths.
---
 .github/workflows/ci.yaml          | 99 ++++++++++++++++++++++++------
 .gitignore                         |  2 +
 patch/Python/_cross_target.py.tmpl |  4 +-
 tests/test_cross_env.py            | 93 ++++++++++++++++++++++++++++
 4 files changed, 178 insertions(+), 20 deletions(-)
 create mode 100644 tests/test_cross_env.py

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 717febef..9f5e5f4d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS']
+        platform: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS']
 
     steps:
     - uses: actions/checkout@v4.1.7
@@ -104,29 +104,29 @@ jobs:
         # It's an edge case, but when a new alpha is released, we need to use it ASAP.
         check-latest: true
 
-    - name: Build ${{ matrix.target }}
+    - name: Build ${{ matrix.platform }}
       run: |
-        # Do the build for the requested target.
-        make ${{ matrix.target }} BUILD_NUMBER=${{ needs.config.outputs.BUILD_NUMBER }}
+        # Do the build for the requested platform.
+        make ${{ matrix.platform }} BUILD_NUMBER=${{ needs.config.outputs.BUILD_NUMBER }}
 
     - name: Upload build artefacts
       uses: actions/upload-artifact@v4.6.2
       with:
-        name: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
-        path: dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+        name: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+        path: dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
 
   briefcase-testbed:
-    name: Briefcase testbed (${{ matrix.target }})
+    name: Briefcase testbed (${{ matrix.platform }})
     runs-on: macOS-latest
     needs: [ config, build ]
     strategy:
       fail-fast: false
       matrix:
-        target: ["macOS", "iOS"]
+        platform: ["macOS", "iOS"]
         include:
             - briefcase-run-args:
 
-            - target: iOS
+            - platform: iOS
               briefcase-run-args: ' -d "iPhone SE (3rd generation)"'
 
     steps:
@@ -135,7 +135,7 @@ jobs:
     - name: Get build artifact
       uses: actions/download-artifact@v4.3.0
       with:
-        pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+        pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist
         merge-multiple: true
 
@@ -162,16 +162,16 @@ jobs:
     - name: Run support testbed check
       timeout-minutes: 10
       working-directory: Python-support-testbed
-      run: briefcase run ${{ matrix.target }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\'
+      run: briefcase run ${{ matrix.platform }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\'
 
   cpython-testbed:
-    name: CPython testbed (${{ matrix.target }})
+    name: CPython testbed (${{ matrix.platform }})
     runs-on: macOS-latest
     needs: [ config, build ]
     strategy:
       fail-fast: false
       matrix:
-        target: ["iOS", "visionOS"]
+        platform: ["iOS", "visionOS"]
 
     steps:
     - uses: actions/checkout@v4.1.7
@@ -179,7 +179,7 @@ jobs:
     - name: Get build artifact
       uses: actions/download-artifact@v4.3.0
       with:
-        pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+        pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist
         merge-multiple: true
 
@@ -195,13 +195,13 @@ jobs:
 
     - name: Unpack support package
       run: |
-        mkdir support
-        cd support
-        tar zxvf ../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+        mkdir -p support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }}
+        cd support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }}
+        tar zxvf ../../../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
 
     - name: Run CPython testbed
       timeout-minutes: 10
-      working-directory: support
+      working-directory: support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }}
       run: |
         # Run a representative subset of CPython core tests:
         # - test_builtin as a test of core language tools
@@ -210,3 +210,66 @@ jobs:
         # - test_bz2 as a simple test of third party libraries
         # - test_ctypes as a test of FFI
         python -m testbed run -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes
+
+  crossenv-test:
+    name: Cross-platform env test (${{ matrix.multiarch }})
+    runs-on: macOS-latest
+    needs: [ config, build ]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: iOS
+            slice: ios-arm64_x86_64-simulator
+            multiarch: arm64-iphonesimulator
+          - platform: iOS
+            slice: ios-arm64_x86_64-simulator
+            multiarch: x86_64-iphonesimulator
+          - platform: iOS
+            slice: ios-arm64
+            multiarch: arm64-iphoneos
+
+    steps:
+    - uses: actions/checkout@v4.1.7
+
+    - name: Get build artifact
+      uses: actions/download-artifact@v4.3.0
+      with:
+        pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+        path: dist
+        merge-multiple: true
+
+    - name: Set up Python
+      uses: actions/setup-python@v5.6.0
+      with:
+        # Appending -dev ensures that we can always build the dev release.
+        # It's a no-op for versions that have been published.
+        python-version: ${{ needs.config.outputs.PYTHON_VER }}-dev
+        # Ensure that we *always* use the latest build, not a cached version.
+        # It's an edge case, but when a new alpha is released, we need to use it ASAP.
+        check-latest: true
+
+    - name: Unpack support package
+      run: |
+        mkdir -p support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }}
+        cd support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }}
+        tar zxvf ../../../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
+
+    - name: Run cross-platform environment test
+      env:
+        PYTHON_CROSS_PLATFORM: ${{ matrix.platform }}
+        PYTHON_CROSS_SLICE: ${{ matrix.slice }}
+        PYTHON_CROSS_MULTIARCH: ${{ matrix.multiarch }}
+      run: |
+        # Create and activate a native virtual environment
+        python${{ needs.config.outputs.PYTHON_VER }} -m venv cross-venv
+        source cross-venv/bin/activate
+
+        # Install pytest
+        python -m pip install pytest
+
+        # Convert venv into cross-venv
+        python support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }}/Python.xcframework/${{ matrix.slice }}/platform-config/${{ matrix.multiarch }}/make_cross_venv.py cross-venv
+
+        # Run the test suite
+        python -m pytest tests
diff --git a/.gitignore b/.gitignore
index f8053935..a87e3e2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ tests/testbed/iOS
 *.log
 *.gz
 *.DS_Store
+cross-venv/
+temp
diff --git a/patch/Python/_cross_target.py.tmpl b/patch/Python/_cross_target.py.tmpl
index 458ec074..06303350 100644
--- a/patch/Python/_cross_target.py.tmpl
+++ b/patch/Python/_cross_target.py.tmpl
@@ -11,8 +11,8 @@ import sysconfig
 sys.cross_compiling = True
 sys.platform = "{{platform}}"
 sys.implementation._multiarch = "{{arch}}-{{sdk}}"
-sys.base_prefix = sysconfig.get_config_var("prefix")
-sys.base_exec_prefix = sysconfig.get_config_var("prefix")
+sys.base_prefix = sysconfig._get_sysconfigdata()["prefix"]
+sys.base_exec_prefix = sysconfig._get_sysconfigdata()["prefix"]
 
 ###########################################################################
 # subprocess module patches
diff --git a/tests/test_cross_env.py b/tests/test_cross_env.py
new file mode 100644
index 00000000..34e8c5eb
--- /dev/null
+++ b/tests/test_cross_env.py
@@ -0,0 +1,93 @@
+import os
+import platform
+import sys
+import sysconfig
+from pathlib import Path
+
+import pytest
+
+# To run these tests, the following three environment variables must be set,
+# reflecting the cross-platform environment that is in effect.'
+PYTHON_CROSS_PLATFORM = os.getenv("PYTHON_CROSS_PLATFORM", "unknown")
+PYTHON_CROSS_SLICE = os.getenv("PYTHON_CROSS_SLICE", "unknown")
+PYTHON_CROSS_MULTIARCH = os.getenv("PYTHON_CROSS_MULTIARCH", "unknown")
+
+# Determine some file system anchor points for the tests
+# Assumes that the tests are run in a virtual environment named
+# `cross-venv`,
+VENV_PREFIX = Path(__file__).parent.parent / "cross-venv"
+default_support_base = f"support/{sys.version_info.major}.{sys.version_info.minor}/{PYTHON_CROSS_PLATFORM}"
+SUPPORT_PREFIX = (
+    Path(__file__).parent.parent
+    / os.getenv("PYTHON_SUPPORT_BASE", default_support_base)
+    / "Python.xcframework"
+    / PYTHON_CROSS_SLICE
+)
+
+
+###########################################################################
+# sys
+###########################################################################
+
+def test_sys_platform():
+    assert sys.platform == PYTHON_CROSS_PLATFORM.lower()
+
+
+def test_sys_cross_compiling():
+    assert sys.cross_compiling
+
+
+def test_sys_multiarch():
+    assert sys.implementation._multiarch == PYTHON_CROSS_MULTIARCH
+
+
+def test_sys_base_prefix():
+    assert Path(sys.base_prefix) == SUPPORT_PREFIX
+
+
+def test_sys_base_exec_prefix():
+    assert Path(sys.base_exec_prefix) == SUPPORT_PREFIX
+
+
+###########################################################################
+# platform
+###########################################################################
+
+def test_platform_system():
+    assert platform.system() == PYTHON_CROSS_PLATFORM
+
+
+###########################################################################
+# sysconfig
+###########################################################################
+
+def test_sysconfig_get_platform():
+    parts = sysconfig.get_platform().split("-", 2)
+    assert parts[0] == PYTHON_CROSS_PLATFORM.lower()
+    assert parts[2] == PYTHON_CROSS_MULTIARCH
+
+
+def test_sysconfig_get_sysconfigdata_name():
+    parts = sysconfig._get_sysconfigdata_name().split("_", 4)
+    assert parts[3] == PYTHON_CROSS_PLATFORM.lower()
+    assert parts[4] == PYTHON_CROSS_MULTIARCH
+
+
+@pytest.mark.parametrize(
+    "name, prefix",
+    [
+        # Paths that should be relative to the support folder
+        ("stdlib", SUPPORT_PREFIX),
+        ("include", SUPPORT_PREFIX),
+        ("platinclude", SUPPORT_PREFIX),
+        ("stdlib", SUPPORT_PREFIX),
+        # paths that should be relative to the venv
+        ("platstdlib", VENV_PREFIX),
+        ("purelib", VENV_PREFIX),
+        ("platlib", VENV_PREFIX),
+        ("scripts", VENV_PREFIX),
+        ("data", VENV_PREFIX),
+    ]
+)
+def test_sysconfig_get_paths(name, prefix):
+    assert sysconfig.get_paths()[name].startswith(str(prefix))

From 7ec96c724c3508b85b6ab31d28d6a2c08a18a544 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 08:51:28 +0800
Subject: [PATCH 33/40] Bump actions/download-artifact from 4.3.0 to 5.0.0
 (#312)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.3.0 to 5.0.0.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4.3.0...v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yaml      | 6 +++---
 .github/workflows/release.yaml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9f5e5f4d..36edb3b7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -133,7 +133,7 @@ jobs:
     - uses: actions/checkout@v4.1.7
 
     - name: Get build artifact
-      uses: actions/download-artifact@v4.3.0
+      uses: actions/download-artifact@v5.0.0
       with:
         pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist
@@ -177,7 +177,7 @@ jobs:
     - uses: actions/checkout@v4.1.7
 
     - name: Get build artifact
-      uses: actions/download-artifact@v4.3.0
+      uses: actions/download-artifact@v5.0.0
       with:
         pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist
@@ -233,7 +233,7 @@ jobs:
     - uses: actions/checkout@v4.1.7
 
     - name: Get build artifact
-      uses: actions/download-artifact@v4.3.0
+      uses: actions/download-artifact@v5.0.0
       with:
         pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6767d2ef..dde7312b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -40,7 +40,7 @@ jobs:
     needs: [ config, ci ]
     steps:
     - name: Get build artifacts
-      uses: actions/download-artifact@v4.3.0
+      uses: actions/download-artifact@v5.0.0
       with:
         pattern: Python-*
         path: dist

From 9a9fcf7b4292b803c64c4e80e7677556555233d5 Mon Sep 17 00:00:00 2001
From: Andrew Murray <3112309+radarhere@users.noreply.github.com>
Date: Mon, 18 Aug 2025 08:15:26 +1000
Subject: [PATCH 34/40] Fixed typos (#313)

---
 USAGE.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/USAGE.md b/USAGE.md
index 3ea37aca..b205cdcc 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -2,7 +2,7 @@
 
 ## The easy way
 
-The easist way to use these packages is by creating a project with
+The easiest way to use these packages is by creating a project with
 [Briefcase](https://github.com/beeware/briefcase). Briefcase will download
 pre-compiled versions of these support packages, and add them to an Xcode project
 (or pre-build stub application, in the case of macOS).
@@ -10,7 +10,7 @@ pre-compiled versions of these support packages, and add them to an Xcode projec
 ## The manual way
 
 **NOTE** Briefcase usage is the officially supported approach for using this
-support package. If you are experiencing diffculties, one approach for debugging
+support package. If you are experiencing difficulties, one approach for debugging
 is to generate a "Hello World" project with Briefcase, and compare the project that
 Briefcase has generated with your own project.
 
@@ -28,7 +28,7 @@ generated on iOS and visionOS may be used as rough references as well.
 
 ### Using Objective C
 
-Once you've added the Python XCframework to your project, you'll need to
+Once you've added the Python XCFramework to your project, you'll need to
 initialize the Python runtime in your Objective C code (This is step 10 of the
 iOS guide linked above). This initialization should generally be done as early
 as possible in the application's lifecycle, but definitely needs to be done
@@ -97,7 +97,7 @@ There are 2 ways to access the Python runtime in your project code.
 
 You can use the [Python Embedded C
 API](https://docs.python.org/3/extending/embedding.html) to invoke Python code
-and interact with Python objects. This is a raw C API that is accesible to both
+and interact with Python objects. This is a raw C API that is accessible to both
 Objective C and Swift.
 
 ### PythonKit

From ec2920be1d5ede1708f3be93d9a926a46cb66c1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 19:20:57 +0800
Subject: [PATCH 35/40] Bump actions/checkout from 4 to 5 (#314)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yaml      | 46 +++++++++++++++++++++++++---------
 .github/workflows/publish.yaml |  2 +-
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 36edb3b7..e2782b09 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -56,7 +56,7 @@ jobs:
       XZ_VERSION: ${{ steps.extract.outputs.XZ_VERSION }}
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
 
     - name: Extract config variables
       id: extract
@@ -84,7 +84,7 @@ jobs:
         echo "XZ_VERSION=${XZ_VERSION}" | tee -a ${GITHUB_OUTPUT}
 
   build:
-    runs-on: macOS-latest
+    runs-on: macOS-15
     needs: [ config ]
     strategy:
       fail-fast: false
@@ -92,7 +92,16 @@ jobs:
         platform: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS']
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
+
+    - name: Set up Xcode
+      # GitHub recommends explicitly selecting the desired Xcode version:
+      # https://github.com/actions/runner-images/issues/12541#issuecomment-3083850140
+      # This became a necessity as a result of
+      # https://github.com/actions/runner-images/issues/12541 and
+      # https://github.com/actions/runner-images/issues/12751.
+      run: |
+        sudo xcode-select --switch /Applications/Xcode_16.4.app
 
     - name: Set up Python
       uses: actions/setup-python@v5.6.0
@@ -117,7 +126,7 @@ jobs:
 
   briefcase-testbed:
     name: Briefcase testbed (${{ matrix.platform }})
-    runs-on: macOS-latest
+    runs-on: macOS-15
     needs: [ config, build ]
     strategy:
       fail-fast: false
@@ -127,10 +136,19 @@ jobs:
             - briefcase-run-args:
 
             - platform: iOS
-              briefcase-run-args: ' -d "iPhone SE (3rd generation)"'
+              briefcase-run-args: ' -d "iPhone 16e::iOS 18.5"'
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
+
+    - name: Set up Xcode
+      # GitHub recommends explicitly selecting the desired Xcode version:
+      # https://github.com/actions/runner-images/issues/12541#issuecomment-3083850140
+      # This became a necessity as a result of
+      # https://github.com/actions/runner-images/issues/12541 and
+      # https://github.com/actions/runner-images/issues/12751.
+      run: |
+        sudo xcode-select --switch /Applications/Xcode_16.4.app
 
     - name: Get build artifact
       uses: actions/download-artifact@v5.0.0
@@ -149,7 +167,7 @@ jobs:
         # It's an edge case, but when a new alpha is released, we need to use it ASAP.
         check-latest: true
 
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
       with:
         repository: beeware/Python-support-testbed
         path: Python-support-testbed
@@ -160,21 +178,25 @@ jobs:
         python -m pip install git+https://github.com/beeware/briefcase.git
 
     - name: Run support testbed check
-      timeout-minutes: 10
+      timeout-minutes: 15
       working-directory: Python-support-testbed
       run: briefcase run ${{ matrix.platform }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\'
 
   cpython-testbed:
     name: CPython testbed (${{ matrix.platform }})
-    runs-on: macOS-latest
+    # For now, CPython testbed can't run on macos-15: https://github.com/actions/runner-images/issues/12777
+    runs-on: macOS-14
     needs: [ config, build ]
     strategy:
       fail-fast: false
       matrix:
         platform: ["iOS", "visionOS"]
+        include:
+          - platform: "iOS"
+            testbed-args: '--simulator "iPhone 16e,arch=arm64,OS=18.5"'
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
 
     - name: Get build artifact
       uses: actions/download-artifact@v5.0.0
@@ -200,7 +222,7 @@ jobs:
         tar zxvf ../../../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
 
     - name: Run CPython testbed
-      timeout-minutes: 10
+      timeout-minutes: 15
       working-directory: support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }}
       run: |
         # Run a representative subset of CPython core tests:
@@ -230,7 +252,7 @@ jobs:
             multiarch: arm64-iphoneos
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
 
     - name: Get build artifact
       uses: actions/download-artifact@v5.0.0
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 587abe83..f913f7d9 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -8,7 +8,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Set up Python environment
       uses: actions/setup-python@v5.6.0

From b6e5954e37dec453953bdb534ffd9406d92aaddd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 06:22:10 +0800
Subject: [PATCH 36/40] Bump actions/setup-python from 5.6.0 to 6.0.0 (#318)

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.6.0 to 6.0.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5.6.0...v6.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yaml      | 8 ++++----
 .github/workflows/publish.yaml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e2782b09..e69d4c15 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -104,7 +104,7 @@ jobs:
         sudo xcode-select --switch /Applications/Xcode_16.4.app
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
@@ -158,7 +158,7 @@ jobs:
         merge-multiple: true
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
@@ -206,7 +206,7 @@ jobs:
         merge-multiple: true
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
@@ -262,7 +262,7 @@ jobs:
         merge-multiple: true
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index f913f7d9..9b45abb2 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Set up Python environment
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         python-version: "3.X"
 

From 26982d88bc5d09152214e347446ed57c4d4b3f49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 06:23:26 +0800
Subject: [PATCH 37/40] Bump ncipollo/release-action from 1.18.0 to 1.20.0
 (#317)

Bumps [ncipollo/release-action](https://github.com/ncipollo/release-action) from 1.18.0 to 1.20.0.
- [Release notes](https://github.com/ncipollo/release-action/releases)
- [Commits](https://github.com/ncipollo/release-action/compare/v1.18.0...v1.20.0)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index dde7312b..617fbf58 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -47,7 +47,7 @@ jobs:
         merge-multiple: true
 
     - name: Create Release
-      uses: ncipollo/release-action@v1.18.0
+      uses: ncipollo/release-action@v1.20.0
       with:
         name: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}
         tag: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}

From a3839add56f456add567088d850261c3420e12b3 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun, 28 Sep 2025 21:10:15 +0800
Subject: [PATCH 38/40] Bump to Python 3.14.0rc3. (#319)

---
 .github/workflows/ci.yaml |   18 +-
 Makefile                  |   60 +-
 patch/Python/Python.patch | 9639 ++++++++++++++++++++++++++-----------
 3 files changed, 6836 insertions(+), 2881 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e69d4c15..e5c63bb1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -29,6 +29,9 @@ on:
       XZ_VERSION:
         description: "The XZ version used for the build."
         value: ${{ jobs.config.outputs.XZ_VERSION }}
+      ZSTD_VERSION:
+        description: "The Zstandard version used for the build."
+        value: ${{ jobs.config.outputs.ZSTD_VERSION }}
 
 env:
   FORCE_COLOR: "1"
@@ -54,6 +57,7 @@ jobs:
       MPDECIMAL_VERSION: ${{ steps.extract.outputs.MPDECIMAL_VERSION }}
       OPENSSL_VERSION: ${{ steps.extract.outputs.OPENSSL_VERSION }}
       XZ_VERSION: ${{ steps.extract.outputs.XZ_VERSION }}
+      ZSTD_VERSION: ${{ steps.extract.outputs.ZSTD_VERSION }}
 
     steps:
     - uses: actions/checkout@v5
@@ -68,6 +72,7 @@ jobs:
         MPDECIMAL_VERSION=$(make config | grep "MPDECIMAL_VERSION=" | cut -d "=" -f 2)
         OPENSSL_VERSION=$(make config | grep "OPENSSL_VERSION=" | cut -d "=" -f 2)
         XZ_VERSION=$(make config | grep "XZ_VERSION=" | cut -d "=" -f 2)
+        ZSTD_VERSION=$(make config | grep "ZSTD_VERSION=" | cut -d "=" -f 2)
         if [ -z "${{ inputs.build-number }}" ]; then
           BUILD_NUMBER=custom
         else
@@ -82,6 +87,7 @@ jobs:
         echo "MPDECIMAL_VERSION=${MPDECIMAL_VERSION}" | tee -a ${GITHUB_OUTPUT}
         echo "OPENSSL_VERSION=${OPENSSL_VERSION}" | tee -a ${GITHUB_OUTPUT}
         echo "XZ_VERSION=${XZ_VERSION}" | tee -a ${GITHUB_OUTPUT}
+        echo "ZSTD_VERSION=${ZSTD_VERSION}" | tee -a ${GITHUB_OUTPUT}
 
   build:
     runs-on: macOS-15
@@ -184,16 +190,16 @@ jobs:
 
   cpython-testbed:
     name: CPython testbed (${{ matrix.platform }})
-    # For now, CPython testbed can't run on macos-15: https://github.com/actions/runner-images/issues/12777
-    runs-on: macOS-14
+    runs-on: macOS-15
     needs: [ config, build ]
     strategy:
       fail-fast: false
       matrix:
-        platform: ["iOS", "visionOS"]
+        platform: ["iOS", "tvOS", "visionOS"]
         include:
-          - platform: "iOS"
-            testbed-args: '--simulator "iPhone 16e,arch=arm64,OS=18.5"'
+          # Needed to disambiguate simulator options.
+          - platform: "visionOS"
+            testbed-args: '--simulator "Apple Vision Pro,arch=arm64,OS=2.5"'
 
     steps:
     - uses: actions/checkout@v5
@@ -231,7 +237,7 @@ jobs:
         # - test_os as a test of system library calls
         # - test_bz2 as a simple test of third party libraries
         # - test_ctypes as a test of FFI
-        python -m testbed run -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes
+        python -m testbed run --verbose ${{ matrix.testbed-args }} -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes
 
   crossenv-test:
     name: Cross-platform env test (${{ matrix.multiarch }})
diff --git a/Makefile b/Makefile
index 3579649c..6923b426 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ BUILD_NUMBER=custom
 # of a release cycle, as official binaries won't be published.
 # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
 # PYTHON_VER is the major/minor version (e.g., 3.10)
-PYTHON_VERSION=3.14.0rc1
+PYTHON_VERSION=3.14.0rc3
 PYTHON_PKG_VERSION=$(PYTHON_VERSION)
 PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
@@ -32,6 +32,7 @@ LIBFFI_VERSION=3.4.7-2
 MPDECIMAL_VERSION=4.0.0-2
 OPENSSL_VERSION=3.0.16-2
 XZ_VERSION=5.6.4-2
+ZSTD_VERSION=1.5.7-1
 
 # Supported OS
 OS_LIST=macOS iOS tvOS watchOS visionOS
@@ -41,25 +42,30 @@ CURL_FLAGS=--disable --fail --location --create-dirs --progress-bar
 # macOS targets
 TARGETS-macOS=macosx.x86_64 macosx.arm64
 TRIPLE_OS-macOS=macos
+PLATFORM_NAME-macOS=macOS
 VERSION_MIN-macOS=11.0
 
 # iOS targets
 TARGETS-iOS=iphonesimulator.x86_64 iphonesimulator.arm64 iphoneos.arm64
 TRIPLE_OS-iOS=ios
+PLATFORM_NAME-iOS=iOS
 VERSION_MIN-iOS=13.0
 
 # tvOS targets
 TARGETS-tvOS=appletvsimulator.x86_64 appletvsimulator.arm64 appletvos.arm64
 TRIPLE_OS-tvOS=tvos
+PLATFORM_NAME-tvOS=tvOS
 VERSION_MIN-tvOS=12.0
 
 # watchOS targets
 TARGETS-watchOS=watchsimulator.x86_64 watchsimulator.arm64 watchos.arm64_32
 TRIPLE_OS-watchOS=watchos
+PLATFORM_NAME-watchOS=watchOS
 VERSION_MIN-watchOS=4.0
 
 TARGETS-visionOS=xrsimulator.arm64 xros.arm64
 TRIPLE_OS-visionOS=xros
+PLATFORM_NAME-visionOS=xrOS
 VERSION_MIN-visionOS=2.0
 
 # The architecture of the machine doing the build
@@ -95,7 +101,7 @@ update-patch:
 	# call
 	if [ -z "$(PYTHON_REPO_DIR)" ]; then echo "\n\nPYTHON_REPO_DIR must be set to the root of your Python github checkout\n\n"; fi
 	cd $(PYTHON_REPO_DIR) && \
-		git diff -D v$(PYTHON_VERSION) $(PYTHON_VER)-patched \
+		git diff --no-renames -D v$(PYTHON_VERSION) $(PYTHON_VER)-patched \
 			| PATH="/usr/local/bin:/opt/homebrew/bin:$(PATH)" filterdiff \
 				-X $(PROJECT_DIR)/patch/Python/diff.exclude -p 1 --clean \
 					> $(PROJECT_DIR)/patch/Python/Python.patch
@@ -187,6 +193,26 @@ $$(XZ_LIB-$(target)): downloads/xz-$(XZ_VERSION)-$(target).tar.gz
 	# Ensure the target is marked as clean.
 	touch $$(XZ_LIB-$(target))
 
+###########################################################################
+# Target: zstd (ZStandard)
+###########################################################################
+
+ZSTD_INSTALL-$(target)=$(PROJECT_DIR)/install/$(os)/$(target)/zstd-$(ZSTD_VERSION)
+ZSTD_LIB-$(target)=$$(ZSTD_INSTALL-$(target))/lib/libzstd.a
+
+downloads/zstd-$(ZSTD_VERSION)-$(target).tar.gz:
+	@echo ">>> Download zstd for $(target)"
+	mkdir -p downloads
+	curl $(CURL_FLAGS) -o $$@ \
+		https://github.com/beeware/cpython-apple-source-deps/releases/download/zstd-$(ZSTD_VERSION)/zstd-$(ZSTD_VERSION)-$(target).tar.gz
+
+$$(ZSTD_LIB-$(target)): downloads/zstd-$(ZSTD_VERSION)-$(target).tar.gz
+	@echo ">>> Install zstd for $(target)"
+	mkdir -p $$(ZSTD_INSTALL-$(target))
+	cd $$(ZSTD_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/zstd-$(ZSTD_VERSION)-$(target).tar.gz --exclude="*.dylib"
+	# Ensure the target is marked as clean.
+	touch $$(ZSTD_LIB-$(target))
+
 ###########################################################################
 # Target: mpdecimal
 ###########################################################################
@@ -280,14 +306,15 @@ $$(PYTHON_SRCDIR-$(target))/configure: \
 		$$(LIBFFI_LIB-$(target)) \
 		$$(MPDECIMAL_LIB-$(target)) \
 		$$(OPENSSL_SSL_LIB-$(target)) \
-		$$(XZ_LIB-$(target))
+		$$(XZ_LIB-$(target)) \
+		$$(ZSTD_LIB-$(target))
 	@echo ">>> Unpack and configure Python for $(target)"
 	mkdir -p $$(PYTHON_SRCDIR-$(target))
 	tar zxf downloads/Python-$(PYTHON_VERSION).tar.gz --strip-components 1 -C $$(PYTHON_SRCDIR-$(target))
 	# Apply target Python patches
 	cd $$(PYTHON_SRCDIR-$(target)) && patch -p1 < $(PROJECT_DIR)/patch/Python/Python.patch
 	# Make sure the binary scripts are executable
-	chmod 755 $$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin/*
+	chmod 755 $$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin/*
 	# Touch the configure script to ensure that Make identifies it as up to date.
 	touch $$(PYTHON_SRCDIR-$(target))/configure
 
@@ -295,7 +322,7 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
 		$$(PYTHON_SRCDIR-$(target))/configure
 	# Configure target Python
 	cd $$(PYTHON_SRCDIR-$(target)) && \
-		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin:$(PATH)" \
+		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
 		./configure \
 			LIBLZMA_CFLAGS="-I$$(XZ_INSTALL-$(target))/include" \
 			LIBLZMA_LIBS="-L$$(XZ_INSTALL-$(target))/lib -llzma" \
@@ -305,6 +332,8 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
 			LIBMPDEC_LIBS="-L$$(MPDECIMAL_INSTALL-$(target))/lib -lmpdec" \
 			LIBFFI_CFLAGS="-I$$(LIBFFI_INSTALL-$(target))/include" \
 			LIBFFI_LIBS="-L$$(LIBFFI_INSTALL-$(target))/lib -lffi" \
+            LIBZSTD_CFLAGS="-I$$(ZSTD_INSTALL-$(target))/include" \
+            LIBZSTD_LIBS="-L$$(ZSTD_INSTALL-$(target))/lib -lzstd" \
 			--host=$$(TARGET_TRIPLE-$(target)) \
 			--build=$(HOST_ARCH)-apple-darwin \
 			--with-build-python=$(HOST_PYTHON) \
@@ -317,14 +346,14 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
 $$(PYTHON_SRCDIR-$(target))/python.exe: $$(PYTHON_SRCDIR-$(target))/Makefile
 	@echo ">>> Build Python for $(target)"
 	cd $$(PYTHON_SRCDIR-$(target)) && \
-		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin:$(PATH)" \
+		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
 			make -j8 all \
 			2>&1 | tee -a ../python-$(PYTHON_VERSION).build.log
 
 $$(PYTHON_LIB-$(target)): $$(PYTHON_SRCDIR-$(target))/python.exe
 	@echo ">>> Install Python for $(target)"
 	cd $$(PYTHON_SRCDIR-$(target)) && \
-		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin:$(PATH)" \
+		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
 			make install \
 			2>&1 | tee -a ../python-$(PYTHON_VERSION).install.log
 
@@ -490,15 +519,11 @@ $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h: $$(PYTHON_LIB-$(sdk))
 	mkdir -p $$(PYTHON_INSTALL-$(sdk))/include
 	ln -si ../Python.framework/Headers $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER)
 
-ifeq ($(os), visionOS)
-	echo "Skipping arch-specific header copying for visionOS"
-else
 	# Add the individual headers from each target in an arch-specific name
 	$$(foreach target,$$(SDK_TARGETS-$(sdk)),cp $$(PYTHON_INCLUDE-$$(target))/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig-$$(ARCH-$$(target)).h; )
 
 	# Copy the cross-target header from the source folder of the first target in the $(sdk) SDK
-	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/$(os)/Resources/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h
-endif
+	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/Apple/$(os)/Resources/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h
 
 
 $$(PYTHON_STDLIB-$(sdk))/LICENSE.TXT: $$(PYTHON_LIB-$(sdk)) $$(PYTHON_FRAMEWORK-$(sdk))/Info.plist $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h $$(foreach target,$$(SDK_TARGETS-$(sdk)),$$(PYTHON_PLATFORM_SITECUSTOMIZE-$$(target)))
@@ -666,6 +691,11 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 		-output $$(PYTHON_XCFRAMEWORK-$(os)) $$(foreach sdk,$$(SDKS-$(os)),-framework $$(PYTHON_FRAMEWORK-$$(sdk))) \
 		2>&1 | tee -a support/$(PYTHON_VER)/python-$(os).xcframework.log
 
+	@echo ">>> Install build tools for $(os)"
+	mkdir $$(PYTHON_XCFRAMEWORK-$(os))/build
+	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed/Python.xcframework/build/utils.sh $$(PYTHON_XCFRAMEWORK-$(os))/build
+	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed/Python.xcframework/build/$$(PLATFORM_NAME-$(os))-dylib-Info-template.plist $$(PYTHON_XCFRAMEWORK-$(os))/build
+
 	@echo ">>> Install PYTHONHOME for $(os)"
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/include $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/bin $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
@@ -674,9 +704,9 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 	# Disable dSYM production (for now)
 	# $$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/Python.dSYM $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 
-ifeq ($(filter $(os),iOS visionOS),$(os))
+ifeq ($(filter $(os),iOS tvOS visionOS),$(os))
 	@echo ">>> Clone testbed project for $(os)"
-	$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/$(os)/testbed clone --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
+	$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed clone --platform $(os) --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
 endif
 
 	@echo ">>> Create VERSIONS file for $(os)"
@@ -689,6 +719,7 @@ endif
 	echo "mpdecimal: $(MPDECIMAL_VERSION)" >> support/$(PYTHON_VER)/$(os)/VERSIONS
 	echo "OpenSSL: $(OPENSSL_VERSION)" >> support/$(PYTHON_VER)/$(os)/VERSIONS
 	echo "XZ: $(XZ_VERSION)" >> support/$(PYTHON_VER)/$(os)/VERSIONS
+	echo "Zstandard: $(ZSTD_VERSION)" >> support/$(PYTHON_VER)/$(os)/VERSIONS
 
 dist/Python-$(PYTHON_VER)-$(os)-support.$(BUILD_NUMBER).tar.gz: \
 	$$(PYTHON_XCFRAMEWORK-$(os))/Info.plist \
@@ -757,6 +788,7 @@ config:
 	@echo "MPDECIMAL_VERSION=$(MPDECIMAL_VERSION)"
 	@echo "OPENSSL_VERSION=$(OPENSSL_VERSION)"
 	@echo "XZ_VERSION=$(XZ_VERSION)"
+	@echo "ZSTD_VERSION=$(ZSTD_VERSION)"
 
 # Expand cross-platform build and clean targets for each output product
 clean: $(foreach os,$(OS_LIST),clean-$(os))
diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index f9f6d8e2..89f2a548 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -1,1973 +1,1396 @@
-diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
-index 823a3692fd1..00639dd8488 100644
---- a/Lib/ctypes/__init__.py
-+++ b/Lib/ctypes/__init__.py
-@@ -419,7 +419,7 @@
-         if name:
-             name = _os.fspath(name)
- 
--            # If the filename that has been provided is an iOS/tvOS/watchOS
-+            # If the filename that has been provided is an iOS/tvOS/watchOS/visionOS
-             # .fwork file, dereference the location to the true origin of the
-             # binary.
-             if name.endswith(".fwork"):
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 99504911a3d..527c2f36dd0 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -126,7 +126,7 @@
-                         if (name := _get_module_filename(h)) is not None]
-         return libraries
- 
--elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
-+elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos", "visionos"}:
-     from ctypes.macholib.dyld import dyld_find as _dyld_find
-     def find_library(name):
-         possible = ['lib%s.dylib' % name,
-@@ -425,7 +425,7 @@
- # https://man.openbsd.org/dl_iterate_phdr
- # https://docs.oracle.com/cd/E88353_01/html/E37843/dl-iterate-phdr-3c.html
- if (os.name == "posix" and
--    sys.platform not in {"darwin", "ios", "tvos", "watchos"}):
-+    sys.platform not in {"darwin", "ios", "tvos", "watchos", "visionos"}):
-     import ctypes
-     if hasattr((_libc := ctypes.CDLL(None)), "dl_iterate_phdr"):
- 
-diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
-index 8bcd741c446..d8a6f28edba 100644
---- a/Lib/importlib/_bootstrap_external.py
-+++ b/Lib/importlib/_bootstrap_external.py
-@@ -52,7 +52,7 @@
- 
- # Bootstrap-related code ######################################################
- _CASE_INSENSITIVE_PLATFORMS_STR_KEY = 'win',
--_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'watchos'
-+_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'watchos', 'visionos'
- _CASE_INSENSITIVE_PLATFORMS =  (_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY
-                                 + _CASE_INSENSITIVE_PLATFORMS_STR_KEY)
- 
-@@ -1535,7 +1535,7 @@
-     """
-     extension_loaders = []
-     if hasattr(_imp, 'create_dynamic'):
--        if sys.platform in {"ios", "tvos", "watchos"}:
-+        if sys.platform in {"ios", "tvos", "watchos", "visionos"}:
-             extension_loaders = [(AppleFrameworkLoader, [
-                 suffix.replace(".so", ".fwork")
-                 for suffix in _imp.extension_suffixes()
-diff --git a/Lib/platform.py b/Lib/platform.py
-index 7dd64de6025..a7e3c77f803 100644
---- a/Lib/platform.py
-+++ b/Lib/platform.py
-@@ -528,6 +528,78 @@
-     return IOSVersionInfo(system, release, model, is_simulator)
- 
- 
-+# A namedtuple for tvOS version information.
-+TVOSVersionInfo = collections.namedtuple(
-+    "TVOSVersionInfo",
-+    ["system", "release", "model", "is_simulator"]
-+)
+--- /dev/null
++++ b/Apple/__main__.py
+@@ -0,0 +1,1057 @@
++#!/usr/bin/env python3
++##########################################################################
++# Apple XCframework build script
++#
++# This script simplifies the process of configuring, compiling and packaging an
++# XCframework for an Apple platform.
++#
++# At present, it supports iOS, tvOS, visionOS and watchOS, but it has been
++# constructed so that it could be used on any Apple platform.
++#
++# The simplest entry point is:
++#
++#   $ python Apple ci iOS
++#
++# (replace iOS with tvOS, visionOS or watchOS as required.)
++#
++# which will:
++# * Clean any pre-existing build artefacts
++# * Configure and make a Python that can be used for the build
++# * Configure and make a Python for each supported iOS/tvOS architecture and ABI
++# * Combine the outputs of the builds from the previous step into a single
++#   XCframework, merging binaries into a "fat" binary if necessary
++# * Clone a copy of the testbed, configured to use the XCframework
++# * Construct a tarball containing the release artefacts
++# * Run the test suite using the generated XCframework.
++#
++# This is the complete sequence that would be needed in CI to build and test
++# a candidate release artefact.
++#
++# Each individual step can be invoked individually - there are commands to
++# clean, configure-build, make-build, configure-host, make-host, package, and
++# test.
++#
++# There is also a build command that can be used to combine the configure and
++# make steps for the build Python, an individual host, all hosts, or all
++# builds.
++##########################################################################
++from __future__ import annotations
++
++import argparse
++import os
++import platform
++import re
++import shlex
++import shutil
++import signal
++import subprocess
++import sys
++import sysconfig
++import time
++from collections.abc import Sequence
++from contextlib import contextmanager
++from datetime import datetime, timezone
++from os.path import basename, relpath
++from pathlib import Path
++from subprocess import CalledProcessError
++from typing import Callable
++
++EnvironmentT = dict[str, str]
++ArgsT = Sequence[str | Path]
++
++SCRIPT_NAME = Path(__file__).name
++PYTHON_DIR = Path(__file__).resolve().parent.parent
++
++CROSS_BUILD_DIR = PYTHON_DIR / "cross-build"
++
++HOSTS: dict[str, dict[str, dict[str, str]]] = {
++    # Structure of this data:
++    # * Platform identifier
++    #   * an XCframework slice that must exist for that platform
++    #     * a host triple: the multiarch spec for that host
++    "iOS": {
++        "ios-arm64": {
++            "arm64-apple-ios": "arm64-iphoneos",
++        },
++        "ios-arm64_x86_64-simulator": {
++            "arm64-apple-ios-simulator": "arm64-iphonesimulator",
++            "x86_64-apple-ios-simulator": "x86_64-iphonesimulator",
++        },
++    },
++    "tvOS": {
++        "tvos-arm64": {
++            "arm64-apple-tvos": "arm64-appletvos",
++        },
++        "tvos-arm64_x86_64-simulator": {
++            "arm64-apple-tvos-simulator": "arm64-appletvsimulator",
++            "x86_64-apple-tvos-simulator": "x86_64-appletvsimulator",
++        },
++    },
++    "visionOS": {
++        "xros-arm64": {
++            "arm64-apple-xros": "arm64-xros",
++        },
++        "xros-arm64-simulator": {
++            "arm64-apple-xros-simulator": "arm64-xrsimulator",
++        },
++    },
++    "watchOS": {
++        "watchos-arm64_32": {
++            "arm64_32-apple-watchos": "arm64_32-watchos",
++        },
++        "watchos-arm64_x86_64-simulator": {
++            "arm64-apple-watchos-simulator": "arm64-watchsimulator",
++            "x86_64-apple-watchos-simulator": "x86_64-watchsimulator",
++        },
++    },
++}
 +
 +
-+def tvos_ver(system="", release="", model="", is_simulator=False):
-+    """Get tvOS version information, and return it as a namedtuple:
-+        (system, release, model, is_simulator).
++def subdir(name: str, create: bool = False) -> Path:
++    """Ensure that a cross-build directory for the given name exists."""
++    path = CROSS_BUILD_DIR / name
++    if not path.exists():
++        if not create:
++            sys.exit(
++                f"{path} does not exist. Create it by running the appropriate "
++                f"`configure` subcommand of {SCRIPT_NAME}."
++            )
++        else:
++            path.mkdir(parents=True)
++    return path
 +
-+    If values can't be determined, they are set to values provided as
-+    parameters.
++
++def run(
++    command: ArgsT,
++    *,
++    host: str | None = None,
++    env: EnvironmentT | None = None,
++    log: bool | None = True,
++    **kwargs,
++) -> subprocess.CompletedProcess:
++    """Run a command in an Apple development environment.
++
++    Optionally logs the executed command to the console.
 +    """
-+    if sys.platform == "tvos":
-+        # TODO: Can the iOS implementation be used here?
-+        import _ios_support
-+        result = _ios_support.get_platform_ios()
-+        if result is not None:
-+            return TVOSVersionInfo(*result)
++    kwargs.setdefault("check", True)
++    if env is None:
++        env = os.environ.copy()
 +
-+    return TVOSVersionInfo(system, release, model, is_simulator)
++    if host:
++        host_env = apple_env(host)
++        print_env(host_env)
++        env.update(host_env)
 +
++    if log:
++        print(">", join_command(command))
++    return subprocess.run(command, env=env, **kwargs)
 +
-+# A namedtuple for watchOS version information.
-+WatchOSVersionInfo = collections.namedtuple(
-+    "WatchOSVersionInfo",
-+    ["system", "release", "model", "is_simulator"]
-+)
 +
++def join_command(args: str | Path | ArgsT) -> str:
++    """Format a command so it can be copied into a shell.
 +
-+def watchos_ver(system="", release="", model="", is_simulator=False):
-+    """Get watchOS version information, and return it as a namedtuple:
-+        (system, release, model, is_simulator).
++    Similar to `shlex.join`, but also accepts arguments which are Paths, or a
++    single string/Path outside of a list.
++    """
++    if isinstance(args, (str, Path)):
++        return str(args)
++    else:
++        return shlex.join(map(str, args))
++
++
++def print_env(env: EnvironmentT) -> None:
++    """Format the environment so it can be pasted into a shell."""
++    for key, value in sorted(env.items()):
++        print(f"export {key}={shlex.quote(value)}")
++
++
++def platform_for_host(host):
++    """Determine the platform for a given host triple."""
++    for plat, slices in HOSTS.items():
++        for _, candidates in slices.items():
++            for candidate in candidates:
++                if candidate == host:
++                    return plat
++    raise KeyError(host)
++
++
++def apple_env(host: str) -> EnvironmentT:
++    """Construct an Apple development environment for the given host."""
++    env = {
++        "PATH": ":".join(
++            [
++                str(
++                    PYTHON_DIR
++                    / f"Apple/{platform_for_host(host)}/Resources/bin"
++                ),
++                str(subdir(host) / "prefix"),
++                "/usr/bin",
++                "/bin",
++                "/usr/sbin",
++                "/sbin",
++                "/Library/Apple/usr/bin",
++            ]
++        ),
++    }
 +
-+    If values can't be determined, they are set to values provided as
-+    parameters.
++    return env
++
++
++def delete_path(name: str) -> None:
++    """Delete the named cross-build directory, if it exists."""
++    path = CROSS_BUILD_DIR / name
++    if path.exists():
++        print(f"Deleting {path} ...")
++        shutil.rmtree(path)
++
++
++def all_host_triples(platform: str) -> list[str]:
++    """Return all host triples for the given platform.
++
++    The host triples are the platform definitions used as input to configure
++    (e.g., "arm64-apple-ios-simulator").
 +    """
-+    if sys.platform == "watchos":
-+        # TODO: Can the iOS implementation be used here?
-+        import _ios_support
-+        result = _ios_support.get_platform_ios()
-+        if result is not None:
-+            return WatchOSVersionInfo(*result)
++    triples = []
++    for slice_name, slice_parts in HOSTS[platform].items():
++        triples.extend(list(slice_parts))
++    return triples
++
++
++def clean(context: argparse.Namespace, target: str = "all") -> None:
++    """The implementation of the "clean" command."""
++    # If we're explicitly targeting the build, there's no platform or
++    # distribution artefacts. If we're cleaning tests, we keep all built
++    # artefacts. Otherwise, the built artefacts must be dirty, so we remove
++    # them.
++    if target not in {"build", "test"}:
++        paths = ["dist", context.platform] + list(HOSTS[context.platform])
++    else:
++        paths = []
++
++    if target in {"all", "build"}:
++        paths.append("build")
++
++    if target in {"all", "hosts"}:
++        paths.extend(all_host_triples(context.platform))
++    elif target not in {"build", "test", "package"}:
++        paths.append(target)
++
++    if target in {"all", "hosts", "test"}:
++        paths.extend(
++            [
++                path.name
++                for path in CROSS_BUILD_DIR.glob(
++                    f"{context.platform}-testbed.*"
++                )
++            ]
++        )
 +
-+    return WatchOSVersionInfo(system, release, model, is_simulator)
++    for path in paths:
++        delete_path(path)
 +
 +
-+# A namedtuple for visionOS version information.
-+VisionOSVersionInfo = collections.namedtuple(
-+    "VisionOSVersionInfo",
-+    ["system", "release", "model", "is_simulator"]
-+)
++def build_python_path() -> Path:
++    """The path to the build Python binary."""
++    build_dir = subdir("build")
++    binary = build_dir / "python"
++    if not binary.is_file():
++        binary = binary.with_suffix(".exe")
++        if not binary.is_file():
++            raise FileNotFoundError(
++                f"Unable to find `python(.exe)` in {build_dir}"
++            )
 +
++    return binary
 +
-+def visionos_ver(system="", release="", model="", is_simulator=False):
-+    """Get visionOS version information, and return it as a namedtuple:
-+        (system, release, model, is_simulator).
 +
-+    If values can't be determined, they are set to values provided as
-+    parameters.
++@contextmanager
++def group(text: str):
++    """A context manager that outputs a log marker around a section of a build.
++
++    If running in a GitHub Actions environment, the GitHub syntax for
++    collapsible log sections is used.
 +    """
-+    if sys.platform == "visionos":
-+        # TODO: Can the iOS implementation be used here?
-+        import _ios_support
-+        result = _ios_support.get_platform_ios()
-+        if result is not None:
-+            return VisionOSVersionInfo(*result)
++    if "GITHUB_ACTIONS" in os.environ:
++        print(f"::group::{text}")
++    else:
++        print(f"===== {text} " + "=" * (70 - len(text)))
 +
-+    return VisionOSVersionInfo(system, release, model, is_simulator)
++    yield
 +
++    if "GITHUB_ACTIONS" in os.environ:
++        print("::endgroup::")
++    else:
++        print()
 +
- def _java_getprop(name, default):
-     """This private helper is deprecated in 3.13 and will be removed in 3.15"""
-     from java.lang import System
-@@ -727,7 +799,7 @@
-         default in case the command should fail.
- 
-     """
--    if sys.platform in {'dos', 'win32', 'win16', 'ios', 'tvos', 'watchos'}:
-+    if sys.platform in {'dos', 'win32', 'win16', 'ios', 'tvos', 'watchos', 'visionos'}:
-         # XXX Others too ?
-         return default
- 
-@@ -891,14 +963,30 @@
-             csid, cpu_number = vms_lib.getsyi('SYI$_CPU', 0)
-             return 'Alpha' if cpu_number >= 128 else 'VAX'
- 
--    # On the iOS simulator, os.uname returns the architecture as uname.machine.
--    # On device it returns the model name for some reason; but there's only one
--    # CPU architecture for iOS devices, so we know the right answer.
-+    # On the iOS/tvOS/watchOS/visionOS simulator, os.uname returns the architecture as
-+    # uname.machine. On device it returns the model name for some reason; but
-+    # there's only one CPU architecture for devices, so we know the right
-+    # answer.
-     def get_ios():
-         if sys.implementation._multiarch.endswith("simulator"):
-             return os.uname().machine
-         return 'arm64'
- 
-+    def get_tvos():
-+        if sys.implementation._multiarch.endswith("simulator"):
-+            return os.uname().machine
-+        return 'arm64'
 +
-+    def get_watchos():
-+        if sys.implementation._multiarch.endswith("simulator"):
-+            return os.uname().machine
-+        return 'arm64_32'
++@contextmanager
++def cwd(subdir: Path):
++    """A context manager that sets the current working directory."""
++    orig = os.getcwd()
++    os.chdir(subdir)
++    yield
++    os.chdir(orig)
 +
-+    def get_visionos():
-+        if sys.implementation._multiarch.endswith("simulator"):
-+            return os.uname().machine
-+        return 'arm64'
 +
-     def from_subprocess():
-         """
-         Fall back to `uname -p`
-@@ -1058,9 +1146,15 @@
-         system = 'Android'
-         release = android_ver().release
- 
--    # Normalize responses on iOS
-+    # Normalize responses on Apple mobile platforms
-     if sys.platform == 'ios':
-         system, release, _, _ = ios_ver()
-+    if sys.platform == 'tvos':
-+        system, release, _, _ = tvos_ver()
-+    if sys.platform == 'watchos':
-+        system, release, _, _ = watchos_ver()
-+    if sys.platform == 'visionos':
-+        system, release, _, _ = visionos_ver()
- 
-     vals = system, node, release, version, machine
-     # Replace 'unknown' values with the more portable ''
-@@ -1350,6 +1444,12 @@
-         # macOS and iOS both report as a "Darwin" kernel
-         if sys.platform == "ios":
-             system, release, _, _ = ios_ver()
-+        elif sys.platform == "tvos":
-+            system, release, _, _ = tvos_ver()
-+        elif sys.platform == "watchos":
-+            system, release, _, _ = watchos_ver()
-+        elif sys.platform == "visionos":
-+            system, release, _, _ = visionos_ver()
-         else:
-             macos_release = mac_ver()[0]
-             if macos_release:
-diff --git a/Lib/site.py b/Lib/site.py
-index f9327197159..74899abecb0 100644
---- a/Lib/site.py
-+++ b/Lib/site.py
-@@ -298,8 +298,8 @@
-     if env_base:
-         return env_base
- 
--    # Emscripten, iOS, tvOS, VxWorks, WASI, and watchOS have no home directories
--    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "wasi", "watchos"}:
-+    # Emscripten, iOS, tvOS, visionOS, VxWorks, WASI, and watchOS have no home directories
-+    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "visionos", "wasi", "watchos"}:
-         return None
- 
-     def joinuser(*args):
-diff --git a/Lib/subprocess.py b/Lib/subprocess.py
-index 54c2eb515b6..03896a234bf 100644
---- a/Lib/subprocess.py
-+++ b/Lib/subprocess.py
-@@ -75,7 +75,7 @@
-     _mswindows = True
- 
- # some platforms do not support subprocesses
--_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos"}
-+_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos", "visionos"}
- 
- if _mswindows:
-     import _winapi
-diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index f93b98dd681..0db3dbdce05 100644
---- a/Lib/sysconfig/__init__.py
-+++ b/Lib/sysconfig/__init__.py
-@@ -23,6 +23,9 @@
- _ALWAYS_STR = {
-     'IPHONEOS_DEPLOYMENT_TARGET',
-     'MACOSX_DEPLOYMENT_TARGET',
-+    'TVOS_DEPLOYMENT_TARGET',
-+    'WATCHOS_DEPLOYMENT_TARGET',
-+    'XROS_DEPLOYMENT_TARGET',
- }
- 
- _INSTALL_SCHEMES = {
-@@ -119,7 +122,7 @@
-     # Emscripten, iOS, tvOS, VxWorks, WASI, and watchOS have no home directories.
-     # Use _PYTHON_HOST_PLATFORM to get the correct platform when cross-compiling.
-     system_name = os.environ.get('_PYTHON_HOST_PLATFORM', sys.platform).split('-')[0]
--    if system_name in {"emscripten", "ios", "tvos", "vxworks", "wasi", "watchos"}:
-+    if system_name in {"emscripten", "ios", "tvos", "visionos", "vxworks", "wasi", "watchos"}:
-         return None
- 
-     def joinuser(*args):
-@@ -730,6 +733,18 @@
-             release = get_config_vars().get("IPHONEOS_DEPLOYMENT_TARGET", "13.0")
-             osname = sys.platform
-             machine = sys.implementation._multiarch
-+        elif sys.platform == "tvos":
-+            release = get_config_vars().get("TVOS_DEPLOYMENT_TARGET", "9.0")
-+            osname = sys.platform
-+            machine = sys.implementation._multiarch
-+        elif sys.platform == "watchos":
-+            release = get_config_vars().get("WATCHOS_DEPLOYMENT_TARGET", "4.0")
-+            osname = sys.platform
-+            machine = sys.implementation._multiarch
-+        elif sys.platform == "visionos":
-+            release = get_config_vars().get("XROS_DEPLOYMENT_TARGET", "2.0")
-+            osname = sys.platform
-+            machine = sys.implementation._multiarch
-         else:
-             import _osx_support
-             osname, release, machine = _osx_support.get_platform_osx(
-diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
-index 1c1cbd03d02..1378985de4a 100644
---- a/Lib/test/datetimetester.py
-+++ b/Lib/test/datetimetester.py
-@@ -7159,9 +7159,9 @@
-                     self.assertEqual(dt_orig, dt_rt)
- 
-     def test_type_check_in_subinterp(self):
--        # iOS requires the use of the custom framework loader,
-+        # Apple mobile platforms require the use of the custom framework loader,
-         # not the ExtensionFileLoader.
--        if sys.platform == "ios":
-+        if support.is_apple_mobile:
-             extension_loader = "AppleFrameworkLoader"
-         else:
-             extension_loader = "ExtensionFileLoader"
-diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
-index 001ecec4dcd..e46a5661fe8 100644
---- a/Lib/test/support/__init__.py
-+++ b/Lib/test/support/__init__.py
-@@ -559,7 +559,7 @@
-         sys.platform == "android", f"Android blocks {name} with SELinux"
-     )
- 
--if sys.platform not in {"win32", "vxworks", "ios", "tvos", "watchos"}:
-+if sys.platform not in {"win32", "vxworks", "ios", "tvos", "watchos", "visionos"}:
-     unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
- else:
-     unix_shell = None
-@@ -575,7 +575,7 @@
- def skip_wasi_stack_overflow():
-     return unittest.skipIf(is_wasi, "Exhausts stack on WASI")
- 
--is_apple_mobile = sys.platform in {"ios", "tvos", "watchos"}
-+is_apple_mobile = sys.platform in {"ios", "tvos", "watchos", "visionos"}
- is_apple = is_apple_mobile or sys.platform == "darwin"
- 
- has_fork_support = hasattr(os, "fork") and not (
-diff --git a/Lib/test/test_ctypes/test_dllist.py b/Lib/test/test_ctypes/test_dllist.py
-index 15603dc3d77..bff6c0fb95f 100644
---- a/Lib/test/test_ctypes/test_dllist.py
-+++ b/Lib/test/test_ctypes/test_dllist.py
-@@ -7,7 +7,7 @@
- 
- 
- WINDOWS = os.name == "nt"
--APPLE = sys.platform in {"darwin", "ios", "tvos", "watchos"}
-+APPLE = sys.platform in {"darwin", "ios", "tvos", "watchos", "visionos"}
- 
- if WINDOWS:
-     KNOWN_LIBRARIES = ["KERNEL32.DLL"]
-diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
-index 719c4feace6..92a831a9148 100644
---- a/Lib/test/test_platform.py
-+++ b/Lib/test/test_platform.py
-@@ -271,13 +271,21 @@
-             if sys.platform == "android":
-                 self.assertEqual(res.system, "Android")
-                 self.assertEqual(res.release, platform.android_ver().release)
--            elif sys.platform == "ios":
-+            elif support.is_apple_mobile:
-                 # Platform module needs ctypes for full operation. If ctypes
-                 # isn't available, there's no ObjC module, and dummy values are
-                 # returned.
-                 if _ctypes:
--                    self.assertIn(res.system, {"iOS", "iPadOS"})
--                    self.assertEqual(res.release, platform.ios_ver().release)
-+                    if sys.platform == "ios":
-+                        # iPads also identify as iOS
-+                        self.assertIn(res.system, {"iOS", "iPadOS"})
-+                    else:
-+                        # All other platforms - sys.platform is the lower case
-+                        # form of system (e.g., visionOS->visionos)
-+                        self.assertEqual(res.system.lower(), sys.platform)
-+                    # Use the platform-specific version method
-+                    platform_ver = getattr(platform, f"{sys.platform}_ver")
-+                    self.assertEqual(res.release, platform_ver().release)
-                 else:
-                     self.assertEqual(res.system, "")
-                     self.assertEqual(res.release, "")
-diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
-index 4c3ea1cd8df..04a210e5c86 100644
---- a/Lib/test/test_webbrowser.py
-+++ b/Lib/test/test_webbrowser.py
-@@ -236,7 +236,8 @@
-                    arguments=[f'openURL({URL},new-tab)'])
- 
- 
--@unittest.skipUnless(sys.platform == "ios", "Test only applicable to iOS")
-+@unittest.skipUnless(sys.platform in {"ios", "visionOS"},
-+                     "Test only applicable to iOS and visionOS")
- class IOSBrowserTest(unittest.TestCase):
-     def _obj_ref(self, *args):
-         # Construct a string representation of the arguments that can be used
-diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
-index f2e2394089d..2efbbfb0014 100644
---- a/Lib/webbrowser.py
-+++ b/Lib/webbrowser.py
-@@ -488,7 +488,8 @@
-         # macOS can use below Unix support (but we prefer using the macOS
-         # specific stuff)
- 
--    if sys.platform == "ios":
-+    if sys.platform in {"ios", "visionos"}:
-+        # iOS and visionOS provide a browser; tvOS and watchOS don't.
-         register("iosbrowser", None, IOSBrowser(), preferred=True)
- 
-     if sys.platform == "serenityos":
-@@ -653,9 +654,10 @@
-             return not rc
- 
- #
--# Platform support for iOS
-+# Platform support for Apple Mobile platforms that provide a browser
-+# (i.e., iOS and visionOS)
- #
--if sys.platform == "ios":
-+if sys.platform in {"ios", "visionos"}:
-     from _ios_support import objc
-     if objc:
-         # If objc exists, we know ctypes is also importable.
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 01e10d1ab20..ddc430beb80 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -209,6 +209,12 @@
- # the build, and is only listed here so it will be included in sysconfigdata.
- IPHONEOS_DEPLOYMENT_TARGET=@IPHONEOS_DEPLOYMENT_TARGET@
- 
-+# visionOS Deployment target is *actually* used during the build, by the
-+# compiler shims; export.
-+XROS_DEPLOYMENT_TARGET=@XROS_DEPLOYMENT_TARGET@
-+@EXPORT_XROS_DEPLOYMENT_TARGET@export XROS_DEPLOYMENT_TARGET
++def configure_build_python(context: argparse.Namespace) -> None:
++    """The implementation of the "configure-build" command."""
++    if context.clean:
++        clean(context, "build")
 +
++    with (
++        group("Configuring build Python"),
++        cwd(subdir("build", create=True)),
++    ):
++        command = [relpath(PYTHON_DIR / "configure")]
++        if context.args:
++            command.extend(context.args)
++        run(command)
 +
- # Option to install to strip binaries
- STRIPFLAG=-s
- 
-@@ -2294,7 +2300,7 @@
- # a full Xcode install that has an iPhone SE (3rd edition) simulator available.
- # This must be run *after* a `make install` has completed the build. The
- # `--with-framework-name` argument *cannot* be used when configuring the build.
--XCFOLDER:=iOSTestbed.$(MULTIARCH).$(shell date +%s).$$PPID
-+XCFOLDER-iOS:=iOSTestbed.$(MULTIARCH).$(shell date +%s).$$PPID
- .PHONY: testios
- testios:
- 	@if test "$(MACHDEP)" != "ios"; then \
-@@ -2314,11 +2320,41 @@
- 		exit 1;\
- 	fi
- 
--	# Clone the testbed project into the XCFOLDER
--	$(PYTHON_FOR_BUILD) $(srcdir)/iOS/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
-+	# Clone the testbed project into the XCFOLDER-iOS
-+	$(PYTHON_FOR_BUILD) $(srcdir)/iOS/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER-iOS)"
-+
-+	# Run the testbed project
-+	$(PYTHON_FOR_BUILD) "$(XCFOLDER-iOS)" run --verbose -- test -uall --single-process --rerun -W
-+
-+# Run the test suite on the visionOS simulator. Must be run on a macOS machine with
-+# a full Xcode install that has an Apple Vision Pro simulator available.
-+# This must be run *after* a `make install` has completed the build. The
-+# `--with-framework-name` argument *cannot* be used when configuring the build.
-+XCFOLDER-visionOS:=visionOSTestbed.$(MULTIARCH).$(shell date +%s).$$PPID
-+.PHONY: testvisionos
-+testvisionos:
-+	@if test "$(MACHDEP)" != "visionos"; then \
-+		echo "Cannot run the visionOS testbed for a non-visionOS build."; \
-+		exit 1;\
-+	fi
-+	@if test "$(findstring -xrsimulator,$(MULTIARCH))" != "-xrsimulator"; then \
-+		echo "Cannot run the visionOS testbed for non-simulator builds."; \
-+		exit 1;\
-+	fi
-+	@if test $(PYTHONFRAMEWORK) != "Python"; then \
-+		echo "Cannot run the visionOS testbed with a non-default framework name."; \
-+		exit 1;\
-+	fi
-+	@if ! test -d $(PYTHONFRAMEWORKPREFIX); then \
-+		echo "Cannot find a finalized visionOS Python.framework. Have you run 'make install' to finalize the framework build?"; \
-+		exit 1;\
-+	fi
-+
-+	# Clone the testbed project into the XCFOLDER-visionOS
-+	$(PYTHON_FOR_BUILD) $(srcdir)/visionOS/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER-visionOS)"
- 
- 	# Run the testbed project
--	$(PYTHON_FOR_BUILD) "$(XCFOLDER)" run --verbose -- test -uall --single-process --rerun -W
-+	$(PYTHON_FOR_BUILD) "$(XCFOLDER-visionOS)" run --verbose -- test -uall --single-process --rerun -W
- 
- # Like test, but using --slow-ci which enables all test resources and use
- # longer timeout. Run an optional pybuildbot.identify script to include
-diff --git a/Misc/platform_triplet.c b/Misc/platform_triplet.c
-index f5cd73bdea8..6c1863c943b 100644
---- a/Misc/platform_triplet.c
-+++ b/Misc/platform_triplet.c
-@@ -257,6 +257,32 @@
- #    else
- PLATFORM_TRIPLET=arm64-iphoneos
- #    endif
-+#  elif defined(TARGET_OS_TV) && TARGET_OS_TV
-+#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
-+#      if __x86_64__
-+PLATFORM_TRIPLET=x86_64-appletvsimulator
-+#      else
-+PLATFORM_TRIPLET=arm64-appletvsimulator
-+#      endif
-+#    else
-+PLATFORM_TRIPLET=arm64-appletvos
-+#    endif
-+#  elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH
-+#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
-+#      if __x86_64__
-+PLATFORM_TRIPLET=x86_64-watchsimulator
-+#      else
-+PLATFORM_TRIPLET=arm64-watchsimulator
-+#      endif
-+#    else
-+PLATFORM_TRIPLET=arm64_32-watchos
-+#    endif
-+#  elif defined(TARGET_OS_VISION) && TARGET_OS_VISION
-+#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
-+PLATFORM_TRIPLET=arm64-xrsimulator
-+#    else
-+PLATFORM_TRIPLET=arm64-xros
-+#    endif
- // Older macOS SDKs do not define TARGET_OS_OSX
- #  elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX
- PLATFORM_TRIPLET=darwin
-diff --git a/config.sub b/config.sub
-index 1bb6a05dc11..49febd56a37 100755
---- a/config.sub
-+++ b/config.sub
-@@ -1743,7 +1743,7 @@
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
- 	     | hiux* | abug | nacl* | netware* | windows* \
--	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
-+	     | os9* | macos* | osx* | ios* | tvos* | watchos* | xros* \
- 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
- 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
- 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
-@@ -1867,7 +1867,7 @@
- 		;;
- 	*-eabi*- | *-gnueabi*-)
- 		;;
--	ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
-+	ios*-simulator- | tvos*-simulator- | watchos*-simulator- | xros*-simulator-)
- 		;;
- 	none--*)
- 		# None (no kernel, i.e. freestanding / bare metal),
-diff --git a/configure b/configure
-index 345822a6c6d..11acfe0ac9f 100755
---- a/configure
-+++ b/configure
-@@ -982,6 +982,10 @@
- CFLAGS
- CC
- HAS_XCRUN
-+EXPORT_XROS_DEPLOYMENT_TARGET
-+XROS_DEPLOYMENT_TARGET
-+WATCHOS_DEPLOYMENT_TARGET
-+TVOS_DEPLOYMENT_TARGET
- IPHONEOS_DEPLOYMENT_TARGET
- EXPORT_MACOSX_DEPLOYMENT_TARGET
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET
-@@ -4116,6 +4120,15 @@
- 	*-apple-ios*)
- 		ac_sys_system=iOS
- 		;;
-+	*-apple-tvos*)
-+		ac_sys_system=tvOS
-+		;;
-+	*-apple-watchos*)
-+		ac_sys_system=watchOS
-+		;;
-+	*-apple-xros*)
-+		ac_sys_system=visionOS
-+		;;
- 	*-*-darwin*)
- 		ac_sys_system=Darwin
- 		;;
-@@ -4197,7 +4210,7 @@
- # On cross-compile builds, configure will look for a host-specific compiler by
- # prepending the user-provided host triple to the required binary name.
- #
--# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
-+# On iOS/tvOS/watchOS/visionOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
- # which isn't a binary that exists, and isn't very convenient, as it contains the
- # iOS version. As the default cross-compiler name won't exist, configure falls
- # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
-@@ -4212,6 +4225,17 @@
- 		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
- 		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
- 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
 +
-+		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
-+		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
-+		x86_64-apple-tvos*-simulator)  AR=x86_64-apple-tvos-simulator-ar ;;
++def make_build_python(context: argparse.Namespace) -> None:
++    """The implementation of the "make-build" command."""
++    with (
++        group("Compiling build Python"),
++        cwd(subdir("build")),
++    ):
++        run(["make", "-j", str(os.cpu_count())])
 +
-+		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
-+		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
-+		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
 +
-+		aarch64-apple-xros*-simulator) AR=arm64-apple-xros-simulator-ar ;;
-+		aarch64-apple-xros*)           AR=arm64-apple-xros-ar ;;
- 		*)
- 	esac
- fi
-@@ -4220,6 +4244,17 @@
- 		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
- 		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
- 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
++def apple_target(host: str) -> str:
++    """Return the Apple platform identifier for a given host triple."""
++    for _, platform_slices in HOSTS.items():
++        for slice_name, slice_parts in platform_slices.items():
++            for host_triple, multiarch in slice_parts.items():
++                if host == host_triple:
++                    return ".".join(multiarch.split("-")[::-1])
 +
-+		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
-+		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
-+		x86_64-apple-tvos*-simulator)  CC=x86_64-apple-tvos-simulator-clang ;;
++    raise KeyError(host)
 +
-+		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
-+		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
-+		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
 +
-+		aarch64-apple-xros*-simulator) CC=arm64-apple-xros-simulator-clang ;;
-+		aarch64-apple-xros*)           CC=arm64-apple-xros-clang ;;
- 		*)
- 	esac
- fi
-@@ -4228,6 +4263,17 @@
- 		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
- 		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
- 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
++def apple_multiarch(host: str) -> str:
++    """Return the multiarch descriptor for a given host triple."""
++    for _, platform_slices in HOSTS.items():
++        for slice_name, slice_parts in platform_slices.items():
++            for host_triple, multiarch in slice_parts.items():
++                if host == host_triple:
++                    return multiarch
 +
-+		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
-+		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
-+		x86_64-apple-tvos*-simulator)  CPP=x86_64-apple-tvos-simulator-cpp ;;
++    raise KeyError(host)
 +
-+		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
-+		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
-+		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
 +
-+		aarch64-apple-xros*-simulator) CPP=arm64-apple-xros-simulator-cpp ;;
-+		aarch64-apple-xros*)           CPP=arm64-apple-xros-cpp ;;
- 		*)
- 	esac
- fi
-@@ -4236,6 +4282,17 @@
- 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
- 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
- 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
++def unpack_deps(
++    platform: str,
++    host: str,
++    prefix_dir: Path,
++    cache_dir: Path,
++) -> None:
++    """Unpack binary dependencies into a provided directory.
 +
-+		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
-+		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
-+		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
++    Downloads binaries if they aren't already present. Downloads will be stored
++    in provided cache directory.
 +
-+		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
-+		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
-+		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
++    On non-macOS platforms, as a safety mechanism, any dynamic libraries will be
++    purged from the unpacked dependencies.
++    """
++    deps_url = "https://github.com/beeware/cpython-apple-source-deps/releases/download"
++    for name_ver in [
++        "BZip2-1.0.8-2",
++        "libFFI-3.4.7-2",
++        "OpenSSL-3.0.17-1",
++        "XZ-5.6.4-2",
++        "mpdecimal-4.0.0-2",
++        "zstd-1.5.7-1",
++    ]:
++        filename = f"{name_ver.lower()}-{apple_target(host)}.tar.gz"
++        archive_path = download(
++            f"{deps_url}/{name_ver}/{filename}",
++            target_dir=cache_dir,
++        )
++        shutil.unpack_archive(archive_path, prefix_dir)
 +
-+		aarch64-apple-xros*-simulator) CXX=arm64-apple-xros-simulator-clang++ ;;
-+		aarch64-apple-xros*)           CXX=arm64-apple-xros-clang++ ;;
- 		*)
- 	esac
- fi
-@@ -4358,8 +4415,11 @@
- 	case $enableval in
- 	yes)
- 		case $ac_sys_system in
--			Darwin) enableval=/Library/Frameworks ;;
--			iOS)    enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
-+			Darwin)  enableval=/Library/Frameworks ;;
-+			iOS)     enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
-+			tvOS)    enableval=tvOS/Frameworks/\$\(MULTIARCH\) ;;
-+			watchOS) enableval=watchOS/Frameworks/\$\(MULTIARCH\) ;;
-+			visionOS) enableval=visionOS/Frameworks/\$\(MULTIARCH\) ;;
- 			*) as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
- 		esac
- 	esac
-@@ -4368,6 +4428,9 @@
- 	no)
- 		case $ac_sys_system in
- 			iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
-+			tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
-+			watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
-+			visionOS) as_fn_error $? "visionOS builds must use --enable-framework" "$LINENO" 5 ;;
- 			*)
- 				PYTHONFRAMEWORK=
- 				PYTHONFRAMEWORKDIR=no-framework
-@@ -4474,6 +4537,51 @@
- 
- 				ac_config_files="$ac_config_files iOS/Resources/Info.plist"
- 
-+				;;
-+			tvOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++    # Dynamic libraries will be preferentially linked over static; On non-macOS
++    # platforms, ensure that no dylibs are available in the prefix folder.
++    if platform != "macOS":
++        for dylib in prefix_dir.glob("**/*.dylib"):
++            dylib.unlink()
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=tvOS/Resources
 +
-+				ac_config_files="$ac_config_files tvOS/Resources/Info.plist"
++def download(url: str, target_dir: Path) -> Path:
++    """Download the specified URL into the given directory.
 +
-+				;;
-+			watchOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++    :return: The path to the downloaded archive.
++    """
++    target_path = Path(target_dir).resolve()
++    target_path.mkdir(exist_ok=True, parents=True)
++
++    out_path = target_path / basename(url)
++    if not Path(out_path).is_file():
++        run(
++            [
++                "curl",
++                "-Lf",
++                "--retry",
++                "5",
++                "--retry-all-errors",
++                "-o",
++                out_path,
++                url,
++            ]
++        )
++    else:
++        print(f"Using cached version of {basename(url)}")
++    return out_path
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=watchOS/Resources
 +
-+				ac_config_files="$ac_config_files watchOS/Resources/Info.plist"
++def configure_host_python(
++    context: argparse.Namespace,
++    host: str | None = None,
++) -> None:
++    """The implementation of the "configure-host" command."""
++    if host is None:
++        host = context.host
 +
-+				;;
-+			visionOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++    if context.clean:
++        clean(context, host)
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=visionOS/Resources
++    host_dir = subdir(host, create=True)
++    prefix_dir = host_dir / "prefix"
 +
-+				ac_config_files="$ac_config_files visionOS/Resources/Info.plist"
++    with group(f"Downloading dependencies ({host})"):
++        if not prefix_dir.exists():
++            prefix_dir.mkdir()
++            unpack_deps(context.platform, host, prefix_dir, context.cache_dir)
++        else:
++            print("Dependencies already installed")
++
++    with (
++        group(f"Configuring host Python ({host})"),
++        cwd(host_dir),
++    ):
++        command = [
++            # Basic cross-compiling configuration
++            relpath(PYTHON_DIR / "configure"),
++            f"--host={host}",
++            f"--build={sysconfig.get_config_var('BUILD_GNU_TYPE')}",
++            f"--with-build-python={build_python_path()}",
++            "--with-system-libmpdec",
++            "--enable-ipv6",
++            "--enable-framework",
++            # Dependent libraries.
++            f"--with-openssl={prefix_dir}",
++            f"LIBLZMA_CFLAGS=-I{prefix_dir}/include",
++            f"LIBLZMA_LIBS=-L{prefix_dir}/lib -llzma",
++            f"LIBFFI_CFLAGS=-I{prefix_dir}/include",
++            f"LIBFFI_LIBS=-L{prefix_dir}/lib -lffi",
++            f"LIBMPDEC_CFLAGS=-I{prefix_dir}/include",
++            f"LIBMPDEC_LIBS=-L{prefix_dir}/lib -lmpdec",
++            f"LIBZSTD_CFLAGS=-I{prefix_dir}/include",
++            f"LIBZSTD_LIBS=-L{prefix_dir}/lib -lzstd",
++        ]
 +
- 				;;
- 			*)
- 				as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
-@@ -4485,6 +4593,9 @@
-   e)
- 	case $ac_sys_system in
- 		iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
-+		tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
-+		watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
-+		visionOS) as_fn_error $? "visionOS builds must use --enable-framework" "$LINENO" 5 ;;
- 		*)
- 			PYTHONFRAMEWORK=
- 			PYTHONFRAMEWORKDIR=no-framework
-@@ -4539,8 +4650,8 @@
-     case "$withval" in
-     yes)
-       case $ac_sys_system in
--        Darwin|iOS)
--          # iOS is able to share the macOS patch
-+        Darwin|iOS|tvOS|watchOS|visionOS)
-+          # iOS/tvOS/watchOS/visionOS is able to share the macOS patch
-           APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
-           ;;
-         *) as_fn_error $? "no default app store compliance patch available for $ac_sys_system" "$LINENO" 5 ;;
-@@ -4558,8 +4669,8 @@
- else case e in #(
-   e)
-     case $ac_sys_system in
--      iOS)
--        # Always apply the compliance patch on iOS; we can use the macOS patch
-+      iOS|tvOS|watchOS|visionOS)
-+        # Always apply the compliance patch on iOS/tvOS/watchOS/visionOS; we can use the macOS patch
-         APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: applying default app store compliance patch" >&5
- printf "%s\n" "applying default app store compliance patch" >&6; }
-@@ -4577,6 +4688,8 @@
- 
- 
- 
-+EXPORT_XROS_DEPLOYMENT_TARGET='#'
++        if context.args:
++            command.extend(context.args)
++        run(command, host=host)
 +
- 
- if test "$cross_compiling" = yes; then
- 	case "$host" in
-@@ -4614,6 +4727,78 @@
- 				;;
- 		esac
- 		;;
-+	*-apple-tvos*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
 +
-+		# TVOS_DEPLOYMENT_TARGET is the minimum supported tvOS version
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking tvOS deployment target" >&5
-+printf %s "checking tvOS deployment target... " >&6; }
-+		TVOS_DEPLOYMENT_TARGET=${_host_os:4}
-+		TVOS_DEPLOYMENT_TARGET=${TVOS_DEPLOYMENT_TARGET:=12.0}
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TVOS_DEPLOYMENT_TARGET" >&5
-+printf "%s\n" "$TVOS_DEPLOYMENT_TARGET" >&6; }
++def make_host_python(
++    context: argparse.Namespace,
++    host: str | None = None,
++) -> None:
++    """The implementation of the "make-host" command."""
++    if host is None:
++        host = context.host
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${TVOS_DEPLOYMENT_TARGET}-arm64-appletv${_host_device}
-+				;;
-+			*)
-+				_host_ident=${TVOS_DEPLOYMENT_TARGET}-$host_cpu-appletv${_host_device}
-+				;;
-+		esac
-+		;;
-+	*-apple-watchos*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
++    with (
++        group(f"Compiling host Python ({host})"),
++        cwd(subdir(host)),
++    ):
++        run(["make", "-j", str(os.cpu_count())], host=host)
++        run(["make", "install"], host=host)
 +
-+		# WATCHOS_DEPLOYMENT_TARGET is the minimum supported watchOS version
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking watchOS deployment target" >&5
-+printf %s "checking watchOS deployment target... " >&6; }
-+		WATCHOS_DEPLOYMENT_TARGET=${_host_os:7}
-+		WATCHOS_DEPLOYMENT_TARGET=${WATCHOS_DEPLOYMENT_TARGET:=4.0}
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WATCHOS_DEPLOYMENT_TARGET" >&5
-+printf "%s\n" "$WATCHOS_DEPLOYMENT_TARGET" >&6; }
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-arm64-watch${_host_device}
-+				;;
-+			*)
-+				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
-+				;;
-+		esac
-+		;;
-+	*-apple-xros*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
++def framework_path(host_triple: str, multiarch: str) -> Path:
++    """The path to a built single-architecture framework product.
 +
-+		# XROS_DEPLOYMENT_TARGET is the minimum supported visionOS version
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking visionOS deployment target" >&5
-+printf %s "checking visionOS deployment target... " >&6; }
-+		XROS_DEPLOYMENT_TARGET=${_host_os:8}
-+		XROS_DEPLOYMENT_TARGET=${XROS_DEPLOYMENT_TARGET:=2.0}
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XROS_DEPLOYMENT_TARGET" >&5
-+printf "%s\n" "$XROS_DEPLOYMENT_TARGET" >&6; }
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking exporting flag of visionOS deployment target" >&5
-+printf %s "checking exporting flag of visionOS deployment target... " >&6; }
-+        	export XROS_DEPLOYMENT_TARGET
-+		EXPORT_XROS_DEPLOYMENT_TARGET=''
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXPORT_XROS_DEPLOYMENT_TARGET" >&5
-+printf "%s\n" "$EXPORT_XROS_DEPLOYMENT_TARGET" >&6; }
++    :param host_triple: The host triple (e.g., arm64-apple-ios-simulator)
++    :param multiarch: The multiarch identifier (e.g., arm64-simulator)
++    """
++    return (
++        CROSS_BUILD_DIR
++        / f"{host_triple}/Apple/{platform_for_host(host_triple)}/Frameworks/{multiarch}"
++    )
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${XROS_DEPLOYMENT_TARGET}-arm64-xr${_host_device}
-+				;;
-+			*)
-+				_host_ident=${XROS_DEPLOYMENT_TARGET}-$host_cpu-xr${_host_device}
-+				;;
-+		esac
-+		;;
- 	*-*-darwin*)
- 		case "$host_cpu" in
- 		arm*)
-@@ -4704,9 +4889,15 @@
-     define_xopen_source=no;;
-   Darwin/[12][0-9].*)
-     define_xopen_source=no;;
--  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
-+  # On iOS/tvOS/watchOS/visionOS, defining _POSIX_C_SOURCE also disables platform specific features.
-   iOS/*)
-     define_xopen_source=no;;
-+  tvOS/*)
-+    define_xopen_source=no;;
-+  watchOS/*)
-+    define_xopen_source=no;;
-+  visionOS/*)
-+    define_xopen_source=no;;
-   # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
-   # defining NI_NUMERICHOST.
-   QNX/6.3.2)
-@@ -4769,7 +4960,13 @@
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
- EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
- 
--# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
-+# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
-+# WATCHOS_DEPLOYMENT_TARGET / XROS_DEPLOYMENT_TARGET enforced by the selected host triple.
 +
++def package_version(prefix_path: Path) -> str:
++    """Extract the Python version being built from patchlevel.h."""
++    for path in prefix_path.glob("**/patchlevel.h"):
++        text = path.read_text(encoding="utf-8")
++        if match := re.search(
++            r'\n\s*#define\s+PY_VERSION\s+"(.+)"\s*\n', text
++        ):
++            version = match[1]
++            # If not building against a tagged commit, add a timestamp to the
++            # version. Follow the PyPA version number rules, as this will make
++            # it easier to process with other tools. The version will have a
++            # `+` suffix once any official release has been made; a freshly
++            # forked main branch will have a version of 3.X.0a0.
++            if version.endswith("a0"):
++                version += "+"
++            if version.endswith("+"):
++                version += datetime.now(timezone.utc).strftime("%Y%m%d.%H%M%S")
++
++            return version
++
++    sys.exit("Unable to determine Python version being packaged.")
++
++
++def lib_platform_files(dirname, names):
++    """A file filter that ignores platform-specific files in the lib directory."""
++    path = Path(dirname)
++    if (
++        path.parts[-3] == "lib"
++        and path.parts[-2].startswith("python")
++        and path.parts[-1] == "lib-dynload"
++    ):
++        return names
++    elif path.parts[-2] == "lib" and path.parts[-1].startswith("python"):
++        ignored_names = set(
++            name
++            for name in names
++            if (
++                name.startswith("_sysconfigdata_")
++                or name.startswith("_sysconfig_vars_")
++                or name == "build-details.json"
++            )
++        )
++    else:
++        ignored_names = set()
 +
++    return ignored_names
 +
 +
-+# XROS_DEPLOYMENT_TARGET should get exported
- 
- 
- # checks for alternative programs
-@@ -4810,6 +5007,16 @@
-     as_fn_append CFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
-     as_fn_append LDFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
-    ;; #(
-+  tvOS) :
++def lib_non_platform_files(dirname, names):
++    """A file filter that ignores anything *except* platform-specific files
++    in the lib directory.
++    """
++    path = Path(dirname)
++    if path.parts[-2] == "lib" and path.parts[-1].startswith("python"):
++        return (
++            set(names) - lib_platform_files(dirname, names) - {"lib-dynload"}
++        )
++    else:
++        return set()
 +
-+    as_fn_append CFLAGS " -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"
-+    as_fn_append LDFLAGS " -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"
-+   ;; #(
-+  watchOS) :
 +
-+    as_fn_append CFLAGS " -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"
-+    as_fn_append LDFLAGS " -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"
-+   ;; #(
-   *) :
-      ;;
- esac
-@@ -7179,6 +7386,12 @@
-     MULTIARCH="" ;; #(
-   iOS) :
-     MULTIARCH="" ;; #(
-+  tvOS) :
-+    MULTIARCH="" ;; #(
-+  watchOS) :
-+    MULTIARCH="" ;; #(
-+  visionOS) :
-+    MULTIARCH="" ;; #(
-   FreeBSD*) :
-     MULTIARCH="" ;; #(
-   *) :
-@@ -7199,7 +7412,7 @@
- printf "%s\n" "$MULTIARCH" >&6; }
- 
- case $ac_sys_system in #(
--  iOS) :
-+  iOS|tvOS|watchOS|visionOS) :
-     SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2` ;; #(
-   *) :
-     SOABI_PLATFORM=$PLATFORM_TRIPLET
-@@ -7250,6 +7463,18 @@
-     PY_SUPPORT_TIER=3 ;; #(
-     aarch64-apple-ios*/clang) :
-     PY_SUPPORT_TIER=3 ;; #(
-+    aarch64-apple-tvos*-simulator/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-+    aarch64-apple-tvos*/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-+    aarch64-apple-watchos*-simulator/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-+    arm64_32-apple-watchos*/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-+    aarch64-apple-xros*-simulator/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-+    aarch64-apple-xros*/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-     aarch64-*-linux-android/clang) :
-     PY_SUPPORT_TIER=3 ;; #(
-     x86_64-*-linux-android/clang) :
-@@ -7688,7 +7913,7 @@
-   case $ac_sys_system in
-     Darwin)
-       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
--    iOS)
-+    iOS|tvOS|watchOS|visionOS)
-       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
-     *)
-       as_fn_error $? "Unknown platform for framework build" "$LINENO" 5;;
-@@ -7754,7 +7979,7 @@
-       BLDLIBRARY='-L. -lpython$(LDVERSION)'
-       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
-       ;;
--    iOS)
-+    iOS|tvOS|watchOS|visionOS)
-       LDLIBRARY='libpython$(LDVERSION).dylib'
-       ;;
-     AIX*)
-@@ -13570,7 +13795,7 @@
- 			BLDSHARED="$LDSHARED"
- 		fi
- 		;;
--	iOS/*)
-+	iOS/*|tvOS/*|watchOS/*|visionOS/*)
- 		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
- 		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
- 		BLDSHARED="$LDSHARED"
-@@ -13703,7 +13928,7 @@
- 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
- 	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
- 	# -u libsys_s pulls in all symbols in libsys
--	Darwin/*|iOS/*)
-+	Darwin/*|iOS/*|tvOS/*|watchOS/*|visionOS/*)
- 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
- 
- 		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -13727,7 +13952,7 @@
- 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- 			fi
- 			LINKFORSHARED="$LINKFORSHARED"
--		elif test $ac_sys_system = "iOS"; then
-+		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS" -o "$ac_sys_system" = "visionOS"; then
- 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
- 		fi
- 		;;
-@@ -15504,7 +15729,7 @@
- 
-             ctypes_malloc_closure=yes
-      ;; #(
--  iOS) :
-+  iOS|tvOS|watchOS|visionOS) :
- 
-       ctypes_malloc_closure=yes
-      ;; #(
-@@ -19256,12 +19481,6 @@
- then :
-   printf "%s\n" "#define HAVE_DUP3 1" >>confdefs.h
- 
--fi
--ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
--if test "x$ac_cv_func_execv" = xyes
--then :
--  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
--
- fi
- ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
- if test "x$ac_cv_func_explicit_bzero" = xyes
-@@ -19322,18 +19541,6 @@
- then :
-   printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h
- 
--fi
--ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
--if test "x$ac_cv_func_fork" = xyes
--then :
--  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
--
--fi
--ac_fn_c_check_func "$LINENO" "fork1" "ac_cv_func_fork1"
--if test "x$ac_cv_func_fork1" = xyes
--then :
--  printf "%s\n" "#define HAVE_FORK1 1" >>confdefs.h
--
- fi
- ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
- if test "x$ac_cv_func_fpathconf" = xyes
-@@ -19766,24 +19973,6 @@
- then :
-   printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h
- 
--fi
--ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
--if test "x$ac_cv_func_posix_spawn" = xyes
--then :
--  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
--
--fi
--ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
--if test "x$ac_cv_func_posix_spawnp" = xyes
--then :
--  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
--
--fi
--ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addclosefrom_np" "ac_cv_func_posix_spawn_file_actions_addclosefrom_np"
--if test "x$ac_cv_func_posix_spawn_file_actions_addclosefrom_np" = xyes
--then :
--  printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP 1" >>confdefs.h
--
- fi
- ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
- if test "x$ac_cv_func_pread" = xyes
-@@ -20102,12 +20291,6 @@
- then :
-   printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
- 
--fi
--ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
--if test "x$ac_cv_func_sigaltstack" = xyes
--then :
--  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
--
- fi
- ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
- if test "x$ac_cv_func_sigfillset" = xyes
-@@ -20376,11 +20559,11 @@
- 
- fi
- 
--# iOS defines some system methods that can be linked (so they are
-+# iOS/tvOS/watchOS/visionOS define some system methods that can be linked (so they are
- # found by configure), but either raise a compilation error (because the
- # header definition prevents usage - autoconf doesn't use the headers), or
- # raise an error if used at runtime. Force these symbols off.
--if test "$ac_sys_system" != "iOS" ; then
-+if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" -a "$ac_sys_system" != "visionOS" ; then
-   ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
- if test "x$ac_cv_func_getentropy" = xyes
- then :
-@@ -20402,6 +20585,53 @@
- 
- fi
- 
-+# tvOS/watchOS have some additional methods that can be found, but not used.
-+if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
-+  ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
-+if test "x$ac_cv_func_execv" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
++def create_xcframework(platform: str) -> str:
++    """Build an XCframework from the component parts for the platform.
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
-+if test "x$ac_cv_func_fork" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
++    :return: The version number of the Python verion that was packaged.
++    """
++    package_path = CROSS_BUILD_DIR / platform
++    try:
++        package_path.mkdir()
++    except FileExistsError:
++        raise RuntimeError(
++            f"{platform} XCframework already exists; do you need to run with --clean?"
++        ) from None
++
++    frameworks = []
++    # Merge Frameworks for each component SDK. If there's only one architecture
++    # for the SDK, we can use the compiled Python.framework as-is. However, if
++    # there's more than architecture, we need to merge the individual built
++    # frameworks into a merged "fat" framework.
++    for slice_name, slice_parts in HOSTS[platform].items():
++        # Some parts are the same across all slices, so we use can any of the
++        # host frameworks as the source for the merged version. Use the first
++        # one on the list, as it's as representative as any other.
++        first_host_triple, first_multiarch = next(iter(slice_parts.items()))
++        first_framework = (
++            framework_path(first_host_triple, first_multiarch)
++            / "Python.framework"
++        )
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "fork1" "ac_cv_func_fork1"
-+if test "x$ac_cv_func_fork1" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_FORK1 1" >>confdefs.h
++        if len(slice_parts) == 1:
++            # The first framework is the only framework, so copy it.
++            print(f"Copying framework for {slice_name}...")
++            frameworks.append(first_framework)
++        else:
++            print(f"Merging framework for {slice_name}...")
++            slice_path = CROSS_BUILD_DIR / slice_name
++            slice_framework = slice_path / "Python.framework"
++            slice_framework.mkdir(exist_ok=True, parents=True)
++
++            # Copy the Info.plist
++            shutil.copy(
++                first_framework / "Info.plist",
++                slice_framework / "Info.plist",
++            )
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
-+if test "x$ac_cv_func_posix_spawn" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
++            # Copy the headers
++            shutil.copytree(
++                first_framework / "Headers",
++                slice_framework / "Headers",
++            )
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
-+if test "x$ac_cv_func_posix_spawnp" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
++            # Create the "fat" library binary for the slice
++            run(
++                ["lipo", "-create", "-output", slice_framework / "Python"]
++                + [
++                    (
++                        framework_path(host_triple, multiarch)
++                        / "Python.framework/Python"
++                    )
++                    for host_triple, multiarch in slice_parts.items()
++                ]
++            )
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addclosefrom_np" "ac_cv_func_posix_spawn_file_actions_addclosefrom_np"
-+if test "x$ac_cv_func_posix_spawn_file_actions_addclosefrom_np" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP 1" >>confdefs.h
++            # Add this merged slice to the list to be added to the XCframework
++            frameworks.append(slice_framework)
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
-+if test "x$ac_cv_func_sigaltstack" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
++    print()
++    print("Build XCframework...")
++    cmd = [
++        "xcodebuild",
++        "-create-xcframework",
++        "-output",
++        package_path / "Python.xcframework",
++    ]
++    for framework in frameworks:
++        cmd.extend(["-framework", framework])
++
++    run(cmd)
++
++    # Extract the package version from the merged framework
++    version = package_version(package_path / "Python.xcframework")
++    version_tag = ".".join(version.split(".")[:2])
++
++    # On non-macOS platforms, each framework in XCframework only contains the
++    # headers, libPython, plus an Info.plist. Other resources like the standard
++    # library and binary shims aren't allowed to live in framework; they need
++    # to be copied in separately.
++    print()
++    print("Copy additional resources...")
++    has_common_stdlib = False
++    for slice_name, slice_parts in HOSTS[platform].items():
++        # Some parts are the same across all slices, so we can any of the
++        # host frameworks as the source for the merged version.
++        first_host_triple, first_multiarch = next(iter(slice_parts.items()))
++        first_path = framework_path(first_host_triple, first_multiarch)
++        first_framework = first_path / "Python.framework"
++
++        slice_path = package_path / f"Python.xcframework/{slice_name}"
++        slice_framework = slice_path / "Python.framework"
++
++        # Copy the binary helpers
++        print(f" - {slice_name} binaries")
++        shutil.copytree(first_path / "bin", slice_path / "bin")
++
++        # Copy the include path (this will be a symlink to the framework headers)
++        print(f" - {slice_name} include files")
++        shutil.copytree(
++            first_path / "include",
++            slice_path / "include",
++            symlinks=True,
++        )
 +
-+fi
++        # Copy in the cross-architecture pyconfig.h
++        shutil.copy(
++            PYTHON_DIR / f"Apple/{platform}/Resources/pyconfig.h",
++            slice_framework / "Headers/pyconfig.h",
++        )
 +
-+fi
++        print(f" - {slice_name} architecture-specific files")
++        for host_triple, multiarch in slice_parts.items():
++            print(f"   - {multiarch} standard library")
++            arch, _ = multiarch.split("-", 1)
++
++            if not has_common_stdlib:
++                print("     - using this architecture as the common stdlib")
++                shutil.copytree(
++                    framework_path(host_triple, multiarch) / "lib",
++                    package_path / "Python.xcframework/lib",
++                    ignore=lib_platform_files,
++                )
++                has_common_stdlib = True
 +
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
- printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
- if test ${ac_cv_c_undeclared_builtin_options+y}
-@@ -23873,7 +24103,8 @@
- 
- 
- # check for openpty, login_tty, and forkpty
--
-+# tvOS/watchOS have functions for tty, but can't use them
-+if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
- 
-   for ac_func in openpty
- do :
-@@ -23987,7 +24218,7 @@
- fi
- 
- done
--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
-+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
- printf %s "checking for library containing login_tty... " >&6; }
- if test ${ac_cv_search_login_tty+y}
- then :
-@@ -24170,6 +24401,7 @@
- fi
- 
- done
-+fi
- 
- # check for long file support functions
- ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
-@@ -24435,10 +24667,10 @@
- 
- done
- 
--# On Android and iOS, clock_settime can be linked (so it is found by
-+# On Android, iOS, tvOS, watchOS, and visionOS, clock_settime can be linked (so it is found by
- # configure), but when used in an unprivileged process, it crashes rather than
- # returning an error. Force the symbol off.
--if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
-+if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" -a "$ac_sys_system" != "visionOS"
- then
- 
-   for ac_func in clock_settime
-@@ -24755,7 +24987,7 @@
-   e) if test "$cross_compiling" = yes
- then :
- 
--if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
-+if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS" || test "$ac_sys_system" = "tvOS" || test "$ac_sys_system" = "watchOS" || test "$ac_sys_system" = "visionOS"; then
-   ac_cv_buggy_getaddrinfo="no"
- elif test "${enable_ipv6+set}" = set; then
-   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
-@@ -26777,8 +27009,8 @@
-   LIBPYTHON="\$(BLDLIBRARY)"
- fi
- 
--# On iOS the shared libraries must be linked with the Python framework
--if test "$ac_sys_system" = "iOS"; then
-+# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
-+if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "watchOS" -o $ac_sys_system = "visionOS"; then
-   MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
- fi
- 
-@@ -29648,7 +29880,7 @@
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
- printf "%s\n" "$as_me: checking for device files" >&6;}
- 
--if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
-+if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS"  -o "$ac_sys_system" = "visionOS" ; then
-   ac_cv_file__dev_ptmx=no
-   ac_cv_file__dev_ptc=no
- else
-@@ -30155,7 +30387,7 @@
-     with_ensurepip=no ;; #(
-   WASI) :
-     with_ensurepip=no ;; #(
--  iOS) :
-+  iOS|tvOS|watchOS|visionOS) :
-     with_ensurepip=no ;; #(
-   *) :
-     with_ensurepip=upgrade
-@@ -31104,7 +31336,7 @@
-   SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
-   NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
-   Darwin) _PYTHREAD_NAME_MAXLEN=63;;
--  iOS) _PYTHREAD_NAME_MAXLEN=63;;
-+  iOS|tvOS|watchOS|visionOS) _PYTHREAD_NAME_MAXLEN=63;;
-   FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
-   OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
-   *) _PYTHREAD_NAME_MAXLEN=;;
-@@ -31136,7 +31368,7 @@
-  ;; #(
-     Darwin) :
-      ;; #(
--  iOS) :
-+  iOS|tvOS|watchOS|visionOS) :
- 
- 
- 
-@@ -35304,6 +35536,9 @@
-     "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
-     "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
-     "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
-+    "tvOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES tvOS/Resources/Info.plist" ;;
-+    "watchOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES watchOS/Resources/Info.plist" ;;
-+    "visionOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES visionOS/Resources/Info.plist" ;;
-     "Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
-     "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
-     "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
-diff --git a/configure.ac b/configure.ac
-index d6059471771..7e1a5ffe604 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -330,6 +330,15 @@
- 	*-apple-ios*)
- 		ac_sys_system=iOS
- 		;;
-+	*-apple-tvos*)
-+		ac_sys_system=tvOS
-+		;;
-+	*-apple-watchos*)
-+		ac_sys_system=watchOS
-+		;;
-+	*-apple-xros*)
-+		ac_sys_system=visionOS
-+		;;
- 	*-*-darwin*)
- 		ac_sys_system=Darwin
- 		;;
-@@ -405,7 +414,7 @@
- # On cross-compile builds, configure will look for a host-specific compiler by
- # prepending the user-provided host triple to the required binary name.
- #
--# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
-+# On iOS/tvOS/watchOS/visionOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
- # which isn't a binary that exists, and isn't very convenient, as it contains the
- # iOS version. As the default cross-compiler name won't exist, configure falls
- # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
-@@ -420,6 +429,17 @@
- 		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
- 		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
- 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
++            shutil.copytree(
++                framework_path(host_triple, multiarch) / "lib",
++                slice_path / f"lib-{arch}",
++                ignore=lib_non_platform_files,
++            )
 +
-+		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
-+		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
-+		x86_64-apple-tvos*-simulator)  AR=x86_64-apple-tvos-simulator-ar ;;
++            # Copy the host's pyconfig.h to an architecture-specific name.
++            arch = multiarch.split("-")[0]
++            host_path = (
++                CROSS_BUILD_DIR
++                / host_triple
++                / f"Apple/{platform}/Frameworks"
++                / multiarch
++            )
++            host_framework = host_path / "Python.framework"
++            shutil.copy(
++                host_framework / "Headers/pyconfig.h",
++                slice_framework / f"Headers/pyconfig-{arch}.h",
++            )
 +
-+		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
-+		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
-+		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
++            # Apple identifies certain libraries as "security risks"; if you
++            # statically link those libraries into a Framework, you become
++            # responsible for providing a privacy manifest for that framework.
++            xcprivacy_file = {
++                "OpenSSL": subdir(host_triple)
++                / "prefix/share/OpenSSL.xcprivacy"
++            }
++            print(f"   - {multiarch} xcprivacy files")
++            for module, lib in [
++                ("_hashlib", "OpenSSL"),
++                ("_ssl", "OpenSSL"),
++            ]:
++                shutil.copy(
++                    xcprivacy_file[lib],
++                    slice_path
++                    / f"lib-{arch}/python{version_tag}/lib-dynload/{module}.xcprivacy",
++                )
 +
-+		aarch64-apple-xros*-simulator) AR=arm64-apple-xros-simulator-ar ;;
-+		aarch64-apple-xros*)           AR=arm64-apple-xros-ar ;;
- 		*)
- 	esac
- fi
-@@ -428,6 +448,17 @@
- 		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
- 		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
- 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
++    print(" - build tools")
++    shutil.copytree(
++        PYTHON_DIR / "Apple/testbed/Python.xcframework/build",
++        package_path / "Python.xcframework/build",
++    )
 +
-+		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
-+		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
-+		x86_64-apple-tvos*-simulator)  CC=x86_64-apple-tvos-simulator-clang ;;
++    return version
 +
-+		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
-+		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
-+		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
 +
-+		aarch64-apple-xros*-simulator) CC=arm64-apple-xros-simulator-clang ;;
-+		aarch64-apple-xros*)           CC=arm64-apple-xros-clang ;;
- 		*)
- 	esac
- fi
-@@ -436,6 +467,17 @@
- 		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
- 		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
- 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
++def package(context: argparse.Namespace) -> None:
++    """The implementation of the "package" command."""
++    if context.clean:
++        clean(context, "package")
 +
-+		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
-+		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
-+		x86_64-apple-tvos*-simulator)  CPP=x86_64-apple-tvos-simulator-cpp ;;
++    with group("Building package"):
++        # Create an XCframework
++        version = create_xcframework(context.platform)
 +
-+		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
-+		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
-+		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
++        # watchOS doesn't have a testbed (yet!)
++        if context.platform != "watchOS":
++            # Clone testbed
++            print()
++            run(
++                [
++                    sys.executable,
++                    "Apple/testbed",
++                    "clone",
++                    "--platform",
++                    context.platform,
++                    "--framework",
++                    CROSS_BUILD_DIR / context.platform / "Python.xcframework",
++                    CROSS_BUILD_DIR / context.platform / "testbed",
++                ]
++            )
 +
-+		aarch64-apple-xros*-simulator) CPP=arm64-apple-xros-simulator-cpp ;;
-+		aarch64-apple-xros*)           CPP=arm64-apple-xros-cpp ;;
- 		*)
- 	esac
- fi
-@@ -444,6 +486,17 @@
- 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
- 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
- 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
++        # Build the final archive
++        archive_name = (
++            CROSS_BUILD_DIR
++            / "dist"
++            / f"python-{version}-{context.platform}-XCframework"
++        )
 +
-+		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
-+		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
-+		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
++        print()
++        print("Create package archive...")
++        shutil.make_archive(
++            str(CROSS_BUILD_DIR / archive_name),
++            format="gztar",
++            root_dir=CROSS_BUILD_DIR / context.platform,
++            base_dir=".",
++        )
++        print()
++        print(f"{archive_name.relative_to(PYTHON_DIR)}.tar.gz created.")
 +
-+		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
-+		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
-+		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
 +
-+		aarch64-apple-xros*-simulator) CXX=arm64-apple-xros-simulator-clang++ ;;
-+		aarch64-apple-xros*)           CXX=arm64-apple-xros-clang++ ;;
- 		*)
- 	esac
- fi
-@@ -558,8 +611,11 @@
- 	case $enableval in
- 	yes)
- 		case $ac_sys_system in
--			Darwin) enableval=/Library/Frameworks ;;
--			iOS)    enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
-+			Darwin)  enableval=/Library/Frameworks ;;
-+			iOS)     enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
-+			tvOS)    enableval=tvOS/Frameworks/\$\(MULTIARCH\) ;;
-+			watchOS) enableval=watchOS/Frameworks/\$\(MULTIARCH\) ;;
-+			visionOS) enableval=visionOS/Frameworks/\$\(MULTIARCH\) ;;
- 			*) AC_MSG_ERROR([Unknown platform for framework build])
- 		esac
- 	esac
-@@ -568,6 +624,9 @@
- 	no)
- 		case $ac_sys_system in
- 			iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
-+			tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
-+			watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
-+			visionOS) AC_MSG_ERROR([visionOS builds must use --enable-framework]) ;;
- 			*)
- 				PYTHONFRAMEWORK=
- 				PYTHONFRAMEWORKDIR=no-framework
-@@ -670,6 +729,48 @@
- 
- 				AC_CONFIG_FILES([iOS/Resources/Info.plist])
- 				;;
-+			tvOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++def build(context: argparse.Namespace, host: str | None = None) -> None:
++    """The implementation of the "build" command."""
++    if host is None:
++        host = context.host
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=tvOS/Resources
++    if context.clean:
++        clean(context, host)
 +
-+				AC_CONFIG_FILES([tvOS/Resources/Info.plist])
-+				;;
-+			watchOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++    if host in {"all", "build"}:
++        for step in [
++            configure_build_python,
++            make_build_python,
++        ]:
++            step(context)
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=watchOS/Resources
++    if host == "build":
++        hosts = []
++    elif host in {"all", "hosts"}:
++        hosts = all_host_triples(context.platform)
++    else:
++        hosts = [host]
 +
-+				AC_CONFIG_FILES([watchOS/Resources/Info.plist])
-+				;;
-+			visionOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++    for step_host in hosts:
++        for step in [
++            configure_host_python,
++            make_host_python,
++        ]:
++            step(context, host=step_host)
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=visionOS/Resources
++    if host in {"all", "hosts"}:
++        package(context)
 +
-+				AC_CONFIG_FILES([visionOS/Resources/Info.plist])
-+				;;
- 			*)
- 				AC_MSG_ERROR([Unknown platform for framework build])
- 				;;
-@@ -678,6 +779,9 @@
- 	],[
- 	case $ac_sys_system in
- 		iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
-+		tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
-+		watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
-+		visionOS) AC_MSG_ERROR([visionOS builds must use --enable-framework]) ;;
- 		*)
- 			PYTHONFRAMEWORK=
- 			PYTHONFRAMEWORKDIR=no-framework
-@@ -730,8 +834,8 @@
-     case "$withval" in
-     yes)
-       case $ac_sys_system in
--        Darwin|iOS)
--          # iOS is able to share the macOS patch
-+        Darwin|iOS|tvOS|watchOS|visionOS)
-+          # iOS/tvOS/watchOS/visionOS is able to share the macOS patch
-           APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
-           ;;
-         *) AC_MSG_ERROR([no default app store compliance patch available for $ac_sys_system]) ;;
-@@ -745,8 +849,8 @@
-     esac
-   ],[
-     case $ac_sys_system in
--      iOS)
--        # Always apply the compliance patch on iOS; we can use the macOS patch
-+      iOS|tvOS|watchOS|visionOS)
-+        # Always apply the compliance patch on iOS/tvOS/watchOS/visionOS; we can use the macOS patch
-         APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
-         AC_MSG_RESULT([applying default app store compliance patch])
-         ;;
-@@ -759,6 +863,8 @@
- ])
- AC_SUBST([APP_STORE_COMPLIANCE_PATCH])
- 
-+EXPORT_XROS_DEPLOYMENT_TARGET='#'
 +
- AC_SUBST([_PYTHON_HOST_PLATFORM])
- if test "$cross_compiling" = yes; then
- 	case "$host" in
-@@ -794,6 +900,70 @@
- 				;;
- 		esac
- 		;;
-+	*-apple-tvos*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
++def test(context: argparse.Namespace, host: str | None = None) -> None:
++    """The implementation of the "test" command."""
++    if host is None:
++        host = context.host
 +
-+		# TVOS_DEPLOYMENT_TARGET is the minimum supported tvOS version
-+		AC_MSG_CHECKING([tvOS deployment target])
-+		TVOS_DEPLOYMENT_TARGET=${_host_os:4}
-+		TVOS_DEPLOYMENT_TARGET=${TVOS_DEPLOYMENT_TARGET:=12.0}
-+		AC_MSG_RESULT([$TVOS_DEPLOYMENT_TARGET])
++    if context.clean:
++        clean(context, "test")
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${TVOS_DEPLOYMENT_TARGET}-arm64-appletv${_host_device}
-+				;;
-+			*)
-+				_host_ident=${TVOS_DEPLOYMENT_TARGET}-$host_cpu-appletv${_host_device}
-+				;;
-+		esac
-+		;;
-+	*-apple-watchos*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
++    with group(f"Test {'XCframework' if host in {'all', 'hosts'} else host}"):
++        timestamp = str(time.time_ns())[:-6]
++        testbed_dir = (
++            CROSS_BUILD_DIR / f"{context.platform}-testbed.{timestamp}"
++        )
++        if host in {"all", "hosts"}:
++            framework_path = (
++                CROSS_BUILD_DIR / context.platform / "Python.xcframework"
++            )
++        else:
++            build_arch = platform.machine()
++            host_arch = host.split("-")[0]
 +
-+		# WATCHOS_DEPLOYMENT_TARGET is the minimum supported watchOS version
-+		AC_MSG_CHECKING([watchOS deployment target])
-+		WATCHOS_DEPLOYMENT_TARGET=${_host_os:7}
-+		WATCHOS_DEPLOYMENT_TARGET=${WATCHOS_DEPLOYMENT_TARGET:=4.0}
-+		AC_MSG_RESULT([$WATCHOS_DEPLOYMENT_TARGET])
++            if not host.endswith("-simulator"):
++                print("Skipping test suite non-simulator build.")
++                return
++            elif build_arch != host_arch:
++                print(
++                    f"Skipping test suite for an {host_arch} build "
++                    f"on an {build_arch} machine."
++                )
++                return
++            else:
++                framework_path = (
++                    CROSS_BUILD_DIR
++                    / host
++                    / f"Apple/{context.platform}"
++                    / f"Frameworks/{apple_multiarch(host)}"
++                )
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-arm64-watch${_host_device}
-+				;;
-+			*)
-+				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
-+				;;
-+		esac
-+		;;
-+	*-apple-xros*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
++        run(
++            [
++                sys.executable,
++                "Apple/testbed",
++                "clone",
++                "--platform",
++                context.platform,
++                "--framework",
++                framework_path,
++                testbed_dir,
++            ]
++        )
 +
-+		# XROS_DEPLOYMENT_TARGET is the minimum supported visionOS version
-+		AC_MSG_CHECKING([visionOS deployment target])
-+		XROS_DEPLOYMENT_TARGET=${_host_os:8}
-+		XROS_DEPLOYMENT_TARGET=${XROS_DEPLOYMENT_TARGET:=2.0}
-+		AC_MSG_RESULT([$XROS_DEPLOYMENT_TARGET])
-+		AC_MSG_CHECKING([exporting flag of visionOS deployment target])
-+        	export XROS_DEPLOYMENT_TARGET
-+		EXPORT_XROS_DEPLOYMENT_TARGET=''
-+		AC_MSG_RESULT([$EXPORT_XROS_DEPLOYMENT_TARGET])
++        run(
++            [
++                sys.executable,
++                testbed_dir,
++                "run",
++                "--verbose",
++            ]
++            + (
++                ["--simulator", str(context.simulator)]
++                if context.simulator
++                else []
++            )
++            + [
++                "--",
++                "test",
++                "--slow-ci" if context.slow else "--fast-ci",
++                "--single-process",
++                "--no-randomize",
++                # Timeout handling requires subprocesses; explicitly setting
++                # the timeout to -1 disables the faulthandler.
++                "--timeout=-1",
++                # Adding Python options requires the use of a subprocess to
++                # start a new Python interpreter.
++                "--dont-add-python-opts",
++            ]
++        )
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${XROS_DEPLOYMENT_TARGET}-arm64-xr${_host_device}
-+				;;
-+			*)
-+				_host_ident=${XROS_DEPLOYMENT_TARGET}-$host_cpu-xr${_host_device}
-+				;;
-+		esac
-+		;;
- 	*-*-darwin*)
- 		case "$host_cpu" in
- 		arm*)
-@@ -883,9 +1053,15 @@
-     define_xopen_source=no;;
-   Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
-     define_xopen_source=no;;
--  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
-+  # On iOS/tvOS/watchOS/visionOS, defining _POSIX_C_SOURCE also disables platform specific features.
-   iOS/*)
-     define_xopen_source=no;;
-+  tvOS/*)
-+    define_xopen_source=no;;
-+  watchOS/*)
-+    define_xopen_source=no;;
-+  visionOS/*)
-+    define_xopen_source=no;;
-   # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
-   # defining NI_NUMERICHOST.
-   QNX/6.3.2)
-@@ -944,8 +1120,14 @@
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
- EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
- 
--# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
-+# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
-+# WATCHOS_DEPLOYMENT_TARGET / XROS_DEPLOYMENT_TARGET enforced by the selected host triple.
- AC_SUBST([IPHONEOS_DEPLOYMENT_TARGET])
-+AC_SUBST([TVOS_DEPLOYMENT_TARGET])
-+AC_SUBST([WATCHOS_DEPLOYMENT_TARGET])
-+AC_SUBST([XROS_DEPLOYMENT_TARGET])
-+# XROS_DEPLOYMENT_TARGET should get exported
-+AC_SUBST([EXPORT_XROS_DEPLOYMENT_TARGET])
- 
- # checks for alternative programs
- 
-@@ -979,11 +1161,19 @@
-   ],
- )
- 
--dnl Add the compiler flag for the iOS minimum supported OS version.
-+dnl Add the compiler flag for the iOS/tvOS/watchOS minimum supported OS
-+dnl version. visionOS doesn't use an explicit -mxros-version-min option -
-+dnl it encodes the min version into the target triple.
- AS_CASE([$ac_sys_system],
-   [iOS], [
-     AS_VAR_APPEND([CFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
-     AS_VAR_APPEND([LDFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
-+  ],[tvOS], [
-+    AS_VAR_APPEND([CFLAGS], [" -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"])
-+    AS_VAR_APPEND([LDFLAGS], [" -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"])
-+  ],[watchOS], [
-+    AS_VAR_APPEND([CFLAGS], [" -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"])
-+    AS_VAR_APPEND([LDFLAGS], [" -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"])
-   ],
- )
- 
-@@ -1172,6 +1362,9 @@
- AS_CASE([$ac_sys_system],
-   [Darwin*], [MULTIARCH=""],
-   [iOS], [MULTIARCH=""],
-+  [tvOS], [MULTIARCH=""],
-+  [watchOS], [MULTIARCH=""],
-+  [visionOS], [MULTIARCH=""],
-   [FreeBSD*], [MULTIARCH=""],
-   [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
- )
-@@ -1193,7 +1386,7 @@
- dnl use a single "fat" binary at runtime. SOABI_PLATFORM is the component of
- dnl the PLATFORM_TRIPLET that will be used in binary module extensions.
- AS_CASE([$ac_sys_system],
--  [iOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
-+  [iOS|tvOS|watchOS|visionOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
-   [SOABI_PLATFORM=$PLATFORM_TRIPLET]
- )
- 
-@@ -1220,16 +1413,22 @@
-   [wasm32-unknown-wasip1/clang],         [PY_SUPPORT_TIER=2], dnl WebAssembly System Interface preview1, clang
-   [x86_64-*-linux-gnu/clang],            [PY_SUPPORT_TIER=2], dnl Linux on AMD64, any vendor, glibc, clang
- 
--  [aarch64-pc-windows-msvc/msvc],        [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC
--  [armv7l-*-linux-gnueabihf/gcc],        [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
--  [powerpc64le-*-linux-gnu/clang],       [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
--  [s390x-*-linux-gnu/gcc],               [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
--  [x86_64-*-freebsd*/clang],             [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
--  [aarch64-apple-ios*-simulator/clang],  [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
--  [aarch64-apple-ios*/clang],            [PY_SUPPORT_TIER=3], dnl iOS on ARM64
--  [aarch64-*-linux-android/clang],       [PY_SUPPORT_TIER=3], dnl Android on ARM64
--  [x86_64-*-linux-android/clang],        [PY_SUPPORT_TIER=3], dnl Android on AMD64
--  [wasm32-*-emscripten/emcc],            [PY_SUPPORT_TIER=3], dnl Emscripten
-+  [aarch64-pc-windows-msvc/msvc],           [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC
-+  [armv7l-*-linux-gnueabihf/gcc],           [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
-+  [powerpc64le-*-linux-gnu/clang],          [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
-+  [s390x-*-linux-gnu/gcc],                  [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
-+  [x86_64-*-freebsd*/clang],                [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
-+  [aarch64-apple-ios*-simulator/clang],     [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
-+  [aarch64-apple-ios*/clang],               [PY_SUPPORT_TIER=3], dnl iOS on ARM64
-+  [aarch64-apple-tvos*-simulator/clang],    [PY_SUPPORT_TIER=3], dnl tvOS Simulator on arm64
-+  [aarch64-apple-tvos*/clang],              [PY_SUPPORT_TIER=3], dnl tvOS on ARM64
-+  [aarch64-apple-watchos*-simulator/clang], [PY_SUPPORT_TIER=3], dnl watchOS Simulator on arm64
-+  [arm64_32-apple-watchos*/clang],          [PY_SUPPORT_TIER=3], dnl watchOS on ARM64
-+  [aarch64-apple-xros*-simulator/clang],    [PY_SUPPORT_TIER=3], dnl visionOS Simulator on arm64
-+  [aarch64-apple-xros*/clang],              [PY_SUPPORT_TIER=3],    dnl visionOS on ARM64
-+  [aarch64-*-linux-android/clang],          [PY_SUPPORT_TIER=3], dnl Android on ARM64
-+  [x86_64-*-linux-android/clang],           [PY_SUPPORT_TIER=3], dnl Android on AMD64
-+  [wasm32-*-emscripten/emcc],               [PY_SUPPORT_TIER=3], dnl Emscripten
- 
-   [PY_SUPPORT_TIER=0]
- )
-@@ -1537,7 +1736,7 @@
-   case $ac_sys_system in
-     Darwin)
-       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
--    iOS)
-+    iOS|tvOS|watchOS|visionOS)
-       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
-     *)
-       AC_MSG_ERROR([Unknown platform for framework build]);;
-@@ -1602,7 +1801,7 @@
-       BLDLIBRARY='-L. -lpython$(LDVERSION)'
-       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
-       ;;
--    iOS)
-+    iOS|tvOS|watchOS|visionOS)
-       LDLIBRARY='libpython$(LDVERSION).dylib'
-       ;;
-     AIX*)
-@@ -3469,7 +3668,7 @@
- 			BLDSHARED="$LDSHARED"
- 		fi
- 		;;
--	iOS/*)
-+	iOS/*|tvOS/*|watchOS/*|visionOS/*)
- 		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
- 		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
- 		BLDSHARED="$LDSHARED"
-@@ -3593,7 +3792,7 @@
- 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
- 	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
- 	# -u libsys_s pulls in all symbols in libsys
--	Darwin/*|iOS/*)
-+	Darwin/*|iOS/*|tvOS/*|watchOS/*|visionOS/*)
- 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
- 
- 		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -3617,7 +3816,7 @@
- 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- 			fi
- 			LINKFORSHARED="$LINKFORSHARED"
--		elif test $ac_sys_system = "iOS"; then
-+		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS" -o "$ac_sys_system" = "visionOS"; then
- 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
- 		fi
- 		;;
-@@ -4105,7 +4304,7 @@
-       dnl when do we need USING_APPLE_OS_LIBFFI?
-       ctypes_malloc_closure=yes
-     ],
--    [iOS], [
-+    [iOS|tvOS|watchOS|visionOS], [
-       ctypes_malloc_closure=yes
-     ],
-     [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]
-@@ -5214,9 +5413,9 @@
- # checks for library functions
- AC_CHECK_FUNCS([ \
-   accept4 alarm bind_textdomain_codeset chmod chown clock closefrom close_range confstr \
--  copy_file_range ctermid dladdr dup dup3 execv explicit_bzero explicit_memset \
-+  copy_file_range ctermid dladdr dup dup3 explicit_bzero explicit_memset \
-   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
--  fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
-+  fpathconf fstatat ftime ftruncate futimens futimes futimesat \
-   gai_strerror getegid geteuid getgid getgrent getgrgid getgrgid_r \
-   getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin getlogin_r \
-   getpeername getpgid getpid getppid getpriority _getpty \
-@@ -5224,8 +5423,7 @@
-   getspnam getuid getwd grantpt if_nameindex initgroups kill killpg lchown linkat \
-   lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
-   mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
--  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt posix_spawn posix_spawnp \
--  posix_spawn_file_actions_addclosefrom_np \
-+  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt \
-   pread preadv preadv2 process_vm_readv \
-   pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \
-   pthread_kill pthread_get_name_np pthread_getname_np pthread_set_name_np
-@@ -5235,7 +5433,7 @@
-   sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \
-   sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \
-   setitimer setlocale setpgid setpgrp setpriority setregid setresgid \
--  setresuid setreuid setsid setuid setvbuf shutdown sigaction sigaltstack \
-+  setresuid setreuid setsid setuid setvbuf shutdown sigaction \
-   sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
-   sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
-   sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
-@@ -5250,12 +5448,20 @@
-   AC_CHECK_FUNCS([lchmod])
- fi
- 
--# iOS defines some system methods that can be linked (so they are
-+# iOS/tvOS/watchOS/visionOS define some system methods that can be linked (so they are
- # found by configure), but either raise a compilation error (because the
- # header definition prevents usage - autoconf doesn't use the headers), or
- # raise an error if used at runtime. Force these symbols off.
--if test "$ac_sys_system" != "iOS" ; then
--  AC_CHECK_FUNCS([getentropy getgroups system])
-+if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" -a "$ac_sys_system" != "visionOS" ; then
-+  AC_CHECK_FUNCS([ getentropy getgroups system ])
-+fi
 +
-+# tvOS/watchOS have some additional methods that can be found, but not used.
-+if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
-+  AC_CHECK_FUNCS([ \
-+    execv fork fork1 posix_spawn posix_spawnp posix_spawn_file_actions_addclosefrom_np \
-+    sigaltstack \
-+  ])
- fi
- 
- AC_CHECK_DECL([dirfd],
-@@ -5550,20 +5756,22 @@
-               [@%:@include <utmp.h>])
- 
- # check for openpty, login_tty, and forkpty
--
--AC_CHECK_FUNCS([openpty], [],
--  [AC_CHECK_LIB([util], [openpty],
--    [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lutil"],
--    [AC_CHECK_LIB([bsd], [openpty],
--      [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lbsd"])])])
--AC_SEARCH_LIBS([login_tty], [util],
-- [AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
--)
--AC_CHECK_FUNCS([forkpty], [],
--  [AC_CHECK_LIB([util], [forkpty],
--    [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lutil"],
--    [AC_CHECK_LIB([bsd], [forkpty],
--      [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])])
-+# tvOS/watchOS have functions for tty, but can't use them
-+if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
-+  AC_CHECK_FUNCS([openpty], [],
-+    [AC_CHECK_LIB([util], [openpty],
-+      [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lutil"],
-+      [AC_CHECK_LIB([bsd], [openpty],
-+        [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lbsd"])])])
-+  AC_SEARCH_LIBS([login_tty], [util],
-+   [AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
-+  )
-+  AC_CHECK_FUNCS([forkpty], [],
-+    [AC_CHECK_LIB([util], [forkpty],
-+      [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lutil"],
-+      [AC_CHECK_LIB([bsd], [forkpty],
-+        [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])])
-+fi
- 
- # check for long file support functions
- AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
-@@ -5602,10 +5810,10 @@
-     ])
- ])
- 
--# On Android and iOS, clock_settime can be linked (so it is found by
-+# On Android, iOS, tvOS, watchOS, and visionOS, clock_settime can be linked (so it is found by
- # configure), but when used in an unprivileged process, it crashes rather than
- # returning an error. Force the symbol off.
--if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
-+if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" -a "$ac_sys_system" != "visionOS"
- then
-   AC_CHECK_FUNCS([clock_settime], [], [
-       AC_CHECK_LIB([rt], [clock_settime], [
-@@ -5763,7 +5971,7 @@
- [ac_cv_buggy_getaddrinfo=no],
- [ac_cv_buggy_getaddrinfo=yes],
- [
--if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
-+if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS" || test "$ac_sys_system" = "tvOS" || test "$ac_sys_system" = "watchOS" || test "$ac_sys_system" = "visionOS"; then
-   ac_cv_buggy_getaddrinfo="no"
- elif test "${enable_ipv6+set}" = set; then
-   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
-@@ -6356,8 +6564,8 @@
-   LIBPYTHON="\$(BLDLIBRARY)"
- fi
- 
--# On iOS the shared libraries must be linked with the Python framework
--if test "$ac_sys_system" = "iOS"; then
-+# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
-+if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "watchOS" -o $ac_sys_system = "visionOS"; then
-   MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
- fi
- 
-@@ -7016,7 +7224,7 @@
- dnl NOTE: Inform user how to proceed with files when cross compiling.
- dnl Some cross-compile builds are predictable; they won't ever
- dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
--if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
-+if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS"  -o "$ac_sys_system" = "visionOS" ; then
-   ac_cv_file__dev_ptmx=no
-   ac_cv_file__dev_ptc=no
- else
-@@ -7316,7 +7524,7 @@
-       AS_CASE([$ac_sys_system],
-         [Emscripten], [with_ensurepip=no],
-         [WASI], [with_ensurepip=no],
--        [iOS], [with_ensurepip=no],
-+        [iOS|tvOS|watchOS|visionOS], [with_ensurepip=no],
-         [with_ensurepip=upgrade]
-       )
-     ])
-@@ -7703,7 +7911,7 @@
-   SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
-   NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
-   Darwin) _PYTHREAD_NAME_MAXLEN=63;;
--  iOS) _PYTHREAD_NAME_MAXLEN=63;;
-+  iOS|tvOS|watchOS|visionOS) _PYTHREAD_NAME_MAXLEN=63;;
-   FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
-   OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
-   *) _PYTHREAD_NAME_MAXLEN=;;
-@@ -7728,7 +7936,7 @@
-   [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
-   dnl The _scproxy module is available on macOS
-   [Darwin], [],
--  [iOS], [
-+  [iOS|tvOS|watchOS|visionOS], [
-     dnl subprocess and multiprocessing are not supported (no fork syscall).
-     dnl curses and tkinter user interface are not available.
-     dnl gdbm and nis aren't available
-diff --git a/iOS/Resources/Info.plist.in b/iOS/Resources/Info.plist.in
-index c3e261ecd9e..26ef7a95de4 100644
---- a/iOS/Resources/Info.plist.in
-+++ b/iOS/Resources/Info.plist.in
-@@ -17,13 +17,13 @@
- 	<key>CFBundlePackageType</key>
- 	<string>FMWK</string>
- 	<key>CFBundleShortVersionString</key>
--	<string>@VERSION@</string>
-+	<string>%VERSION%</string>
- 	<key>CFBundleLongVersionString</key>
- 	<string>%VERSION%, (c) 2001-2024 Python Software Foundation.</string>
- 	<key>CFBundleSignature</key>
- 	<string>????</string>
- 	<key>CFBundleVersion</key>
--	<string>1</string>
-+	<string>%VERSION%</string>
- 	<key>CFBundleSupportedPlatforms</key>
- 	<array>
- 		<string>iPhoneOS</string>
---- /dev/null
-+++ b/tvOS/README.rst
-@@ -0,0 +1,108 @@
-+=====================
-+Python on tvOS README
-+=====================
++def ci(context: argparse.Namespace) -> None:
++    """The implementation of the "ci" command."""
++    clean(context, "all")
++    build(context, host="all")
++    test(context, host="all")
 +
-+:Authors:
-+    Russell Keith-Magee (2023-11)
 +
-+This document provides a quick overview of some tvOS specific features in the
-+Python distribution.
++def parse_args() -> argparse.Namespace:
++    parser = argparse.ArgumentParser(
++        description=(
++            "A tool for managing the build, package and test process of "
++            "CPython on Apple platforms."
++        ),
++    )
++    parser.suggest_on_error = True
++    subcommands = parser.add_subparsers(dest="subcommand", required=True)
 +
-+Compilers for building on tvOS
-+==============================
++    clean = subcommands.add_parser(
++        "clean",
++        help="Delete all build directories",
++    )
 +
-+Building for tvOS requires the use of Apple's Xcode tooling. It is strongly
-+recommended that you use the most recent stable release of Xcode, on the
-+most recently released macOS.
++    configure_build = subcommands.add_parser(
++        "configure-build", help="Run `configure` for the build Python"
++    )
++    subcommands.add_parser(
++        "make-build", help="Run `make` for the build Python"
++    )
++    configure_host = subcommands.add_parser(
++        "configure-host",
++        help="Run `configure` for a specific platform and target",
++    )
++    make_host = subcommands.add_parser(
++        "make-host",
++        help="Run `make` for a specific platform and target",
++    )
++    package = subcommands.add_parser(
++        "package",
++        help="Create a release package for the platform",
++    )
++    build = subcommands.add_parser(
++        "build",
++        help="Build all platform targets and create the XCframework",
++    )
++    test = subcommands.add_parser(
++        "test",
++        help="Run the testbed for a specific platform",
++    )
++    ci = subcommands.add_parser(
++        "ci",
++        help="Run build, package, and test",
++    )
 +
-+tvOS specific arguments to configure
-+===================================
++    # platform argument
++    for cmd in [clean, configure_host, make_host, package, build, test, ci]:
++        cmd.add_argument(
++            "platform",
++            choices=HOSTS.keys(),
++            help="The target platform to build",
++        )
 +
-+* ``--enable-framework[=DIR]``
++    # host triple argument
++    for cmd in [configure_host, make_host]:
++        cmd.add_argument(
++            "host",
++            help="The host triple to build (e.g., arm64-apple-ios-simulator)",
++        )
++    # optional host triple argument
++    for cmd in [clean, build, test]:
++        cmd.add_argument(
++            "host",
++            nargs="?",
++            default="all",
++            help=(
++                "The host triple to build (e.g., arm64-apple-ios-simulator), "
++                "or 'build' for just the build platform, or 'hosts' for all "
++                "host platforms, or 'all' for the build platform and all "
++                "hosts. Defaults to 'all'"
++            ),
++        )
 +
-+  This argument specifies the location where the Python.framework will
-+  be installed.
++    # --clean option
++    for cmd in [configure_build, configure_host, build, package, test, ci]:
++        cmd.add_argument(
++            "--clean",
++            action="store_true",
++            default=False,
++            dest="clean",
++            help="Delete the relevant build directories first",
++        )
 +
-+* ``--with-framework-name=NAME``
++    # --cache-dir option
++    for cmd in [configure_host, build, ci]:
++        cmd.add_argument(
++            "--cache-dir",
++            default="./cross-build/downloads",
++            help="The directory to store cached downloads.",
++        )
 +
-+  Specify the name for the python framework, defaults to ``Python``.
++    # --simulator option
++    for cmd in [test, ci]:
++        cmd.add_argument(
++            "--simulator",
++            help=(
++                "The name of the simulator to use (eg: 'iPhone 16e'). Defaults to "
++                "the most recently released 'entry level' iPhone device. Device "
++                "architecture and OS version can also be specified; e.g., "
++                "`--simulator 'iPhone 16 Pro,arch=arm64,OS=26.0'` would run on "
++                "an ARM64 iPhone 16 Pro simulator running iOS 26.0."
++            ),
++        )
++        cmd.add_argument(
++            "--slow",
++            action="store_true",
++            help="Run tests with --slow-ci options.",
++        )
 +
++    for subcommand in [configure_build, configure_host, build, ci]:
++        subcommand.add_argument(
++            "args", nargs="*", help="Extra arguments to pass to `configure`"
++        )
 +
-+Building and using Python on tvOS
-+=================================
++    return parser.parse_args()
 +
-+ABIs and Architectures
-+----------------------
 +
-+tvOS apps can be deployed on physical devices, and on the tvOS simulator.
-+Although the API used on these devices is identical, the ABI is different - you
-+need to link against different libraries for an tvOS device build
-+(``appletvos``) or an tvOS simulator build (``appletvsimulator``). Apple uses
-+the XCframework format to allow specifying a single dependency that supports
-+multiple ABIs. An XCframework is a wrapper around multiple ABI-specific
-+frameworks.
++def print_called_process_error(e: subprocess.CalledProcessError) -> None:
++    for stream_name in ["stdout", "stderr"]:
++        content = getattr(e, stream_name)
++        stream = getattr(sys, stream_name)
++        if content:
++            stream.write(content)
++            if not content.endswith("\n"):
++                stream.write("\n")
 +
-+tvOS can also support different CPU architectures within each ABI. At present,
-+there is only a single support ed architecture on physical devices - ARM64.
-+However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
-+Silicon machines), and x86_64 (for running on older Intel-based machines.)
++    # shlex uses single quotes, so we surround the command with double quotes.
++    print(
++        f'Command "{join_command(e.cmd)}" returned exit status {e.returncode}'
++    )
 +
-+To support multiple CPU architectures on a single platform, Apple uses a "fat
-+binary" format - a single physical file that contains support for multiple
-+architectures.
 +
-+How do I build Python for tvOS?
-+-------------------------------
++def main() -> None:
++    # Handle SIGTERM the same way as SIGINT. This ensures that if we're
++    # terminated by the buildbot worker, we'll make an attempt to clean up our
++    # subprocesses.
++    def signal_handler(*args):
++        os.kill(os.getpid(), signal.SIGINT)
++
++    signal.signal(signal.SIGTERM, signal_handler)
++
++    # Process command line arguments
++    context = parse_args()
++    dispatch: dict[str, Callable] = {
++        "clean": clean,
++        "configure-build": configure_build_python,
++        "make-build": make_build_python,
++        "configure-host": configure_host_python,
++        "make-host": make_host_python,
++        "package": package,
++        "build": build,
++        "test": test,
++        "ci": ci,
++    }
 +
-+The Python build system will build a ``Python.framework`` that supports a
-+*single* ABI with a *single* architecture. If you want to use Python in an tvOS
-+project, you need to:
++    try:
++        dispatch[context.subcommand](context)
++    except CalledProcessError as e:
++        print()
++        print_called_process_error(e)
++        sys.exit(1)
++    except RuntimeError as e:
++        print()
++        print(e)
++        sys.exit(2)
 +
-+1. Produce multiple ``Python.framework`` builds, one for each ABI and architecture;
-+2. Merge the binaries for each architecture on a given ABI into a single "fat" binary;
-+3. Merge the "fat" frameworks for each ABI into a single XCframework.
 +
-+tvOS builds of Python *must* be constructed as framework builds. To support this,
-+you must provide the ``--enable-framework`` flag when configuring the build.
++if __name__ == "__main__":
++    main()
+--- /dev/null
++++ b/Apple/iOS/README.md
+@@ -0,0 +1,328 @@
++# Python on iOS README
 +
-+The build also requires the use of cross-compilation. The commands for building
-+Python for tvOS will look somethign like::
++**iOS support is [tier 3](https://peps.python.org/pep-0011/#tier-3).**
 +
-+  $ ./configure \
-+        --enable-framework=/path/to/install \
-+        --host=aarch64-apple-tvos \
-+        --build=aarch64-apple-darwin \
-+        --with-build-python=/path/to/python.exe
-+  $ make
-+  $ make install
++This document provides a quick overview of some iOS specific features in the
++Python distribution.
 +
-+In this invocation:
++These instructions are only needed if you're planning to compile Python for iOS
++yourself. Most users should *not* need to do this. If you're looking to
++experiment with writing an iOS app in Python, tools such as [BeeWare's
++Briefcase](https://briefcase.readthedocs.io) and [Kivy's
++Buildozer](https://buildozer.readthedocs.io) will provide a much more
++approachable user experience.
 +
-+* ``/path/to/install`` is the location where the final Python.framework will be
-+  output.
++## Compilers for building on iOS
 +
-+* ``--host`` is the architecture and ABI that you want to build, in GNU compiler
++Building for iOS requires the use of Apple's Xcode tooling. It is strongly
++recommended that you use the most recent stable release of Xcode. This will
++require the use of the most (or second-most) recently released macOS version,
++as Apple does not maintain Xcode for older macOS versions. The Xcode Command
++Line Tools are not sufficient for iOS development; you need a *full* Xcode
++install.
++
++If you want to run your code on the iOS simulator, you'll also need to install
++an iOS Simulator Platform. You should be prompted to select an iOS Simulator
++Platform when you first run Xcode. Alternatively, you can add an iOS Simulator
++Platform by selecting an open the Platforms tab of the Xcode Settings panel.
++
++## Building Python on iOS
++
++### ABIs and Architectures
++
++iOS apps can be deployed on physical devices, and on the iOS simulator. Although
++the API used on these devices is identical, the ABI is different - you need to
++link against different libraries for an iOS device build (`iphoneos`) or an
++iOS simulator build (`iphonesimulator`).
++
++Apple uses the `XCframework` format to allow specifying a single dependency
++that supports multiple ABIs. An `XCframework` is a wrapper around multiple
++ABI-specific frameworks that share a common API.
++
++iOS can also support different CPU architectures within each ABI. At present,
++there is only a single supported architecture on physical devices - ARM64.
++However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
++Silicon machines), and x86_64 (for running on older Intel-based machines).
++
++To support multiple CPU architectures on a single platform, Apple uses a "fat
++binary" format - a single physical file that contains support for multiple
++architectures. It is possible to compile and use a "thin" single architecture
++version of a binary for testing purposes; however, the "thin" binary will not be
++portable to machines using other architectures.
++
++### Building a multi-architecture iOS XCframework
++
++The `Apple` subfolder of the Python repository acts as a build script that
++can be used to coordinate the compilation of a complete iOS XCframework. To use
++it, run::
++
++  python Apple build iOS
++
++This will:
++
++* Configure and compile a version of Python to run on the build machine
++* Download pre-compiled binary dependencies for each platform
++* Configure and build a `Python.framework` for each required architecture and
++  iOS SDK
++* Merge the multiple `Python.framework` folders into a single `Python.xcframework`
++* Produce a `.tar.gz` archive in the `cross-build/dist` folder containing
++  the `Python.xcframework`, plus a copy of the Testbed app pre-configured to
++  use the XCframework.
++
++The `Apple` build script has other entry points that will perform the
++individual parts of the overall `build` target, plus targets to test the
++build, clean the `cross-build` folder of iOS build products, and perform a
++complete "build and test" CI run. The `--clean` flag can also be used on
++individual commands to ensure that a stale build product are removed before
++building.
++
++### Building a single-architecture framework
++
++If you're using the `Apple` build script, you won't need to build
++individual frameworks. However, if you do need to manually configure an iOS
++Python build for a single framework, the following options are available.
++
++#### iOS specific arguments to configure
++
++* `--enable-framework[=DIR]`
++
++  This argument specifies the location where the Python.framework will be
++  installed. If `DIR` is not specified, the framework will be installed into
++  a subdirectory of the `iOS/Frameworks` folder.
++
++  This argument *must* be provided when configuring iOS builds. iOS does not
++  support non-framework builds.
++
++* `--with-framework-name=NAME`
++
++  Specify the name for the Python framework; defaults to `Python`.
++
++  > [!NOTE]
++  > Unless you know what you're doing, changing the name of the Python
++  > framework on iOS is not advised. If you use this option, you won't be able
++  > to run the `Apple` build script without making significant manual
++  > alterations, and you won't be able to use any binary packages unless you
++  > compile them yourself using your own framework name.
++
++#### Building Python for iOS
++
++The Python build system will create a `Python.framework` that supports a
++*single* ABI with a *single* architecture. Unlike macOS, iOS does not allow a
++framework to contain non-library content, so the iOS build will produce a
++`bin` and `lib` folder in the same output folder as `Python.framework`.
++The `lib` folder will be needed at runtime to support the Python library.
++
++If you want to use Python in a real iOS project, you need to produce multiple
++`Python.framework` builds, one for each ABI and architecture. iOS builds of
++Python *must* be constructed as framework builds. To support this, you must
++provide the `--enable-framework` flag when configuring the build. The build
++also requires the use of cross-compilation. The minimal commands for building
++Python for the ARM64 iOS simulator will look something like:
++```
++export PATH="$(pwd)/Apple/iOS/Resources/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin"
++./configure \
++    --enable-framework \
++    --host=arm64-apple-ios-simulator \
++    --build=arm64-apple-darwin \
++    --with-build-python=/path/to/python.exe
++make
++make install
++```
++
++In this invocation:
++
++* `Apple/iOS/Resources/bin` has been added to the path, providing some shims for the
++  compilers and linkers needed by the build. Xcode requires the use of `xcrun`
++  to invoke compiler tooling. However, if `xcrun` is pre-evaluated and the
++  result passed to `configure`, these results can embed user- and
++  version-specific paths into the sysconfig data, which limits the portability
++  of the compiled Python. Alternatively, if `xcrun` is used *as* the compiler,
++  it requires that compiler variables like `CC` include spaces, which can
++  cause significant problems with many C configuration systems which assume that
++  `CC` will be a single executable.
++
++  To work around this problem, the `Apple/iOS/Resources/bin` folder contains some
++  wrapper scripts that present as simple compilers and linkers, but wrap
++  underlying calls to `xcrun`. This allows configure to use a `CC`
++  definition without spaces, and without user- or version-specific paths, while
++  retaining the ability to adapt to the local Xcode install. These scripts are
++  included in the `bin` directory of an iOS install.
++
++  These scripts will, by default, use the currently active Xcode installation.
++  If you want to use a different Xcode installation, you can use
++  `xcode-select` to set a new default Xcode globally, or you can use the
++  `DEVELOPER_DIR` environment variable to specify an Xcode install. The
++  scripts will use the default `iphoneos`/`iphonesimulator` SDK version for
++  the select Xcode install; if you want to use a different SDK, you can set the
++  `IOS_SDK_VERSION` environment variable. (e.g, setting
++  `IOS_SDK_VERSION=17.1` would cause the scripts to use the `iphoneos17.1`
++  and `iphonesimulator17.1` SDKs, regardless of the Xcode default.)
++
++  The path has also been cleared of any user customizations. A common source of
++  bugs is for tools like Homebrew to accidentally leak macOS binaries into an iOS
++  build. Resetting the path to a known "bare bones" value is the easiest way to
++  avoid these problems.
++
++* `--host` is the architecture and ABI that you want to build, in GNU compiler
 +  triple format. This will be one of:
 +
-+  - ``aarch64-apple-tvos`` for ARM64 tvOS devices.
-+  - ``aarch64-apple-tvos-simulator`` for the tvOS simulator running on Apple
++  - `arm64-apple-ios` for ARM64 iOS devices.
++  - `arm64-apple-ios-simulator` for the iOS simulator running on Apple
 +    Silicon devices.
-+  - ``x86_64-apple-tvos-simulator`` for the tvOS simulator running on Intel
++  - `x86_64-apple-ios-simulator` for the iOS simulator running on Intel
 +    devices.
 +
-+* ``--build`` is the GNU compiler triple for the machine that will be running
++* `--build` is the GNU compiler triple for the machine that will be running
 +  the compiler. This is one of:
 +
-+  - ``aarch64-apple-darwin`` for Apple Silicon devices.
-+  - ``x86_64-apple-darwin`` for Intel devices.
++  - `arm64-apple-darwin` for Apple Silicon devices.
++  - `x86_64-apple-darwin` for Intel devices.
 +
-+* ``/path/to/python.exe`` is the path to a Python binary on the machine that
++* `/path/to/python.exe` is the path to a Python binary on the machine that
 +  will be running the compiler. This is needed because the Python compilation
 +  process involves running some Python code. On a normal desktop build of
 +  Python, you can compile a python interpreter and then use that interpreter to
-+  run Python code. However, the binaries produced for tvOS won't run on macOS, so
++  run Python code. However, the binaries produced for iOS won't run on macOS, so
 +  you need to provide an external Python interpreter. This interpreter must be
-+  the version as the Python that is being compiled.
-+
-+Using a framework-based Python on tvOS
-+======================================
++  the same version as the Python that is being compiled. To be completely safe,
++  this should be the *exact* same commit hash. However, the longer a Python
++  release has been stable, the more likely it is that this constraint can be
++  relaxed - the same micro version will often be sufficient.
++
++* The `install` target for iOS builds is slightly different to other
++  platforms. On most platforms, `make install` will install the build into
++  the final runtime location. This won't be the case for iOS, as the final
++  runtime location will be on a physical device.
++
++  However, you still need to run the `install` target for iOS builds, as it
++  performs some final framework assembly steps. The location specified with
++  `--enable-framework` will be the location where `make install` will
++  assemble the complete iOS framework. This completed framework can then
++  be copied and relocated as required.
++
++For a full CPython build, you also need to specify the paths to iOS builds of
++the binary libraries that CPython depends on (such as XZ, LibFFI and OpenSSL).
++This can be done by defining library specific environment variables (such as
++`LIBLZMA_CFLAGS`, `LIBLZMA_LIBS`), and the `--with-openssl` configure
++option. Versions of these libraries pre-compiled for iOS can be found in [this
++repository](https://github.com/beeware/cpython-apple-source-deps/releases).
++LibFFI is especially important, as many parts of the standard library
++(including the `platform`, `sysconfig` and `webbrowser` modules) require
++the use of the `ctypes` module at runtime.
++
++By default, Python will be compiled with an iOS deployment target (i.e., the
++minimum supported iOS version) of 13.0. To specify a different deployment
++target, provide the version number as part of the `--host` argument - for
++example, `--host=arm64-apple-ios15.4-simulator` would compile an ARM64
++simulator build with a deployment target of 15.4.
++
++## Testing Python on iOS
++
++### Testing a multi-architecture framework
++
++Once you have a built an XCframework, you can test that framework by running:
++
++  $ python Apple test iOS
++
++### Testing a single-architecture framework
++
++The `Apple/testbed` folder that contains an Xcode project that is able to run
++the Python test suite on Apple platforms. This project converts the Python test
++suite into a single test case in Xcode's XCTest framework. The single XCTest
++passes if the test suite passes.
++
++To run the test suite, configure a Python build for an iOS simulator (i.e.,
++`--host=arm64-apple-ios-simulator` or `--host=x86_64-apple-ios-simulator`
++), specifying a framework build (i.e. `--enable-framework`). Ensure that your
++`PATH` has been configured to include the `Apple/iOS/Resources/bin` folder and
++exclude any non-iOS tools, then run:
++```
++make all
++make install
++make testios
++```
++
++This will:
++
++* Build an iOS framework for your chosen architecture;
++* Finalize the single-platform framework;
++* Make a clean copy of the testbed project;
++* Install the Python iOS framework into the copy of the testbed project; and
++* Run the test suite on an "entry-level device" simulator (i.e., an iPhone SE,
++  iPhone 16e, or a similar).
++
++On success, the test suite will exit and report successful completion of the
++test suite. On a 2022 M1 MacBook Pro, the test suite takes approximately 15
++minutes to run; a couple of extra minutes is required to compile the testbed
++project, and then boot and prepare the iOS simulator.
++
++### Debugging test failures
++
++Running `python Apple test iOS` generates a standalone version of the
++`Apple/testbed` project, and runs the full test suite. It does this using
++`Apple/testbed` itself - the folder is an executable module that can be used
++to create and run a clone of the testbed project. The standalone version of the
++testbed will be created in a directory named
++`cross-build/iOS-testbed.<timestamp>`.
++
++You can generate your own standalone testbed instance by running:
++```
++python cross-build/iOS/testbed clone my-testbed
++```
++
++In this invocation, `my-testbed` is the name of the folder for the new
++testbed clone.
++
++If you've built your own XCframework, or you only want to test a single architecture,
++you can construct a standalone testbed instance by running:
++```
++python Apple/testbed clone --platform iOS --framework <path/to/framework> my-testbed
++```
++
++The framework path can be the path path to a `Python.xcframework`, or the
++path to a folder that contains a single-platform `Python.framework`.
++
++You can then use the `my-testbed` folder to run the Python test suite,
++passing in any command line arguments you may require. For example, if you're
++trying to diagnose a failure in the `os` module, you might run:
++```
++python my-testbed run -- test -W test_os
++```
++
++This is the equivalent of running `python -m test -W test_os` on a desktop
++Python build. Any arguments after the `--` will be passed to testbed as if
++they were arguments to `python -m` on a desktop machine.
++
++### Testing in Xcode
++
++You can also open the testbed project in Xcode by running:
++```
++open my-testbed/iOSTestbed.xcodeproj
++```
++
++This will allow you to use the full Xcode suite of tools for debugging.
++
++The arguments used to run the test suite are defined as part of the test plan.
++To modify the test plan, select the test plan node of the project tree (it
++should be the first child of the root node), and select the "Configurations"
++tab. Modify the "Arguments Passed On Launch" value to change the testing
++arguments.
++
++The test plan also disables parallel testing, and specifies the use of the
++`Testbed.lldbinit` file for providing configuration of the debugger. The
++default debugger configuration disables automatic breakpoints on the
++`SIGINT`, `SIGUSR1`, `SIGUSR2`, and `SIGXFSZ` signals.
++
++### Testing on an iOS device
++
++To test on an iOS device, the app needs to be signed with known developer
++credentials. To obtain these credentials, you must have an iOS Developer
++account, and your Xcode install will need to be logged into your account (see
++the Accounts tab of the Preferences dialog).
++
++Once the project is open, and you're signed into your Apple Developer account,
++select the root node of the project tree (labeled "iOSTestbed"), then the
++"Signing & Capabilities" tab in the details page. Select a development team
++(this will likely be your own name), and plug in a physical device to your
++macOS machine with a USB cable. You should then be able to select your physical
++device from the list of targets in the pulldown in the Xcode titlebar.
 --- /dev/null
-+++ b/tvOS/Resources/Info.plist.in
++++ b/Apple/iOS/Resources/Info.plist.in
 @@ -0,0 +1,34 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
@@ -1994,106 +1417,92 @@ index c3e261ecd9e..26ef7a95de4 100644
 +	<key>CFBundleSignature</key>
 +	<string>????</string>
 +	<key>CFBundleVersion</key>
-+	<string>1</string>
++	<string>%VERSION%</string>
 +	<key>CFBundleSupportedPlatforms</key>
 +	<array>
-+		<string>tvOS</string>
++		<string>iPhoneOS</string>
 +	</array>
 +	<key>MinimumOSVersion</key>
-+	<string>@TVOS_DEPLOYMENT_TARGET@</string>
++	<string>@IPHONEOS_DEPLOYMENT_TARGET@</string>
 +</dict>
 +</plist>
 --- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-ar
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-ar
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvos${TVOS_SDK_VERSION} ar "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} ar "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-clang
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-clang
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET} "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-clang++
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-clang++
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvos${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} clang++ -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET} "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-cpp
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-cpp
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos -E "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET} -E "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-ar
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-ar
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} ar "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-clang
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos-simulator "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang++
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-clang++
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos-simulator "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang++ -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-cpp
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-cpp
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos-simulator -E "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator -E "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-ar
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-strip
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} ar "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} strip -arch arm64 "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-strip
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos-simulator "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} strip -arch arm64 "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang++
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-ar
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target x86_64-apple-tvos-simulator "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar "$@"
 --- /dev/null
-+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-cpp
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-clang
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos-simulator -E "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator "$@"
 --- /dev/null
-+++ b/tvOS/Resources/dylib-Info-template.plist
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleExecutable</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string></string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
-+	<key>CFBundleShortVersionString</key>
-+	<string>1.0</string>
-+	<key>CFBundleSupportedPlatforms</key>
-+	<array>
-+		<string>tvOS</string>
-+	</array>
-+	<key>MinimumOSVersion</key>
-+	<string>9.0</string>
-+	<key>CFBundleVersion</key>
-+	<string>1</string>
-+</dict>
-+</plist>
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang++ -target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator "$@"
 --- /dev/null
-+++ b/tvOS/Resources/pyconfig.h
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} strip -arch x86_64 "$@"
+--- /dev/null
++++ b/Apple/iOS/Resources/pyconfig.h
 @@ -0,0 +1,7 @@
 +#ifdef __arm64__
 +#include "pyconfig-arm64.h"
@@ -2103,84 +1512,415 @@ index c3e261ecd9e..26ef7a95de4 100644
 +#include "pyconfig-x86_64.h"
 +#endif
 --- /dev/null
-+++ b/visionOS/Resources/Info.plist.in
-@@ -0,0 +1,34 @@
++++ b/Apple/testbed/Python.xcframework/Info.plist
+@@ -0,0 +1,136 @@
 +<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-+<plist version="0.9">
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
 +<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleExecutable</key>
-+	<string>Python</string>
-+	<key>CFBundleGetInfoString</key>
-+	<string>Python Runtime and Library</string>
-+	<key>CFBundleIdentifier</key>
-+	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<key>AvailableLibraries</key>
++	<array>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>ios-arm64</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>ios</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>ios-arm64_x86_64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++				<string>x86_64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>ios</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>tvos-arm64</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>tvos</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>tvos-arm64_x86_64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++				<string>x86_64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>tvos</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>xros-arm64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>xros</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>xros-arm64</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>xros</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>watchos-arm64_x86_64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++				<string>x86_64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>watchos</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>watchos-arm64_32</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64_32</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>watchos</string>
++		</dict>
++	</array>
++	<key>CFBundlePackageType</key>
++	<string>XFWK</string>
++	<key>XCFrameworkFormatVersion</key>
++	<string>1.0</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/build/iOS-dylib-Info-template.plist
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string></string>
 +	<key>CFBundleInfoDictionaryVersion</key>
 +	<string>6.0</string>
-+	<key>CFBundleName</key>
-+	<string>Python</string>
 +	<key>CFBundlePackageType</key>
-+	<string>FMWK</string>
++	<string>APPL</string>
 +	<key>CFBundleShortVersionString</key>
-+	<string>%VERSION%</string>
-+	<key>CFBundleLongVersionString</key>
-+	<string>%VERSION%, (c) 2001-2023 Python Software Foundation.</string>
-+	<key>CFBundleSignature</key>
-+	<string>????</string>
-+	<key>CFBundleVersion</key>
-+	<string>%VERSION%</string>
++	<string>1.0</string>
 +	<key>CFBundleSupportedPlatforms</key>
 +	<array>
-+		<string>XROS</string>
++		<string>iPhoneOS</string>
 +	</array>
 +	<key>MinimumOSVersion</key>
-+	<string>@XROS_DEPLOYMENT_TARGET@</string>
++	<string>13.0</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
 +</dict>
 +</plist>
 --- /dev/null
-+++ b/visionOS/Resources/bin/arm64-apple-xros-ar
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk xros${XROS_SDK_VERSION} ar "$@"
---- /dev/null
-+++ b/visionOS/Resources/bin/arm64-apple-xros-clang
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk xros${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} "$@"
---- /dev/null
-+++ b/visionOS/Resources/bin/arm64-apple-xros-clang++
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk xros${XROS_SDK_VERSION} clang++ -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} "$@"
---- /dev/null
-+++ b/visionOS/Resources/bin/arm64-apple-xros-cpp
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk xros${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} -E "$@"
---- /dev/null
-+++ b/visionOS/Resources/bin/arm64-apple-xros-simulator-ar
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk xrsimulator${XROS_SDK_VERSION} ar "$@"
---- /dev/null
-+++ b/visionOS/Resources/bin/arm64-apple-xros-simulator-clang
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator "$@"
++++ b/Apple/testbed/Python.xcframework/build/tvOS-dylib-Info-template.plist
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string></string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>tvOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>9.0</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++</dict>
++</plist>
 --- /dev/null
-+++ b/visionOS/Resources/bin/arm64-apple-xros-simulator-clang++
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang++ -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator "$@"
++++ b/Apple/testbed/Python.xcframework/build/utils.sh
+@@ -0,0 +1,179 @@
++# Utility methods for use in an Xcode project.
++#
++# An iOS XCframework cannot include any content other than the library binary
++# and relevant metadata. However, Python requires a standard library at runtime.
++# Therefore, it is necessary to add a build step to an Xcode app target that
++# processes the standard library and puts the content into the final app.
++#
++# In general, these tools will be invoked after bundle resources have been
++# copied into the app, but before framework embedding (and signing).
++#
++# The following is an example script, assuming that:
++# * Python.xcframework is in the root of the project
++# * There is an `app` folder that contains the app code
++# * There is an `app_packages` folder that contains installed Python packages.
++# -----
++#   set -e
++#   source $PROJECT_DIR/Python.xcframework/build/build_utils.sh
++#   install_python Python.xcframework app app_packages
++# -----
++
++# Copy the standard library from the XCframework into the app bundle.
++#
++# Accepts one argument:
++# 1. The path, relative to the root of the Xcode project, where the Python
++#    XCframework can be found.
++install_stdlib() {
++    PYTHON_XCFRAMEWORK_PATH=$1
++
++    mkdir -p "$CODESIGNING_FOLDER_PATH/python/lib"
++    if [ "$EFFECTIVE_PLATFORM_NAME" = "-iphonesimulator" ]; then
++        echo "Installing Python modules for iOS Simulator"
++        if [ -d "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/ios-arm64-simulator" ]; then
++            SLICE_FOLDER="ios-arm64-simulator"
++        else
++            SLICE_FOLDER="ios-arm64_x86_64-simulator"
++        fi
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-iphoneos" ]; then
++        echo "Installing Python modules for iOS Device"
++        SLICE_FOLDER="ios-arm64"
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-appletvsimulator" ]; then
++        echo "Installing Python modules for tvOS Simulator"
++        if [ -d "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/tvos-arm64-simulator" ]; then
++            SLICE_FOLDER="tvos-arm64-simulator"
++        else
++            SLICE_FOLDER="tvos-arm64_x86_64-simulator"
++        fi
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-appletvos" ]; then
++        echo "Installing Python modules for tvOS Device"
++        SLICE_FOLDER="tvos-arm64"
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-watchsimulator" ]; then
++        echo "Installing Python modules for watchOS Simulator"
++        if [ -d "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/watchos-arm64-simulator" ]; then
++            SLICE_FOLDER="watchos-arm64-simulator"
++        else
++            SLICE_FOLDER="watchos-arm64_x86_64-simulator"
++        fi
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-watchos" ]; then
++        echo "Installing Python modules for watchOS Device"
++        SLICE_FOLDER="watchos-arm64"
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-xrsimulator" ]; then
++        echo "Installing Python modules for visionOS Simulator"
++        SLICE_FOLDER="xros-arm64-simulator"
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-xros" ]; then
++        echo "Installing Python modules for visionOS Device"
++        SLICE_FOLDER="xros-arm64"
++    else
++        echo "Unsupported platform name $EFFECTIVE_PLATFORM_NAME"
++        exit 1
++    fi
++
++    # If the XCframework has a shared lib folder, then it's a full framework.
++    # Copy both the common and slice-specific part of the lib directory.
++    # Otherwise, it's a single-arch framework; use the "full" lib folder.
++    if [ -d "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/lib" ]; then
++        rsync -au --delete "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
++        rsync -au "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/$SLICE_FOLDER/lib-$ARCHS/" "$CODESIGNING_FOLDER_PATH/python/lib/"
++    else
++        rsync -au --delete "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/$SLICE_FOLDER/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
++    fi
++}
++
++# Convert a single .so library into a framework that iOS can load.
++#
++# Accepts three arguments:
++# 1. The path, relative to the root of the Xcode project, where the Python
++#    XCframework can be found.
++# 2. The base path, relative to the installed location in the app bundle, that
++#    needs to be processed. Any .so file found in this path (or a subdirectory
++#    of it) will be processed.
++# 2. The full path to a single .so file to process. This path should include
++#    the base path.
++install_dylib () {
++    PYTHON_XCFRAMEWORK_PATH=$1
++    INSTALL_BASE=$2
++    FULL_EXT=$3
++
++    # The name of the extension file
++    EXT=$(basename "$FULL_EXT")
++    # The name and location of the module
++    MODULE_PATH=$(dirname "$FULL_EXT")
++    MODULE_NAME=$(echo $EXT | cut -d "." -f 1)
++    # The location of the extension file, relative to the bundle
++    RELATIVE_EXT=${FULL_EXT#$CODESIGNING_FOLDER_PATH/}
++    # The path to the extension file, relative to the install base
++    PYTHON_EXT=${RELATIVE_EXT/$INSTALL_BASE/}
++    # The full dotted name of the extension module, constructed from the file path.
++    FULL_MODULE_NAME=$(echo $PYTHON_EXT | cut -d "." -f 1 | tr "/" ".");
++    # A bundle identifier; not actually used, but required by Xcode framework packaging
++    FRAMEWORK_BUNDLE_ID=$(echo $PRODUCT_BUNDLE_IDENTIFIER.$FULL_MODULE_NAME | tr "_" "-")
++    # The name of the framework folder.
++    FRAMEWORK_FOLDER="Frameworks/$FULL_MODULE_NAME.framework"
++
++    # If the framework folder doesn't exist, create it.
++    if [ ! -d "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER" ]; then
++        echo "Creating framework for $RELATIVE_EXT"
++        mkdir -p "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER"
++        cp "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/build/$PLATFORM_FAMILY_NAME-dylib-Info-template.plist" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
++        plutil -replace CFBundleExecutable -string "$FULL_MODULE_NAME" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
++        plutil -replace CFBundleIdentifier -string "$FRAMEWORK_BUNDLE_ID" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
++    fi
++
++    echo "Installing binary for $FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
++    mv "$FULL_EXT" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
++    # Create a placeholder .fwork file where the .so was
++    echo "$FRAMEWORK_FOLDER/$FULL_MODULE_NAME" > ${FULL_EXT%.so}.fwork
++    # Create a back reference to the .so file location in the framework
++    echo "${RELATIVE_EXT%.so}.fwork" > "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME.origin"
++
++    # If the framework provides an xcprivacy file, install it.
++    if [ -e "$MODULE_PATH/$MODULE_NAME.xcprivacy" ]; then
++        echo "Installing XCPrivacy file for $FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
++        XCPRIVACY_FILE="$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/PrivacyInfo.xcprivacy"
++        if [ -e "$XCPRIVACY_FILE" ]; then
++          rm -rf "$XCPRIVACY_FILE"
++        fi
++        mv "$MODULE_PATH/$MODULE_NAME.xcprivacy" "$XCPRIVACY_FILE"
++    fi
++
++    echo "Signing framework as $EXPANDED_CODE_SIGN_IDENTITY_NAME ($EXPANDED_CODE_SIGN_IDENTITY)..."
++    /usr/bin/codesign --force --sign "$EXPANDED_CODE_SIGN_IDENTITY" ${OTHER_CODE_SIGN_FLAGS:-} -o runtime --timestamp=none --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER"
++}
++
++# Process all the dynamic libraries in a path into Framework format.
++#
++# Accepts two arguments:
++# 1. The path, relative to the root of the Xcode project, where the Python
++#    XCframework can be found.
++# 2. The base path, relative to the installed location in the app bundle, that
++#    needs to be processed. Any .so file found in this path (or a subdirectory
++#    of it) will be processed.
++process_dylibs () {
++    PYTHON_XCFRAMEWORK_PATH=$1
++    LIB_PATH=$2
++    find "$CODESIGNING_FOLDER_PATH/$LIB_PATH" -name "*.so" | while read FULL_EXT; do
++        install_dylib $PYTHON_XCFRAMEWORK_PATH "$LIB_PATH/" "$FULL_EXT"
++    done
++}
++
++# The entry point for post-processing a Python XCframework.
++#
++# Accepts 1 or more arguments:
++# 1. The path, relative to the root of the Xcode project, where the Python
++#    XCframework can be found. If the XCframework is in the root of the project,
++# 2+. The path of a package, relative to the root of the packaged app, that contains
++#     library content that should be processed for binary libraries.
++install_python() {
++    PYTHON_XCFRAMEWORK_PATH=$1
++    shift
++
++    install_stdlib $PYTHON_XCFRAMEWORK_PATH
++    PYTHON_VER=$(ls -1 "$CODESIGNING_FOLDER_PATH/python/lib")
++    echo "Install Python $PYTHON_VER standard library extension modules..."
++    process_dylibs $PYTHON_XCFRAMEWORK_PATH python/lib/$PYTHON_VER/lib-dynload
++
++    for package_path in $@; do
++        echo "Installing $package_path extension modules ..."
++        process_dylibs $PYTHON_XCFRAMEWORK_PATH $package_path
++    done
++}
 --- /dev/null
-+++ b/visionOS/Resources/bin/arm64-apple-xros-simulator-cpp
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk xrsimulator clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator -E "$@"
++++ b/Apple/testbed/Python.xcframework/build/watchOS-dylib-Info-template.plist
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string></string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>watchOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>4.0</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++</dict>
++</plist>
 --- /dev/null
-+++ b/visionOS/Resources/dylib-Info-template.plist
++++ b/Apple/testbed/Python.xcframework/build/xrOS-dylib-Info-template.plist
 @@ -0,0 +1,30 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -2213,320 +1953,408 @@ index c3e261ecd9e..26ef7a95de4 100644
 +</dict>
 +</plist>
 --- /dev/null
-+++ b/visionOS/testbed/Python.xcframework/Info.plist
-@@ -0,0 +1,43 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>AvailableLibraries</key>
-+	<array>
-+		<dict>
-+			<key>BinaryPath</key>
-+			<string>Python.framework/Python</string>
-+			<key>LibraryIdentifier</key>
-+			<string>xros-arm64-simulator</string>
-+			<key>LibraryPath</key>
-+			<string>Python.framework</string>
-+			<key>SupportedArchitectures</key>
-+			<array>
-+				<string>arm64</string>
-+			</array>
-+			<key>SupportedPlatform</key>
-+			<string>xros</string>
-+			<key>SupportedPlatformVariant</key>
-+			<string>simulator</string>
-+		</dict>
-+		<dict>
-+			<key>BinaryPath</key>
-+			<string>Python.framework/Python</string>
-+			<key>LibraryIdentifier</key>
-+			<string>xros-arm64</string>
-+			<key>LibraryPath</key>
-+			<string>Python.framework</string>
-+			<key>SupportedArchitectures</key>
-+			<array>
-+				<string>arm64</string>
-+			</array>
-+			<key>SupportedPlatform</key>
-+			<string>xros</string>
-+		</dict>
-+	</array>
-+	<key>CFBundlePackageType</key>
-+	<string>XFWK</string>
-+	<key>XCFrameworkFormatVersion</key>
-+	<string>1.0</string>
-+</dict>
-+</plist>
++++ b/Apple/testbed/Python.xcframework/ios-arm64/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling an iOS on-device
++build for testing purposes.
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/ios-arm64_x86_64-simulator/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling an iOS simulator
++build for testing purposes (either x86_64 or ARM64).
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/tvos-arm64/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling a tvOS
++on-device build for testing purposes.
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/tvos-arm64_x86_64-simulator/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling a tvOS
++simulator build for testing purposes (either x86_64 or ARM64).
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/watchos-arm64_32/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling a watchOS on-device
++build for testing purposes.
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/watchos-arm64_x86_64-simulator/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling a watchOS
++simulator build for testing purposes (either x86_64 or ARM64).
 --- /dev/null
-+++ b/visionOS/testbed/Python.xcframework/xros-arm64-simulator/README
++++ b/Apple/testbed/Python.xcframework/xros-arm64-simulator/README
 @@ -0,0 +1,4 @@
 +This directory is intentionally empty.
 +
 +It should be used as a target for `--enable-framework` when compiling an visionOS simulator
 +build for testing purposes (either x86_64 or ARM64).
 --- /dev/null
-+++ b/visionOS/testbed/Python.xcframework/xros-arm64/README
++++ b/Apple/testbed/Python.xcframework/xros-arm64/README
 @@ -0,0 +1,4 @@
 +This directory is intentionally empty.
 +
 +It should be used as a target for `--enable-framework` when compiling an visionOS on-device
 +build for testing purposes.
 --- /dev/null
-+++ b/visionOS/testbed/__main__.py
-@@ -0,0 +1,512 @@
-+import argparse
-+import asyncio
-+import fcntl
-+import json
-+import os
-+import plistlib
-+import re
-+import shutil
-+import subprocess
-+import sys
-+import tempfile
-+from contextlib import asynccontextmanager
-+from datetime import datetime
-+from pathlib import Path
++++ b/Apple/testbed/Testbed.lldbinit
+@@ -0,0 +1,4 @@
++process handle SIGINT -n true -p true -s false
++process handle SIGUSR1 -n true -p true -s false
++process handle SIGUSR2 -n true -p true -s false
++process handle SIGXFSZ -n true -p true -s false
+--- /dev/null
++++ b/Apple/testbed/TestbedTests/TestbedTests.m
+@@ -0,0 +1,197 @@
++#import <XCTest/XCTest.h>
++#import <Python/Python.h>
 +
++@interface TestbedTests : XCTestCase
 +
-+DECODE_ARGS = ("UTF-8", "backslashreplace")
++@end
 +
-+# The system log prefixes each line:
-+#   2025-01-17 16:14:29.090 Df visionOSTestbed[23987:1fd393b4] (Python) ...
-+#   2025-01-17 16:14:29.090 E  visionOSTestbed[23987:1fd393b4] (Python) ...
++@implementation TestbedTests
 +
-+LOG_PREFIX_REGEX = re.compile(
-+    r"^\d{4}-\d{2}-\d{2}"  # YYYY-MM-DD
-+    r"\s+\d+:\d{2}:\d{2}\.\d+"  # HH:MM:SS.sss
-+    r"\s+\w+"  # Df/E
-+    r"\s+visionOSTestbed\[\d+:\w+\]"  # Process/thread ID
-+    r"\s+\(Python\)\s"  # Logger name
-+)
 +
++- (void)testPython {
++    const char **argv;
++    int exit_code;
++    int failed;
++    PyStatus status;
++    PyPreConfig preconfig;
++    PyConfig config;
++    PyObject *app_packages_path;
++    PyObject *method_args;
++    PyObject *result;
++    PyObject *site_module;
++    PyObject *site_addsitedir_attr;
++    PyObject *sys_module;
++    PyObject *sys_path_attr;
++    NSArray *test_args;
++    NSString *python_home;
++    NSString *path;
++    wchar_t *wtmp_str;
++
++    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
++
++    // Set some other common environment indicators to disable color, as the
++    // Xcode log can't display color. Stdout will report that it is *not* a
++    // TTY.
++    setenv("NO_COLOR", "1", true);
++    setenv("PYTHON_COLORS", "0", true);
++
++    // Arguments to pass into the test suite runner.
++    // argv[0] must identify the process; any subsequent arg
++    // will be handled as if it were an argument to `python -m test`
++    // The processInfo arguments contain the binary that is running,
++    // followed by the arguments defined in the test plan. This means:
++    //    run_module = test_args[1]
++    //    argv = ["Testbed"] + test_args[2:]
++    test_args = [[NSProcessInfo processInfo] arguments];
++    if (test_args == NULL) {
++        NSLog(@"Unable to identify test arguments.");
++    }
++    NSLog(@"Test arguments: %@", test_args);
++    argv = malloc(sizeof(char *) * ([test_args count] - 1));
++    argv[0] = "Testbed";
++    for (int i = 1; i < [test_args count] - 1; i++) {
++        argv[i] = [[test_args objectAtIndex:i+1] UTF8String];
++    }
++
++    // Generate an isolated Python configuration.
++    NSLog(@"Configuring isolated Python...");
++    PyPreConfig_InitIsolatedConfig(&preconfig);
++    PyConfig_InitIsolatedConfig(&config);
++
++    // Configure the Python interpreter:
++    // Enforce UTF-8 encoding for stderr, stdout, file-system encoding and locale.
++    // See https://docs.python.org/3/library/os.html#python-utf-8-mode.
++    preconfig.utf8_mode = 1;
++    // Use the system logger for stdout/err
++    config.use_system_logger = 1;
++    // Don't buffer stdio. We want output to appears in the log immediately
++    config.buffered_stdio = 0;
++    // Don't write bytecode; we can't modify the app bundle
++    // after it has been signed.
++    config.write_bytecode = 0;
++    // Ensure that signal handlers are installed
++    config.install_signal_handlers = 1;
++    // Run the test module.
++    config.run_module = Py_DecodeLocale([[test_args objectAtIndex:1] UTF8String], NULL);
++    // For debugging - enable verbose mode.
++    // config.verbose = 1;
++
++    NSLog(@"Pre-initializing Python runtime...");
++    status = Py_PreInitialize(&preconfig);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to pre-initialize Python interpreter: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    // Set the home for the Python interpreter
++    python_home = [NSString stringWithFormat:@"%@/python", resourcePath, nil];
++    NSLog(@"PythonHome: %@", python_home);
++    wtmp_str = Py_DecodeLocale([python_home UTF8String], NULL);
++    status = PyConfig_SetString(&config, &config.home, wtmp_str);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to set PYTHONHOME: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
++
++    // Read the site config
++    status = PyConfig_Read(&config);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to read site config: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    NSLog(@"Configure argc/argv...");
++    status = PyConfig_SetBytesArgv(&config, [test_args count] - 1, (char**) argv);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to configure argc/argv: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
 +
-+# Work around a bug involving sys.exit and TaskGroups
-+# (https://github.com/python/cpython/issues/101515).
-+def exit(*args):
-+    raise MySystemExit(*args)
++    NSLog(@"Initializing Python runtime...");
++    status = Py_InitializeFromConfig(&config);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to initialize Python interpreter: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
 +
++    // Add app_packages as a site directory. This both adds to sys.path,
++    // and ensures that any .pth files in that directory will be executed.
++    site_module = PyImport_ImportModule("site");
++    if (site_module == NULL) {
++        XCTFail(@"Could not import site module");
++        return;
++    }
 +
-+class MySystemExit(Exception):
-+    pass
++    site_addsitedir_attr = PyObject_GetAttrString(site_module, "addsitedir");
++    if (site_addsitedir_attr == NULL || !PyCallable_Check(site_addsitedir_attr)) {
++        XCTFail(@"Could not access site.addsitedir");
++        return;
++    }
 +
++    path = [NSString stringWithFormat:@"%@/app_packages", resourcePath, nil];
++    NSLog(@"App packages path: %@", path);
++    wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
++    app_packages_path = PyUnicode_FromWideChar(wtmp_str, wcslen(wtmp_str));
++    if (app_packages_path == NULL) {
++        XCTFail(@"Could not convert app_packages path to unicode");
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
 +
-+class SimulatorLock:
-+    # An fcntl-based filesystem lock that can be used to ensure that
-+    def __init__(self, timeout):
-+        self.filename = Path(tempfile.gettempdir()) / "python-visionos-testbed"
-+        self.timeout = timeout
++    method_args = Py_BuildValue("(O)", app_packages_path);
++    if (method_args == NULL) {
++        XCTFail(@"Could not create arguments for site.addsitedir");
++        return;
++    }
 +
-+        self.fd = None
++    result = PyObject_CallObject(site_addsitedir_attr, method_args);
++    if (result == NULL) {
++        XCTFail(@"Could not add app_packages directory using site.addsitedir");
++        return;
++    }
 +
-+    async def acquire(self):
-+        # Ensure the lockfile exists
-+        self.filename.touch(exist_ok=True)
++    // Add test code to sys.path
++    sys_module = PyImport_ImportModule("sys");
++    if (sys_module == NULL) {
++        XCTFail(@"Could not import sys module");
++        return;
++    }
 +
-+        # Try `timeout` times to acquire the lock file, with a 1 second pause
-+        # between each attempt. Report status every 10 seconds.
-+        for i in range(0, self.timeout):
-+            try:
-+                fd = os.open(self.filename, os.O_RDWR | os.O_TRUNC, 0o644)
-+                fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-+            except OSError:
-+                os.close(fd)
-+                if i % 10 == 0:
-+                    print("... waiting", flush=True)
-+                await asyncio.sleep(1)
-+            else:
-+                self.fd = fd
-+                return
++    sys_path_attr = PyObject_GetAttrString(sys_module, "path");
++    if (sys_path_attr == NULL) {
++        XCTFail(@"Could not access sys.path");
++        return;
++    }
 +
-+        # If we reach the end of the loop, we've exceeded the allowed number of
-+        # attempts.
-+        raise ValueError("Unable to obtain lock on visionOS simulator creation")
-+
-+    def release(self):
-+        # If a lock is held, release it.
-+        if self.fd is not None:
-+            # Release the lock.
-+            fcntl.flock(self.fd, fcntl.LOCK_UN)
-+            os.close(self.fd)
-+            self.fd = None
-+
-+
-+# All subprocesses are executed through this context manager so that no matter
-+# what happens, they can always be cancelled from another task, and they will
-+# always be cleaned up on exit.
-+@asynccontextmanager
-+async def async_process(*args, **kwargs):
-+    process = await asyncio.create_subprocess_exec(*args, **kwargs)
-+    try:
-+        yield process
-+    finally:
-+        if process.returncode is None:
-+            # Allow a reasonably long time for Xcode to clean itself up,
-+            # because we don't want stale emulators left behind.
-+            timeout = 10
-+            process.terminate()
-+            try:
-+                await asyncio.wait_for(process.wait(), timeout)
-+            except TimeoutError:
-+                print(
-+                    f"Command {args} did not terminate after {timeout} seconds "
-+                    f" - sending SIGKILL"
-+                )
-+                process.kill()
++    path = [NSString stringWithFormat:@"%@/app", resourcePath, nil];
++    NSLog(@"App path: %@", path);
++    wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
++    failed = PyList_Insert(sys_path_attr, 0, PyUnicode_FromString([path UTF8String]));
++    if (failed) {
++        XCTFail(@"Unable to add app to sys.path");
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
 +
-+                # Even after killing the process we must still wait for it,
-+                # otherwise we'll get the warning "Exception ignored in __del__".
-+                await asyncio.wait_for(process.wait(), timeout=1)
++    // Ensure the working directory is the app folder.
++    chdir([path UTF8String]);
 +
++    // Start the test suite. Print a separator to differentiate Python startup logs from app logs
++    NSLog(@"---------------------------------------------------------------------------");
 +
-+async def async_check_output(*args, **kwargs):
-+    async with async_process(
-+        *args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs
-+    ) as process:
-+        stdout, stderr = await process.communicate()
-+        if process.returncode == 0:
-+            return stdout.decode(*DECODE_ARGS)
-+        else:
-+            raise subprocess.CalledProcessError(
-+                process.returncode,
-+                args,
-+                stdout.decode(*DECODE_ARGS),
-+                stderr.decode(*DECODE_ARGS),
-+            )
++    exit_code = Py_RunMain();
++    XCTAssertEqual(exit_code, 0, @"Test suite did not pass");
 +
++    NSLog(@"---------------------------------------------------------------------------");
 +
-+# Return a list of UDIDs associated with booted simulators
-+async def list_devices():
-+    try:
-+        # List the testing simulators, in JSON format
-+        raw_json = await async_check_output(
-+            "xcrun", "simctl", "--set", "testing", "list", "-j"
-+        )
-+        json_data = json.loads(raw_json)
-+
-+        # Filter out the booted visionOS simulators
-+        return [
-+            simulator["udid"]
-+            for runtime, simulators in json_data["devices"].items()
-+            for simulator in simulators
-+            if runtime.split(".")[-1].startswith("xrOS") and simulator["state"] == "Booted"
-+        ]
-+    except subprocess.CalledProcessError as e:
-+        # If there's no ~/Library/Developer/XCTestDevices folder (which is the
-+        # case on fresh installs, and in some CI environments), `simctl list`
-+        # returns error code 1, rather than an empty list. Handle that case,
-+        # but raise all other errors.
-+        if e.returncode == 1:
-+            return []
-+        else:
-+            raise
-+
-+
-+async def find_device(initial_devices, lock):
-+    while True:
-+        new_devices = set(await list_devices()).difference(initial_devices)
-+        if len(new_devices) == 0:
-+            await asyncio.sleep(1)
-+        elif len(new_devices) == 1:
-+            udid = new_devices.pop()
-+            print(f"{datetime.now():%Y-%m-%d %H:%M:%S}: New test simulator detected")
-+            print(f"UDID: {udid}", flush=True)
-+            lock.release()
-+            return udid
-+        else:
-+            exit(f"Found more than one new device: {new_devices}")
++    Py_Finalize();
++}
 +
 +
-+async def log_stream_task(initial_devices, lock):
-+    # Wait up to 5 minutes for the build to complete and the simulator to boot.
-+    udid = await asyncio.wait_for(find_device(initial_devices, lock), 5 * 60)
++@end
+--- /dev/null
++++ b/Apple/testbed/__main__.py
+@@ -0,0 +1,436 @@
++import argparse
++import json
++import re
++import shutil
++import subprocess
++import sys
++from pathlib import Path
 +
-+    # Stream the visionOS device's logs, filtering out messages that come from the
-+    # XCTest test suite (catching NSLog messages from the test method), or
-+    # Python itself (catching stdout/stderr content routed to the system log
-+    # with config->use_system_logger).
-+    args = [
-+        "xcrun",
-+        "simctl",
-+        "--set",
-+        "testing",
-+        "spawn",
-+        udid,
-+        "log",
-+        "stream",
-+        "--style",
-+        "compact",
-+        "--predicate",
-+        (
-+            'senderImagePath ENDSWITH "/visionOSTestbedTests.xctest/visionOSTestbedTests"'
-+            ' OR senderImagePath ENDSWITH "/Python.framework/Python"'
-+        ),
-+    ]
++TEST_SLICES = {
++    "iOS": "ios-arm64_x86_64-simulator",
++    "tvOS": "tvos-arm64_x86_64-simulator",
++    "visionOS": "xros-arm64-simulator",
++    "watchOS": "watchos-arm64_x86_64-simulator",
++}
 +
-+    async with async_process(
-+        *args,
-+        stdout=subprocess.PIPE,
-+        stderr=subprocess.STDOUT,
-+    ) as process:
-+        suppress_dupes = False
-+        while line := (await process.stdout.readline()).decode(*DECODE_ARGS):
-+            # Strip the prefix from each log line
-+            line = LOG_PREFIX_REGEX.sub("", line)
-+            # The visionOS log streamer can sometimes lag; when it does, it outputs
-+            # a warning about messages being dropped... often multiple times.
-+            # Only print the first of these duplicated warnings.
-+            if line.startswith("=== Messages dropped "):
-+                if not suppress_dupes:
-+                    suppress_dupes = True
-+                    sys.stdout.write(line)
-+            else:
-+                suppress_dupes = False
-+                sys.stdout.write(line)
-+            sys.stdout.flush()
++DECODE_ARGS = ("UTF-8", "backslashreplace")
++
++# The system log prefixes each line:
++#   2025-01-17 16:14:29.093742+0800 iOSTestbed[23987:1fd393b4] ...
++#   2025-01-17 16:14:29.093742+0800 iOSTestbed[23987:1fd393b4] ...
++
++LOG_PREFIX_REGEX = re.compile(
++    r"^\d{4}-\d{2}-\d{2}"  # YYYY-MM-DD
++    r"\s+\d+:\d{2}:\d{2}\.\d+\+\d{4}"  # HH:MM:SS.ssssss+ZZZZ
++    r"\s+.*Testbed\[\d+:\w+\]"  # Process/thread ID
++)
++
++
++# Select a simulator device to use.
++def select_simulator_device(platform):
++    # List the testing simulators, in JSON format
++    raw_json = subprocess.check_output(["xcrun", "simctl", "list", "-j"])
++    json_data = json.loads(raw_json)
++
++    if platform == "iOS":
++        # Any iOS device will do; we'll look for "SE" devices - but the name isn't
++        # consistent over time. Older Xcode versions will use "iPhone SE (Nth
++        # generation)"; As of 2025, they've started using "iPhone 16e".
++        #
++        # When Xcode is updated after a new release, new devices will be available
++        # and old ones will be dropped from the set available on the latest iOS
++        # version. Select the one with the highest minimum runtime version - this
++        # is an indicator of the "newest" released device, which should always be
++        # supported on the "most recent" iOS version.
++        se_simulators = sorted(
++            (devicetype["minRuntimeVersion"], devicetype["name"])
++            for devicetype in json_data["devicetypes"]
++            if devicetype["productFamily"] == "iPhone"
++            and (
++                (
++                    "iPhone " in devicetype["name"]
++                    and devicetype["name"].endswith("e")
++                )
++                or "iPhone SE " in devicetype["name"]
++            )
++        )
++        simulator = se_simulators[-1][1]
++    elif platform == "tvOS":
++        # Find the most recent tvOS release.
++        simulators = sorted(
++            (devicetype["minRuntimeVersion"], devicetype["name"])
++            for devicetype in json_data["devicetypes"]
++            if devicetype["productFamily"] == "Apple TV"
++        )
++        simulator = simulators[-1][1]
++    elif platform == "visionOS":
++        # Find the most recent visionOS release.
++        simulators = sorted(
++            (devicetype["minRuntimeVersion"], devicetype["name"])
++            for devicetype in json_data["devicetypes"]
++            if devicetype["productFamily"] == "Apple Vision"
++        )
++        simulator = simulators[-1][1]
++    elif platform == "watchOS":
++        raise NotImplementedError(f"Don't know how to launch watchOS (yet)")
++    else:
++        raise ValueError(f"Unknown platform {platform}")
++
++    return simulator
 +
 +
-+async def xcode_test(location, simulator, verbose):
-+    # Run the test suite on the named simulator
-+    print("Starting xcodebuild...", flush=True)
++def xcode_test(location: Path, platform: str, simulator: str, verbose: bool):
++    # Build and run the test suite on the named simulator.
 +    args = [
-+        "xcodebuild",
-+        "test",
 +        "-project",
-+        str(location / "visionOSTestbed.xcodeproj"),
++        str(location / f"{platform}Testbed.xcodeproj"),
 +        "-scheme",
-+        "visionOSTestbed",
++        f"{platform}Testbed",
 +        "-destination",
-+        f"platform=visionOS Simulator,name={simulator}",
-+        "-resultBundlePath",
-+        str(location / f"{datetime.now():%Y%m%d-%H%M%S}.xcresult"),
++        f"platform={platform} Simulator,name={simulator}",
 +        "-derivedDataPath",
 +        str(location / "DerivedData"),
 +    ]
-+    if not verbose:
-+        args += ["-quiet"]
++    verbosity_args = [] if verbose else ["-quiet"]
++
++    print("Building test project...")
++    subprocess.run(
++        ["xcodebuild", "build-for-testing"] + args + verbosity_args,
++        check=True,
++    )
 +
-+    async with async_process(
-+        *args,
++    print("Running test project...")
++    # Test execution *can't* be run -quiet; verbose mode
++    # is how we see the output of the test output.
++    process = subprocess.Popen(
++        ["xcodebuild", "test-without-building"] + args,
 +        stdout=subprocess.PIPE,
 +        stderr=subprocess.STDOUT,
-+    ) as process:
-+        while line := (await process.stdout.readline()).decode(*DECODE_ARGS):
-+            sys.stdout.write(line)
-+            sys.stdout.flush()
++    )
++    while line := (process.stdout.readline()).decode(*DECODE_ARGS):
++        # Strip the timestamp/process prefix from each log line
++        line = LOG_PREFIX_REGEX.sub("", line)
++        sys.stdout.write(line)
++        sys.stdout.flush()
++
++    status = process.wait(timeout=5)
++    exit(status)
++
++
++def copy(src, tgt):
++    """An all-purpose copy.
 +
-+        status = await asyncio.wait_for(process.wait(), timeout=1)
-+        exit(status)
++    If src is a file, it is copied. If src is a symlink, it is copied *as a
++    symlink*. If src is a directory, the full tree is duplicated, with symlinks
++    being preserved.
++    """
++    if src.is_file() or src.is_symlink():
++        shutil.copyfile(src, tgt, follow_symlinks=False)
++    else:
++        shutil.copytree(src, tgt, symlinks=True)
 +
 +
 +def clone_testbed(
 +    source: Path,
 +    target: Path,
 +    framework: Path,
++    platform: str,
 +    apps: list[Path],
 +) -> None:
 +    if target.exists():
@@ -2535,11 +2363,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +
 +    if framework is None:
 +        if not (
-+            source / "Python.xcframework/xros-arm64-simulator/bin"
++            source / "Python.xcframework" / TEST_SLICES[platform] / "bin"
 +        ).is_dir():
 +            print(
 +                f"The testbed being cloned ({source}) does not contain "
-+                f"a simulator framework. Re-run with --framework"
++                "a framework with slices. Re-run with --framework"
 +            )
 +            sys.exit(11)
 +    else:
@@ -2557,77 +2385,90 @@ index c3e261ecd9e..26ef7a95de4 100644
 +            sys.exit(13)
 +
 +    print("Cloning testbed project:")
-+    print(f"  Cloning {source}...", end="", flush=True)
-+    shutil.copytree(source, target, symlinks=True)
++    print(f"  Cloning {source}...", end="")
++    # Only copy the files for the platform being cloned plus the files common
++    # to all platforms. The XCframework will be copied later, if needed.
++    target.mkdir(parents=True)
++
++    for name in [
++        "__main__.py",
++        "TestbedTests",
++        "Testbed.lldbinit",
++        f"{platform}Testbed",
++        f"{platform}Testbed.xcodeproj",
++        f"{platform}Testbed.xctestplan",
++    ]:
++        copy(source / name, target / name)
++
 +    print(" done")
 +
++    orig_xc_framework_path = source / "Python.xcframework"
 +    xc_framework_path = target / "Python.xcframework"
-+    sim_framework_path = xc_framework_path / "xros-arm64-simulator"
++    test_framework_path = xc_framework_path / TEST_SLICES[platform]
 +    if framework is not None:
 +        if framework.suffix == ".xcframework":
-+            print("  Installing XCFramework...", end="", flush=True)
-+            if xc_framework_path.is_dir():
-+                shutil.rmtree(xc_framework_path)
-+            else:
-+                xc_framework_path.unlink(missing_ok=True)
++            print("  Installing XCFramework...", end="")
 +            xc_framework_path.symlink_to(
 +                framework.relative_to(xc_framework_path.parent, walk_up=True)
 +            )
 +            print(" done")
 +        else:
-+            print("  Installing simulator framework...", end="", flush=True)
-+            if sim_framework_path.is_dir():
-+                shutil.rmtree(sim_framework_path)
++            print("  Installing simulator framework...", end="")
++            # We're only installing a slice of a framework; we need
++            # to do a full tree copy to make sure we don't damage
++            # symlinked content.
++            shutil.copytree(orig_xc_framework_path, xc_framework_path)
++            if test_framework_path.is_dir():
++                shutil.rmtree(test_framework_path)
 +            else:
-+                sim_framework_path.unlink(missing_ok=True)
-+            sim_framework_path.symlink_to(
-+                framework.relative_to(sim_framework_path.parent, walk_up=True)
++                test_framework_path.unlink(missing_ok=True)
++            test_framework_path.symlink_to(
++                framework.relative_to(test_framework_path.parent, walk_up=True)
 +            )
 +            print(" done")
 +    else:
++        copy(orig_xc_framework_path, xc_framework_path)
++
 +        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()
++            print("  Rewriting symlink to XCframework...", end="")
++            resolved_xc_framework_path = (
++                source / xc_framework_path.readlink()
 +            ).resolve()
 +            xc_framework_path.unlink()
 +            xc_framework_path.symlink_to(
-+                orig_xc_framework_path.relative_to(
++                resolved_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()
++            test_framework_path.is_symlink()
++            and not test_framework_path.readlink().is_absolute()
 +        ):
-+            print("  Rewriting symlink to simulator framework...", end="", flush=True)
++            print("  Rewriting symlink to simulator framework...", end="")
 +            # 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()
++            orig_test_framework_path = (
++                source / "Python.XCframework" / test_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
++            test_framework_path.unlink()
++            test_framework_path.symlink_to(
++                orig_test_framework_path.relative_to(
++                    test_framework_path.parent, walk_up=True
 +                )
 +            )
 +            print(" done")
 +        else:
-+            print("  Using pre-existing visionOS framework.")
++            print("  Using pre-existing Python framework.")
 +
 +    for app_src in apps:
-+        print(f"  Installing app {app_src.name!r}...", end="", flush=True)
-+        app_target = target / f"visionOSTestbed/app/{app_src.name}"
++        print(f"  Installing app {app_src.name!r}...", end="")
++        app_target = target / f"Testbed/app/{app_src.name}"
 +        if app_target.is_dir():
 +            shutil.rmtree(app_target)
 +        shutil.copytree(app_src, app_target)
@@ -2636,65 +2477,64 @@ index c3e261ecd9e..26ef7a95de4 100644
 +    print(f"Successfully cloned testbed: {target.resolve()}")
 +
 +
-+def update_plist(testbed_path, args):
-+    # Add the test runner arguments to the testbed's Info.plist file.
-+    info_plist = testbed_path / "visionOSTestbed" / "visionOSTestbed-Info.plist"
-+    with info_plist.open("rb") as f:
-+        info = plistlib.load(f)
++def update_test_plan(testbed_path, platform, args):
++    # Modify the test plan to use the requested test arguments.
++    test_plan_path = testbed_path / f"{platform}Testbed.xctestplan"
++    with test_plan_path.open("r", encoding="utf-8") as f:
++        test_plan = json.load(f)
 +
-+    info["TestArgs"] = args
++    test_plan["defaultOptions"]["commandLineArgumentEntries"] = [
++        {"argument": arg} for arg in args
++    ]
 +
-+    with info_plist.open("wb") as f:
-+        plistlib.dump(info, f)
++    with test_plan_path.open("w", encoding="utf-8") as f:
++        json.dump(test_plan, f, indent=2)
 +
 +
-+async def run_testbed(simulator: str, args: list[str], verbose: bool=False):
++def run_testbed(
++    platform: str,
++    simulator: str | None,
++    args: list[str],
++    verbose: bool = False,
++):
 +    location = Path(__file__).parent
-+    print("Updating plist...", end="", flush=True)
-+    update_plist(location, args)
-+    print(" done.", flush=True)
-+
-+    # We need to get an exclusive lock on simulator creation, to avoid issues
-+    # with multiple simulators starting and being unable to tell which
-+    # simulator is due to which testbed instance. See
-+    # https://github.com/python/cpython/issues/130294 for details. Wait up to
-+    # 10 minutes for a simulator to boot.
-+    print("Obtaining lock on simulator creation...", flush=True)
-+    simulator_lock = SimulatorLock(timeout=10*60)
-+    await simulator_lock.acquire()
-+    print("Simulator lock acquired.", flush=True)
-+
-+    # Get the list of devices that are booted at the start of the test run.
-+    # The simulator started by the test suite will be detected as the new
-+    # entry that appears on the device list.
-+    initial_devices = await list_devices()
-+
-+    try:
-+        async with asyncio.TaskGroup() as tg:
-+            tg.create_task(log_stream_task(initial_devices, simulator_lock))
-+            tg.create_task(xcode_test(location, simulator=simulator, verbose=verbose))
-+    except* MySystemExit as e:
-+        raise SystemExit(*e.exceptions[0].args) from None
-+    except* subprocess.CalledProcessError as e:
-+        # Extract it from the ExceptionGroup so it can be handled by `main`.
-+        raise e.exceptions[0]
-+    finally:
-+        simulator_lock.release()
++    print("Updating test plan...", end="")
++    update_test_plan(location, platform, args)
++    print(" done.")
++
++    if simulator is None:
++        simulator = select_simulator_device(platform)
++    print(f"Running test on {simulator}")
++
++    xcode_test(
++        location,
++        platform=platform,
++        simulator=simulator,
++        verbose=verbose,
++    )
 +
 +
 +def main():
++    # Look for directories like `iOSTestbed` as an indicator of the platforms
++    # that the testbed folder supports. The original source testbed can support
++    # many platforms, but when cloned, only one platform is preserved.
++    available_platforms = [
++        platform
++        for platform in ["iOS", "tvOS", "visionOS", "watchOS"]
++        if (Path(__file__).parent / f"{platform}Testbed").is_dir()
++    ]
++
 +    parser = argparse.ArgumentParser(
 +        description=(
-+            "Manages the process of testing a Python project in the visionOS simulator."
++            "Manages the process of testing an Apple Python project through Xcode."
 +        ),
 +    )
 +
 +    subcommands = parser.add_subparsers(dest="subcommand")
-+
 +    clone = subcommands.add_parser(
 +        "clone",
 +        description=(
-+            "Clone the testbed project, copying in an visionOS Python framework and"
++            "Clone the testbed project, copying in a Python framework and"
 +            "any specified application code."
 +        ),
 +        help="Clone a testbed project to a new location.",
@@ -2707,6 +2547,13 @@ index c3e261ecd9e..26ef7a95de4 100644
 +        ),
 +    )
 +    clone.add_argument(
++        "--platform",
++        dest="platform",
++        choices=available_platforms,
++        default=available_platforms[0],
++        help=f"The platform to target (default: {available_platforms[0]})",
++    )
++    clone.add_argument(
 +        "--app",
 +        dest="apps",
 +        action="append",
@@ -2723,18 +2570,31 @@ index c3e261ecd9e..26ef7a95de4 100644
 +        usage="%(prog)s [-h] [--simulator SIMULATOR] -- <test arg> [<test arg> ...]",
 +        description=(
 +            "Run a testbed project. The arguments provided after `--` will be "
-+            "passed to the running visionOS process as if they were arguments to "
++            "passed to the running test process as if they were arguments to "
 +            "`python -m`."
 +        ),
 +        help="Run a testbed project",
 +    )
 +    run.add_argument(
++        "--platform",
++        dest="platform",
++        choices=available_platforms,
++        default=available_platforms[0],
++        help=f"The platform to target (default: {available_platforms[0]})",
++    )
++    run.add_argument(
 +        "--simulator",
-+        default="Apple Vision Pro",
-+        help="The name of the simulator to use (default: 'Apple Vision Pro')",
++        help=(
++            "The name of the simulator to use (eg: 'iPhone 16e'). Defaults to "
++            "the most recently released 'entry level' iPhone device. Device "
++            "architecture and OS version can also be specified; e.g., "
++            "`--simulator 'iPhone 16 Pro,arch=arm64,OS=26.0'` would run on "
++            "an ARM64 iPhone 16 Pro simulator running iOS 26.0."
++        ),
 +    )
 +    run.add_argument(
-+        "-v", "--verbose",
++        "-v",
++        "--verbose",
 +        action="store_true",
 +        help="Enable verbose output",
 +    )
@@ -2753,30 +2613,37 @@ index c3e261ecd9e..26ef7a95de4 100644
 +        clone_testbed(
 +            source=Path(__file__).parent.resolve(),
 +            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,
++            platform=context.platform,
 +            apps=[Path(app) for app in context.apps],
 +        )
 +    elif context.subcommand == "run":
 +        if test_args:
 +            if not (
-+                Path(__file__).parent / "Python.xcframework/xros-arm64-simulator/bin"
++                Path(__file__).parent
++                / "Python.xcframework"
++                / TEST_SLICES[context.platform]
++                / "bin"
 +            ).is_dir():
 +                print(
-+                    f"Testbed does not contain a compiled visionOS framework. Use "
++                    f"Testbed does not contain a compiled Python framework. Use "
 +                    f"`python {sys.argv[0]} clone ...` to create a runnable "
 +                    f"clone of this testbed."
 +                )
 +                sys.exit(20)
 +
-+            asyncio.run(
-+                run_testbed(
-+                    simulator=context.simulator,
-+                    verbose=context.verbose,
-+                    args=test_args,
-+                )
++            run_testbed(
++                platform=context.platform,
++                simulator=context.simulator,
++                verbose=context.verbose,
++                args=test_args,
 +            )
 +        else:
-+            print(f"Must specify test arguments (e.g., {sys.argv[0]} run -- test)")
++            print(
++                f"Must specify test arguments (e.g., {sys.argv[0]} run -- test)"
++            )
 +            print()
 +            parser.print_help(sys.stderr)
 +            sys.exit(21)
@@ -2788,8 +2655,8 @@ index c3e261ecd9e..26ef7a95de4 100644
 +if __name__ == "__main__":
 +    main()
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed.xcodeproj/project.pbxproj
-@@ -0,0 +1,581 @@
++++ b/Apple/testbed/iOSTestbed.xcodeproj/project.pbxproj
+@@ -0,0 +1,557 @@
 +// !$*UTF8*$!
 +{
 +	archiveVersion = 1;
@@ -2801,15 +2668,15 @@ index c3e261ecd9e..26ef7a95de4 100644
 +/* Begin PBXBuildFile section */
 +		607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66162B0EFA380010BFC8 /* AppDelegate.m */; };
 +		607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607A66212B0EFA390010BFC8 /* Assets.xcassets */; };
++		607A66252B0EFA390010BFC8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */; };
 +		607A66282B0EFA390010BFC8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66272B0EFA390010BFC8 /* main.m */; };
-+		607A66322B0EFA3A0010BFC8 /* visionOSTestbedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66312B0EFA3A0010BFC8 /* visionOSTestbedTests.m */; };
-+		607A66582B0F079F0010BFC8 /* dylib-Info-template.plist in Resources */ = {isa = PBXBuildFile; fileRef = 607A66572B0F079F0010BFC8 /* dylib-Info-template.plist */; };
++		607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66312B0EFA3A0010BFC8 /* TestbedTests.m */; };
++		607A664C2B0EFC080010BFC8 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; };
++		607A664D2B0EFC080010BFC8 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		607A66502B0EFFE00010BFC8 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; };
++		607A66512B0EFFE00010BFC8 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 +		608619542CB77BA900F46182 /* app_packages in Resources */ = {isa = PBXBuildFile; fileRef = 608619532CB77BA900F46182 /* app_packages */; };
 +		608619562CB7819B00F46182 /* app in Resources */ = {isa = PBXBuildFile; fileRef = 608619552CB7819B00F46182 /* app */; };
-+		EEB367CE2DADF5C900B9A1D7 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-+		EEB367CF2DADF5D300B9A1D7 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-+		EEE9C80D2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; };
-+		EEE9C80E2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; };
 +/* End PBXBuildFile section */
 +
 +/* Begin PBXContainerItemProxy section */
@@ -2829,7 +2696,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			dstPath = "";
 +			dstSubfolderSpec = 10;
 +			files = (
-+				EEB367CF2DADF5D300B9A1D7 /* Python.xcframework in Embed Frameworks */,
++				607A664D2B0EFC080010BFC8 /* Python.xcframework in Embed Frameworks */,
 +			);
 +			name = "Embed Frameworks";
 +			runOnlyForDeploymentPostprocessing = 0;
@@ -2840,7 +2707,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			dstPath = "";
 +			dstSubfolderSpec = 10;
 +			files = (
-+				EEB367CE2DADF5C900B9A1D7 /* Python.xcframework in Embed Frameworks */,
++				607A66512B0EFFE00010BFC8 /* Python.xcframework in Embed Frameworks */,
 +			);
 +			name = "Embed Frameworks";
 +			runOnlyForDeploymentPostprocessing = 0;
@@ -2848,18 +2715,19 @@ index c3e261ecd9e..26ef7a95de4 100644
 +/* End PBXCopyFilesBuildPhase section */
 +
 +/* Begin PBXFileReference section */
-+		607A66122B0EFA380010BFC8 /* visionOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = visionOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66122B0EFA380010BFC8 /* iOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
 +		607A66152B0EFA380010BFC8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 +		607A66162B0EFA380010BFC8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 +		607A66212B0EFA390010BFC8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
++		607A66242B0EFA390010BFC8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 +		607A66272B0EFA390010BFC8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-+		607A662D2B0EFA3A0010BFC8 /* visionOSTestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = visionOSTestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-+		607A66312B0EFA3A0010BFC8 /* visionOSTestbedTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = visionOSTestbedTests.m; sourceTree = "<group>"; };
-+		607A66572B0F079F0010BFC8 /* dylib-Info-template.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "dylib-Info-template.plist"; sourceTree = "<group>"; };
-+		607A66592B0F08600010BFC8 /* visionOSTestbed-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "visionOSTestbed-Info.plist"; sourceTree = "<group>"; };
++		607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iOSTestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66312B0EFA3A0010BFC8 /* TestbedTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestbedTests.m; sourceTree = "<group>"; };
++		607A664A2B0EFB310010BFC8 /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
++		607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iOSTestbed-Info.plist"; sourceTree = "<group>"; };
 +		608619532CB77BA900F46182 /* app_packages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app_packages; sourceTree = "<group>"; };
 +		608619552CB7819B00F46182 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app; sourceTree = "<group>"; };
-+		EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
++		60FE0EFB2E56BB6D00524F87 /* iOSTestbed.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = iOSTestbed.xctestplan; sourceTree = "<group>"; };
 +/* End PBXFileReference section */
 +
 +/* Begin PBXFrameworksBuildPhase section */
@@ -2867,7 +2735,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			isa = PBXFrameworksBuildPhase;
 +			buildActionMask = 2147483647;
 +			files = (
-+				EEE9C80D2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */,
++				607A664C2B0EFC080010BFC8 /* Python.xcframework in Frameworks */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
@@ -2875,7 +2743,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			isa = PBXFrameworksBuildPhase;
 +			buildActionMask = 2147483647;
 +			files = (
-+				EEE9C80E2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */,
++				607A66502B0EFFE00010BFC8 /* Python.xcframework in Frameworks */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
@@ -2885,9 +2753,10 @@ index c3e261ecd9e..26ef7a95de4 100644
 +		607A66092B0EFA380010BFC8 = {
 +			isa = PBXGroup;
 +			children = (
-+				EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */,
-+				607A66142B0EFA380010BFC8 /* visionOSTestbed */,
-+				607A66302B0EFA3A0010BFC8 /* visionOSTestbedTests */,
++				60FE0EFB2E56BB6D00524F87 /* iOSTestbed.xctestplan */,
++				607A664A2B0EFB310010BFC8 /* Python.xcframework */,
++				607A66142B0EFA380010BFC8 /* iOSTestbed */,
++				607A66302B0EFA3A0010BFC8 /* TestbedTests */,
 +				607A66132B0EFA380010BFC8 /* Products */,
 +				607A664F2B0EFFE00010BFC8 /* Frameworks */,
 +			);
@@ -2896,33 +2765,33 @@ index c3e261ecd9e..26ef7a95de4 100644
 +		607A66132B0EFA380010BFC8 /* Products */ = {
 +			isa = PBXGroup;
 +			children = (
-+				607A66122B0EFA380010BFC8 /* visionOSTestbed.app */,
-+				607A662D2B0EFA3A0010BFC8 /* visionOSTestbedTests.xctest */,
++				607A66122B0EFA380010BFC8 /* iOSTestbed.app */,
++				607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */,
 +			);
 +			name = Products;
 +			sourceTree = "<group>";
 +		};
-+		607A66142B0EFA380010BFC8 /* visionOSTestbed */ = {
++		607A66142B0EFA380010BFC8 /* iOSTestbed */ = {
 +			isa = PBXGroup;
 +			children = (
 +				608619552CB7819B00F46182 /* app */,
 +				608619532CB77BA900F46182 /* app_packages */,
-+				607A66592B0F08600010BFC8 /* visionOSTestbed-Info.plist */,
-+				607A66572B0F079F0010BFC8 /* dylib-Info-template.plist */,
++				607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */,
 +				607A66152B0EFA380010BFC8 /* AppDelegate.h */,
 +				607A66162B0EFA380010BFC8 /* AppDelegate.m */,
 +				607A66212B0EFA390010BFC8 /* Assets.xcassets */,
++				607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */,
 +				607A66272B0EFA390010BFC8 /* main.m */,
 +			);
-+			path = visionOSTestbed;
++			path = iOSTestbed;
 +			sourceTree = "<group>";
 +		};
-+		607A66302B0EFA3A0010BFC8 /* visionOSTestbedTests */ = {
++		607A66302B0EFA3A0010BFC8 /* TestbedTests */ = {
 +			isa = PBXGroup;
 +			children = (
-+				607A66312B0EFA3A0010BFC8 /* visionOSTestbedTests.m */,
++				607A66312B0EFA3A0010BFC8 /* TestbedTests.m */,
 +			);
-+			path = visionOSTestbedTests;
++			path = TestbedTests;
 +			sourceTree = "<group>";
 +		};
 +		607A664F2B0EFFE00010BFC8 /* Frameworks */ = {
@@ -2935,29 +2804,28 @@ index c3e261ecd9e..26ef7a95de4 100644
 +/* End PBXGroup section */
 +
 +/* Begin PBXNativeTarget section */
-+		607A66112B0EFA380010BFC8 /* visionOSTestbed */ = {
++		607A66112B0EFA380010BFC8 /* iOSTestbed */ = {
 +			isa = PBXNativeTarget;
-+			buildConfigurationList = 607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbed" */;
++			buildConfigurationList = 607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "iOSTestbed" */;
 +			buildPhases = (
 +				607A660E2B0EFA380010BFC8 /* Sources */,
 +				607A660F2B0EFA380010BFC8 /* Frameworks */,
 +				607A66102B0EFA380010BFC8 /* Resources */,
-+				607A66552B0F061D0010BFC8 /* Install Target Specific Python Standard Library */,
-+				607A66562B0F06200010BFC8 /* Prepare Python Binary Modules */,
++				607A66552B0F061D0010BFC8 /* Process Python libraries */,
 +				607A664E2B0EFC080010BFC8 /* Embed Frameworks */,
 +			);
 +			buildRules = (
 +			);
 +			dependencies = (
 +			);
-+			name = visionOSTestbed;
++			name = iOSTestbed;
 +			productName = iOSTestbed;
-+			productReference = 607A66122B0EFA380010BFC8 /* visionOSTestbed.app */;
++			productReference = 607A66122B0EFA380010BFC8 /* iOSTestbed.app */;
 +			productType = "com.apple.product-type.application";
 +		};
-+		607A662C2B0EFA3A0010BFC8 /* visionOSTestbedTests */ = {
++		607A662C2B0EFA3A0010BFC8 /* iOSTestbedTests */ = {
 +			isa = PBXNativeTarget;
-+			buildConfigurationList = 607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbedTests" */;
++			buildConfigurationList = 607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "iOSTestbedTests" */;
 +			buildPhases = (
 +				607A66292B0EFA3A0010BFC8 /* Sources */,
 +				607A662A2B0EFA3A0010BFC8 /* Frameworks */,
@@ -2969,9 +2837,9 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			dependencies = (
 +				607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */,
 +			);
-+			name = visionOSTestbedTests;
++			name = iOSTestbedTests;
 +			productName = iOSTestbedTests;
-+			productReference = 607A662D2B0EFA3A0010BFC8 /* visionOSTestbedTests.xctest */;
++			productReference = 607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */;
 +			productType = "com.apple.product-type.bundle.unit-test";
 +		};
 +/* End PBXNativeTarget section */
@@ -2992,7 +2860,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +					};
 +				};
 +			};
-+			buildConfigurationList = 607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "visionOSTestbed" */;
++			buildConfigurationList = 607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "iOSTestbed" */;
 +			compatibilityVersion = "Xcode 14.0";
 +			developmentRegion = en;
 +			hasScannedForEncodings = 0;
@@ -3005,8 +2873,8 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			projectDirPath = "";
 +			projectRoot = "";
 +			targets = (
-+				607A66112B0EFA380010BFC8 /* visionOSTestbed */,
-+				607A662C2B0EFA3A0010BFC8 /* visionOSTestbedTests */,
++				607A66112B0EFA380010BFC8 /* iOSTestbed */,
++				607A662C2B0EFA3A0010BFC8 /* iOSTestbedTests */,
 +			);
 +		};
 +/* End PBXProject section */
@@ -3016,7 +2884,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			isa = PBXResourcesBuildPhase;
 +			buildActionMask = 2147483647;
 +			files = (
-+				607A66582B0F079F0010BFC8 /* dylib-Info-template.plist in Resources */,
++				607A66252B0EFA390010BFC8 /* LaunchScreen.storyboard in Resources */,
 +				608619562CB7819B00F46182 /* app in Resources */,
 +				607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */,
 +				608619542CB77BA900F46182 /* app_packages in Resources */,
@@ -3033,27 +2901,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +/* End PBXResourcesBuildPhase section */
 +
 +/* Begin PBXShellScriptBuildPhase section */
-+		607A66552B0F061D0010BFC8 /* Install Target Specific Python Standard Library */ = {
-+			isa = PBXShellScriptBuildPhase;
-+			alwaysOutOfDate = 1;
-+			buildActionMask = 2147483647;
-+			files = (
-+			);
-+			inputFileListPaths = (
-+			);
-+			inputPaths = (
-+			);
-+			name = "Install Target Specific Python Standard Library";
-+			outputFileListPaths = (
-+			);
-+			outputPaths = (
-+			);
-+			runOnlyForDeploymentPostprocessing = 0;
-+			shellPath = /bin/sh;
-+			shellScript = "set -e\n\nmkdir -p \"$CODESIGNING_FOLDER_PATH/python/lib\"\nif [ \"$EFFECTIVE_PLATFORM_NAME\" = \"-xrsimulator\" ]; then\n    echo \"Installing Python modules for xrOS Simulator\"\n    rsync -au --delete \"$PROJECT_DIR/Python.xcframework/xros-arm64-simulator/lib/\" \"$CODESIGNING_FOLDER_PATH/python/lib/\" \nelse\n    echo \"Installing Python modules for xrOS Device\"\n    rsync -au --delete \"$PROJECT_DIR/Python.xcframework/xros-arm64/lib/\" \"$CODESIGNING_FOLDER_PATH/python/lib/\" \nfi\n";
-+			showEnvVarsInLog = 0;
-+		};
-+		607A66562B0F06200010BFC8 /* Prepare Python Binary Modules */ = {
++		607A66552B0F061D0010BFC8 /* Process Python libraries */ = {
 +			isa = PBXShellScriptBuildPhase;
 +			alwaysOutOfDate = 1;
 +			buildActionMask = 2147483647;
@@ -3063,14 +2911,14 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			);
 +			inputPaths = (
 +			);
-+			name = "Prepare Python Binary Modules";
++			name = "Process Python libraries";
 +			outputFileListPaths = (
 +			);
 +			outputPaths = (
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +			shellPath = /bin/sh;
-+			shellScript = "set -e\n\ninstall_dylib () {\n    INSTALL_BASE=$1\n    FULL_EXT=$2\n\n    # The name of the extension file\n    EXT=$(basename \"$FULL_EXT\")\n    # The location of the extension file, relative to the bundle\n    RELATIVE_EXT=${FULL_EXT#$CODESIGNING_FOLDER_PATH/} \n    # The path to the extension file, relative to the install base\n    PYTHON_EXT=${RELATIVE_EXT/$INSTALL_BASE/}\n    # The full dotted name of the extension module, constructed from the file path.\n    FULL_MODULE_NAME=$(echo $PYTHON_EXT | cut -d \".\" -f 1 | tr \"/\" \".\"); \n    # A bundle identifier; not actually used, but required by Xcode framework packaging\n    FRAMEWORK_BUNDLE_ID=$(echo $PRODUCT_BUNDLE_IDENTIFIER.$FULL_MODULE_NAME | tr \"_\" \"-\")\n    # The name of the framework folder.\n    FRAMEWORK_FOLDER=\"Frameworks/$FULL_MODULE_NAME.framework\"\n\n    # If the framework folder doesn't exist, create it.\n    if [ ! -d \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER\" ]; then\n        echo \"Creating framework for $RELATIVE_EXT\" \n        mkdir -p \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER\"\n        cp \"$CODESIGNING_FOLDER_PATH/dylib-Info-template.plist\" \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist\"\n        plutil -replace CFBundleExecutable -string \"$FULL_MODULE_NAME\" \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist\"\n        plutil -replace CFBundleIdentifier -string \"$FRAMEWORK_BUNDLE_ID\" \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist\"\n    fi\n    \n    echo \"Installing binary for $FRAMEWORK_FOLDER/$FULL_MODULE_NAME\" \n    mv \"$FULL_EXT\" \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME\"\n    # Create a placeholder .fwork file where the .so was\n    echo \"$FRAMEWORK_FOLDER/$FULL_MODULE_NAME\" > ${FULL_EXT%.so}.fwork\n    # Create a back reference to the .so file location in the framework\n    echo \"${RELATIVE_EXT%.so}.fwork\" > \"$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME.origin\"             \n}\n\nPYTHON_VER=$(ls -1 \"$CODESIGNING_FOLDER_PATH/python/lib\")\necho \"Install Python $PYTHON_VER standard library extension modules...\"\nfind \"$CODESIGNING_FOLDER_PATH/python/lib/$PYTHON_VER/lib-dynload\" -name \"*.so\" | while read FULL_EXT; do\n    install_dylib python/lib/$PYTHON_VER/lib-dynload/ \"$FULL_EXT\"\ndone\necho \"Install app package extension modules...\"\nfind \"$CODESIGNING_FOLDER_PATH/app_packages\" -name \"*.so\" | while read FULL_EXT; do\n    install_dylib app_packages/ \"$FULL_EXT\"\ndone\necho \"Install app extension modules...\"\nfind \"$CODESIGNING_FOLDER_PATH/app\" -name \"*.so\" | while read FULL_EXT; do\n    install_dylib app/ \"$FULL_EXT\"\ndone\n\n# Clean up dylib template \nrm -f \"$CODESIGNING_FOLDER_PATH/dylib-Info-template.plist\"\necho \"Signing frameworks as $EXPANDED_CODE_SIGN_IDENTITY_NAME ($EXPANDED_CODE_SIGN_IDENTITY)...\"\nfind \"$CODESIGNING_FOLDER_PATH/Frameworks\" -name \"*.framework\" -exec /usr/bin/codesign --force --sign \"$EXPANDED_CODE_SIGN_IDENTITY\" ${OTHER_CODE_SIGN_FLAGS:-} -o runtime --timestamp=none --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der \"{}\" \\; \n";
++			shellScript = "set -e\nsource $PROJECT_DIR/Python.xcframework/build/utils.sh\ninstall_python Python.xcframework app app_packages\n";
 +			showEnvVarsInLog = 0;
 +		};
 +/* End PBXShellScriptBuildPhase section */
@@ -3089,7 +2937,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			isa = PBXSourcesBuildPhase;
 +			buildActionMask = 2147483647;
 +			files = (
-+				607A66322B0EFA3A0010BFC8 /* visionOSTestbedTests.m in Sources */,
++				607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */,
 +			);
 +			runOnlyForDeploymentPostprocessing = 0;
 +		};
@@ -3098,11 +2946,22 @@ index c3e261ecd9e..26ef7a95de4 100644
 +/* Begin PBXTargetDependency section */
 +		607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */ = {
 +			isa = PBXTargetDependency;
-+			target = 607A66112B0EFA380010BFC8 /* visionOSTestbed */;
++			target = 607A66112B0EFA380010BFC8 /* iOSTestbed */;
 +			targetProxy = 607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */;
 +		};
 +/* End PBXTargetDependency section */
 +
++/* Begin PBXVariantGroup section */
++		607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */ = {
++			isa = PBXVariantGroup;
++			children = (
++				607A66242B0EFA390010BFC8 /* Base */,
++			);
++			name = LaunchScreen.storyboard;
++			sourceTree = "<group>";
++		};
++/* End PBXVariantGroup section */
++
 +/* Begin XCBuildConfiguration section */
 +		607A663F2B0EFA3A0010BFC8 /* Debug */ = {
 +			isa = XCBuildConfiguration;
@@ -3156,12 +3015,12 @@ index c3e261ecd9e..26ef7a95de4 100644
 +				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 +				GCC_WARN_UNUSED_FUNCTION = YES;
 +				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 +				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 +				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 +				MTL_FAST_MATH = YES;
 +				ONLY_ACTIVE_ARCH = YES;
-+				SDKROOT = xros;
++				SDKROOT = iphoneos;
 +			};
 +			name = Debug;
 +		};
@@ -3211,11 +3070,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 +				GCC_WARN_UNUSED_FUNCTION = YES;
 +				GCC_WARN_UNUSED_VARIABLE = YES;
-+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 +				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 +				MTL_ENABLE_DEBUG_INFO = NO;
 +				MTL_FAST_MATH = YES;
-+				SDKROOT = xros;
++				SDKROOT = iphoneos;
 +				VALIDATE_PRODUCT = YES;
 +			};
 +			name = Release;
@@ -3231,26 +3090,22 @@ index c3e261ecd9e..26ef7a95de4 100644
 +				DEVELOPMENT_TEAM = "";
 +				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 +				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
-+				INFOPLIST_FILE = "visionOSTestbed/visionOSTestbed-Info.plist";
++				INFOPLIST_FILE = "iOSTestbed/iOSTestbed-Info.plist";
 +				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 +				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 +				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 +				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 +				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 +				LD_RUNPATH_SEARCH_PATHS = (
 +					"$(inherited)",
 +					"@executable_path/Frameworks",
 +				);
 +				MARKETING_VERSION = 3.13.0a1;
-+				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbed;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbed;
 +				PRODUCT_NAME = "$(TARGET_NAME)";
-+				SUPPORTED_PLATFORMS = "xros xrsimulator";
-+				SUPPORTS_MACCATALYST = NO;
-+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 +				SWIFT_EMIT_LOC_STRINGS = YES;
-+				TARGETED_DEVICE_FAMILY = 7;
-+				XROS_DEPLOYMENT_TARGET = 2.0;
++				TARGETED_DEVICE_FAMILY = "1,2";
 +			};
 +			name = Debug;
 +		};
@@ -3266,26 +3121,22 @@ index c3e261ecd9e..26ef7a95de4 100644
 +				ENABLE_TESTABILITY = YES;
 +				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 +				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
-+				INFOPLIST_FILE = "visionOSTestbed/visionOSTestbed-Info.plist";
++				INFOPLIST_FILE = "iOSTestbed/iOSTestbed-Info.plist";
 +				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 +				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 +				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 +				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 +				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 +				LD_RUNPATH_SEARCH_PATHS = (
 +					"$(inherited)",
 +					"@executable_path/Frameworks",
 +				);
 +				MARKETING_VERSION = 3.13.0a1;
-+				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbed;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbed;
 +				PRODUCT_NAME = "$(TARGET_NAME)";
-+				SUPPORTED_PLATFORMS = "xros xrsimulator";
-+				SUPPORTS_MACCATALYST = NO;
-+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 +				SWIFT_EMIT_LOC_STRINGS = YES;
-+				TARGETED_DEVICE_FAMILY = 7;
-+				XROS_DEPLOYMENT_TARGET = 2.0;
++				TARGETED_DEVICE_FAMILY = "1,2";
 +			};
 +			name = Release;
 +		};
@@ -3299,17 +3150,13 @@ index c3e261ecd9e..26ef7a95de4 100644
 +				DEVELOPMENT_TEAM = 3HEZE76D99;
 +				GENERATE_INFOPLIST_FILE = YES;
 +				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
-+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 +				MARKETING_VERSION = 1.0;
-+				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbedTests;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbedTests;
 +				PRODUCT_NAME = "$(TARGET_NAME)";
-+				SUPPORTED_PLATFORMS = "xros xrsimulator";
-+				SUPPORTS_MACCATALYST = NO;
-+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 +				SWIFT_EMIT_LOC_STRINGS = NO;
-+				TARGETED_DEVICE_FAMILY = 7;
-+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestbed";
++				TARGETED_DEVICE_FAMILY = "1,2";
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/iOSTestbed";
 +			};
 +			name = Debug;
 +		};
@@ -3323,24 +3170,20 @@ index c3e261ecd9e..26ef7a95de4 100644
 +				DEVELOPMENT_TEAM = 3HEZE76D99;
 +				GENERATE_INFOPLIST_FILE = YES;
 +				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
-+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 +				MARKETING_VERSION = 1.0;
-+				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbedTests;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbedTests;
 +				PRODUCT_NAME = "$(TARGET_NAME)";
-+				SUPPORTED_PLATFORMS = "xros xrsimulator";
-+				SUPPORTS_MACCATALYST = NO;
-+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 +				SWIFT_EMIT_LOC_STRINGS = NO;
-+				TARGETED_DEVICE_FAMILY = 7;
-+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestbed";
++				TARGETED_DEVICE_FAMILY = "1,2";
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/iOSTestbed";
 +			};
 +			name = Release;
 +		};
 +/* End XCBuildConfiguration section */
 +
 +/* Begin XCConfigurationList section */
-+		607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "visionOSTestbed" */ = {
++		607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "iOSTestbed" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
 +				607A663F2B0EFA3A0010BFC8 /* Debug */,
@@ -3349,7 +3192,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			defaultConfigurationIsVisible = 0;
 +			defaultConfigurationName = Release;
 +		};
-+		607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbed" */ = {
++		607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "iOSTestbed" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
 +				607A66422B0EFA3A0010BFC8 /* Debug */,
@@ -3358,7 +3201,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +			defaultConfigurationIsVisible = 0;
 +			defaultConfigurationName = Release;
 +		};
-+		607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbedTests" */ = {
++		607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "iOSTestbedTests" */ = {
 +			isa = XCConfigurationList;
 +			buildConfigurations = (
 +				607A66452B0EFA3A0010BFC8 /* Debug */,
@@ -3372,11 +3215,160 @@ index c3e261ecd9e..26ef7a95de4 100644
 +	rootObject = 607A660A2B0EFA380010BFC8 /* Project object */;
 +}
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/AppDelegate.h
++++ b/Apple/testbed/iOSTestbed.xcodeproj/xcshareddata/xcschemes/iOSTestbed.xcscheme
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   LastUpgradeVersion = "1640"
++   version = "1.7">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES"
++      buildArchitectures = "Automatic">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++               BuildableName = "iOSTestbed.app"
++               BlueprintName = "iOSTestbed"
++               ReferencedContainer = "container:iOSTestbed.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      customLLDBInitFile = "$(SOURCE_ROOT)/Testbed.lldbinit"
++      shouldUseLaunchSchemeArgsEnv = "YES">
++      <TestPlans>
++         <TestPlanReference
++            reference = "container:iOSTestbed.xctestplan"
++            default = "YES">
++         </TestPlanReference>
++      </TestPlans>
++      <Testables>
++         <TestableReference
++            skipped = "NO"
++            parallelizable = "NO">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "607A662C2B0EFA3A0010BFC8"
++               BuildableName = "iOSTestbedTests.xctest"
++               BlueprintName = "iOSTestbedTests"
++               ReferencedContainer = "container:iOSTestbed.xcodeproj">
++            </BuildableReference>
++         </TestableReference>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      debugServiceExtension = "internal"
++      allowLocationSimulation = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++            BuildableName = "iOSTestbed.app"
++            BlueprintName = "iOSTestbed"
++            ReferencedContainer = "container:iOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </LaunchAction>
++   <ProfileAction
++      buildConfiguration = "Release"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      debugDocumentVersioning = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++            BuildableName = "iOSTestbed.app"
++            BlueprintName = "iOSTestbed"
++            ReferencedContainer = "container:iOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed.xctestplan
+@@ -0,0 +1,46 @@
++{
++  "configurations" : [
++    {
++      "id" : "F5A95CE4-1ADE-4A6E-A0E1-CDBAE26DF0C5",
++      "name" : "Test Scheme Action",
++      "options" : {
++
++      }
++    }
++  ],
++  "defaultOptions" : {
++    "commandLineArgumentEntries" : [
++      {
++        "argument" : "test"
++      },
++      {
++        "argument" : "-uall"
++      },
++      {
++        "argument" : "--single-process"
++      },
++      {
++        "argument" : "--rerun"
++      },
++      {
++        "argument" : "-W"
++      }
++    ],
++    "targetForVariableExpansion" : {
++      "containerPath" : "container:iOSTestbed.xcodeproj",
++      "identifier" : "607A66112B0EFA380010BFC8",
++      "name" : "iOSTestbed"
++    }
++  },
++  "testTargets" : [
++    {
++      "parallelizable" : false,
++      "target" : {
++        "containerPath" : "container:iOSTestbed.xcodeproj",
++        "identifier" : "607A662C2B0EFA3A0010BFC8",
++        "name" : "iOSTestbedTests"
++      }
++    }
++  ],
++  "version" : 1
++}
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/AppDelegate.h
 @@ -0,0 +1,11 @@
 +//
 +//  AppDelegate.h
-+//  visionOSTestbed
++//  iOSTestbed
 +//
 +
 +#import <UIKit/UIKit.h>
@@ -3386,11 +3378,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +
 +@end
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/AppDelegate.m
++++ b/Apple/testbed/iOSTestbed/AppDelegate.m
 @@ -0,0 +1,19 @@
 +//
 +//  AppDelegate.m
-+//  visionOSTestbed
++//  iOSTestbed
 +//
 +
 +#import "AppDelegate.h"
@@ -3408,7 +3400,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +
 +@end
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/Assets.xcassets/AccentColor.colorset/Contents.json
++++ b/Apple/testbed/iOSTestbed/Assets.xcassets/AccentColor.colorset/Contents.json
 @@ -0,0 +1,11 @@
 +{
 +  "colors" : [
@@ -3422,7 +3414,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +  }
 +}
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/Assets.xcassets/AppIcon.appiconset/Contents.json
++++ b/Apple/testbed/iOSTestbed/Assets.xcassets/AppIcon.appiconset/Contents.json
 @@ -0,0 +1,13 @@
 +{
 +  "images" : [
@@ -3438,7 +3430,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +  }
 +}
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/Assets.xcassets/Contents.json
++++ b/Apple/testbed/iOSTestbed/Assets.xcassets/Contents.json
 @@ -0,0 +1,6 @@
 +{
 +  "info" : {
@@ -3447,80 +3439,40 @@ index c3e261ecd9e..26ef7a95de4 100644
 +  }
 +}
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/app/README
++++ b/Apple/testbed/iOSTestbed/Base.lproj/LaunchScreen.storyboard
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
++    <device id="retina6_12" orientation="portrait" appearance="light"/>
++    <dependencies>
++        <deployment identifier="iOS"/>
++        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
++    </dependencies>
++    <scenes/>
++</document>
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/app/README
 @@ -0,0 +1,7 @@
 +This folder can contain any Python application code.
 +
 +During the build, any binary modules found in this folder will be processed into
-+iOS Framework form.
++Framework form.
 +
 +When the test suite runs, this folder will be on the PYTHONPATH, and will be the
 +working directory for the test suite.
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/app_packages/README
++++ b/Apple/testbed/iOSTestbed/app_packages/README
 @@ -0,0 +1,7 @@
 +This folder can be a target for installing any Python dependencies needed by the
 +test suite.
 +
 +During the build, any binary modules found in this folder will be processed into
-+iOS Framework form.
++Framework form.
 +
 +When the test suite runs, this folder will be on the PYTHONPATH.
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/dylib-Info-template.plist
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundleExecutable</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string></string>
-+	<key>CFBundlePackageType</key>
-+	<string>FMWK</string>
-+	<key>CFBundleShortVersionString</key>
-+	<string>1.0</string>
-+	<key>CFBundleSupportedPlatforms</key>
-+	<array>
-+		<string>XROS</string>
-+	</array>
-+	<key>CFBundleVersion</key>
-+	<string>1</string>
-+	<key>MinimumOSVersion</key>
-+	<string>2.0</string>
-+	<key>UIDeviceFamily</key>
-+	<array>
-+		<integer>7</integer>
-+	</array>
-+</dict>
-+</plist>
---- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/main.m
-@@ -0,0 +1,16 @@
-+//
-+//  main.m
-+//  visionOSTestbed
-+//
-+
-+#import <UIKit/UIKit.h>
-+#import "AppDelegate.h"
-+
-+int main(int argc, char * argv[]) {
-+    NSString * appDelegateClassName;
-+    @autoreleasepool {
-+        appDelegateClassName = NSStringFromClass([AppDelegate class]);
-+
-+        return UIApplicationMain(argc, argv, nil, appDelegateClassName);
-+    }
-+}
---- /dev/null
-+++ b/visionOS/testbed/visionOSTestbed/visionOSTestbed-Info.plist
-@@ -0,0 +1,56 @@
++++ b/Apple/testbed/iOSTestbed/iOSTestbed-Info.plist
+@@ -0,0 +1,52 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 +<plist version="1.0">
@@ -3532,7 +3484,7 @@ index c3e261ecd9e..26ef7a95de4 100644
 +	<key>CFBundleExecutable</key>
 +	<string>${EXECUTABLE_NAME}</string>
 +	<key>CFBundleIdentifier</key>
-+	<string>org.python.visionOSTestbed</string>
++	<string>org.python.iOSTestbed</string>
 +	<key>CFBundleInfoDictionaryVersion</key>
 +	<string>6.0</string>
 +	<key>CFBundleName</key>
@@ -3545,23 +3497,12 @@ index c3e261ecd9e..26ef7a95de4 100644
 +	<string>????</string>
 +	<key>CFBundleVersion</key>
 +	<string>1</string>
-+	<key>TestArgs</key>
-+	<array>
-+		<string>test</string>
-+		<string>-uall</string>
-+		<string>--single-process</string>
-+		<string>--rerun</string>
-+		<string>-W</string>
-+	</array>
-+	<key>UIApplicationSceneManifest</key>
-+	<dict>
-+		<key>UIApplicationSupportsMultipleScenes</key>
-+		<false/>
-+		<key>UISceneConfigurations</key>
-+		<dict/>
-+	</dict>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
 +	<key>UIRequiresFullScreen</key>
 +	<true/>
++	<key>UILaunchStoryboardName</key>
++	<string>Launch Screen</string>
 +	<key>UISupportedInterfaceOrientations</key>
 +	<array>
 +		<string>UIInterfaceOrientationPortrait</string>
@@ -3575,421 +3516,4397 @@ index c3e261ecd9e..26ef7a95de4 100644
 +		<string>UIInterfaceOrientationLandscapeLeft</string>
 +		<string>UIInterfaceOrientationLandscapeRight</string>
 +	</array>
++	<key>UIApplicationSceneManifest</key>
++	<dict>
++		<key>UIApplicationSupportsMultipleScenes</key>
++		<false/>
++		<key>UISceneConfigurations</key>
++		<dict/>
++	</dict>
 +</dict>
 +</plist>
 --- /dev/null
-+++ b/visionOS/testbed/visionOSTestbedTests/visionOSTestbedTests.m
-@@ -0,0 +1,162 @@
-+#import <XCTest/XCTest.h>
-+#import <Python/Python.h>
++++ b/Apple/testbed/iOSTestbed/main.m
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  iOSTestbed
++//
 +
-+@interface visionOSTestbedTests : XCTestCase
++#import <UIKit/UIKit.h>
++#import "AppDelegate.h"
 +
-+@end
++int main(int argc, char * argv[]) {
++    NSString * appDelegateClassName;
++    @autoreleasepool {
++        appDelegateClassName = NSStringFromClass([AppDelegate class]);
 +
-+@implementation visionOSTestbedTests
++        return UIApplicationMain(argc, argv, nil, appDelegateClassName);
++    }
++}
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed.xcodeproj/project.pbxproj
+@@ -0,0 +1,505 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 77;
++	objects = {
 +
++/* Begin PBXBuildFile section */
++		EE7C8A1E2DCD6FF3003206DB /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */; };
++		EE7C8A1F2DCD70CD003206DB /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */; };
++		EE7C8A202DCD70CD003206DB /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++/* End PBXBuildFile section */
 +
-+- (void)testPython {
-+    const char **argv;
-+    int exit_code;
-+    int failed;
-+    PyStatus status;
-+    PyPreConfig preconfig;
-+    PyConfig config;
-+    PyObject *sys_module;
-+    PyObject *sys_path_attr;
-+    NSArray *test_args;
-+    NSString *python_home;
-+    NSString *path;
-+    wchar_t *wtmp_str;
++/* Begin PBXContainerItemProxy section */
++		EE989E662DCD6E7A0036B268 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = EE989E462DCD6E780036B268 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = EE989E4D2DCD6E780036B268;
++			remoteInfo = tvOSTestbed;
++		};
++/* End PBXContainerItemProxy section */
 +
-+    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
++/* Begin PBXCopyFilesBuildPhase section */
++		EE7C8A212DCD70CD003206DB /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				EE7C8A202DCD70CD003206DB /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXCopyFilesBuildPhase section */
 +
-+    // Set some other common environment indicators to disable color, as the
-+    // Xcode log can't display color. Stdout will report that it is *not* a
-+    // TTY.
-+    setenv("NO_COLOR", "1", true);
-+    setenv("PYTHON_COLORS", "0", true);
++/* Begin PBXFileReference section */
++		6077B3802E82A4BE00E3D6A3 /* tvOSTestbed.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = tvOSTestbed.xctestplan; sourceTree = "<group>"; };
++		EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
++		EE989E4E2DCD6E780036B268 /* tvOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = tvOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		EE989E652DCD6E7A0036B268 /* TestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
++/* End PBXFileReference section */
 +
-+    // Arguments to pass into the test suite runner.
-+    // argv[0] must identify the process; any subsequent arg
-+    // will be handled as if it were an argument to `python -m test`
-+    test_args = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"TestArgs"];
-+    if (test_args == NULL) {
-+        NSLog(@"Unable to identify test arguments.");
-+    }
-+    argv = malloc(sizeof(char *) * ([test_args count] + 1));
-+    argv[0] = "visionOSTestbed";
-+    for (int i = 1; i < [test_args count]; i++) {
-+        argv[i] = [[test_args objectAtIndex:i] UTF8String];
-+    }
-+    NSLog(@"Test command: %@", test_args);
-+
-+    // Generate an isolated Python configuration.
-+    NSLog(@"Configuring isolated Python...");
-+    PyPreConfig_InitIsolatedConfig(&preconfig);
-+    PyConfig_InitIsolatedConfig(&config);
-+
-+    // Configure the Python interpreter:
-+    // Enforce UTF-8 encoding for stderr, stdout, file-system encoding and locale.
-+    // See https://docs.python.org/3/library/os.html#python-utf-8-mode.
-+    preconfig.utf8_mode = 1;
-+    // Use the system logger for stdout/err
-+    config.use_system_logger = 1;
-+    // Don't buffer stdio. We want output to appears in the log immediately
-+    config.buffered_stdio = 0;
-+    // Don't write bytecode; we can't modify the app bundle
-+    // after it has been signed.
-+    config.write_bytecode = 0;
-+    // Ensure that signal handlers are installed
-+    config.install_signal_handlers = 1;
-+    // Run the test module.
-+    config.run_module = Py_DecodeLocale([[test_args objectAtIndex:0] UTF8String], NULL);
-+    // For debugging - enable verbose mode.
-+    // config.verbose = 1;
-+
-+    NSLog(@"Pre-initializing Python runtime...");
-+    status = Py_PreInitialize(&preconfig);
-+    if (PyStatus_Exception(status)) {
-+        XCTFail(@"Unable to pre-initialize Python interpreter: %s", status.err_msg);
-+        PyConfig_Clear(&config);
-+        return;
-+    }
-+
-+    // Set the home for the Python interpreter
-+    python_home = [NSString stringWithFormat:@"%@/python", resourcePath, nil];
-+    NSLog(@"PythonHome: %@", python_home);
-+    wtmp_str = Py_DecodeLocale([python_home UTF8String], NULL);
-+    status = PyConfig_SetString(&config, &config.home, wtmp_str);
-+    if (PyStatus_Exception(status)) {
-+        XCTFail(@"Unable to set PYTHONHOME: %s", status.err_msg);
-+        PyConfig_Clear(&config);
-+        return;
-+    }
-+    PyMem_RawFree(wtmp_str);
-+
-+    // Read the site config
-+    status = PyConfig_Read(&config);
-+    if (PyStatus_Exception(status)) {
-+        XCTFail(@"Unable to read site config: %s", status.err_msg);
-+        PyConfig_Clear(&config);
-+        return;
-+    }
-+
-+    NSLog(@"Configure argc/argv...");
-+    status = PyConfig_SetBytesArgv(&config, [test_args count], (char**) argv);
-+    if (PyStatus_Exception(status)) {
-+        XCTFail(@"Unable to configure argc/argv: %s", status.err_msg);
-+        PyConfig_Clear(&config);
-+        return;
-+    }
-+
-+    NSLog(@"Initializing Python runtime...");
-+    status = Py_InitializeFromConfig(&config);
-+    if (PyStatus_Exception(status)) {
-+        XCTFail(@"Unable to initialize Python interpreter: %s", status.err_msg);
-+        PyConfig_Clear(&config);
-+        return;
-+    }
-+
-+    sys_module = PyImport_ImportModule("sys");
-+    if (sys_module == NULL) {
-+        XCTFail(@"Could not import sys module");
-+        return;
-+    }
-+
-+    sys_path_attr = PyObject_GetAttrString(sys_module, "path");
-+    if (sys_path_attr == NULL) {
-+        XCTFail(@"Could not access sys.path");
-+        return;
-+    }
-+
-+    // Add the app packages path
-+    path = [NSString stringWithFormat:@"%@/app_packages", resourcePath, nil];
-+    NSLog(@"App packages path: %@", path);
-+    wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
-+    failed = PyList_Insert(sys_path_attr, 0, PyUnicode_FromString([path UTF8String]));
-+    if (failed) {
-+        XCTFail(@"Unable to add app packages to sys.path");
-+        return;
-+    }
-+    PyMem_RawFree(wtmp_str);
-+
-+    path = [NSString stringWithFormat:@"%@/app", resourcePath, nil];
-+    NSLog(@"App path: %@", path);
-+    wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
-+    failed = PyList_Insert(sys_path_attr, 0, PyUnicode_FromString([path UTF8String]));
-+    if (failed) {
-+        XCTFail(@"Unable to add app to sys.path");
-+        return;
-+    }
-+    PyMem_RawFree(wtmp_str);
-+
-+    // Ensure the working directory is the app folder.
-+    chdir([path UTF8String]);
++/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
++		6077B37F2E81892A00E3D6A3 /* Exceptions for "tvOSTestbed" folder in "tvOSTestbed" target */ = {
++			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
++			membershipExceptions = (
++				"tvOSTestbed-Info.plist",
++			);
++			target = EE989E4D2DCD6E780036B268 /* tvOSTestbed */;
++		};
++/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 +
-+    // Start the test suite. Print a separator to differentiate Python startup logs from app logs
-+    NSLog(@"---------------------------------------------------------------------------");
++/* Begin PBXFileSystemSynchronizedRootGroup section */
++		EE989E502DCD6E780036B268 /* tvOSTestbed */ = {
++			isa = PBXFileSystemSynchronizedRootGroup;
++			exceptions = (
++				6077B37F2E81892A00E3D6A3 /* Exceptions for "tvOSTestbed" folder in "tvOSTestbed" target */,
++			);
++			explicitFolders = (
++				app,
++				app_packages,
++			);
++			path = tvOSTestbed;
++			sourceTree = "<group>";
++		};
++		EE989E682DCD6E7A0036B268 /* TestbedTests */ = {
++			isa = PBXFileSystemSynchronizedRootGroup;
++			path = TestbedTests;
++			sourceTree = "<group>";
++		};
++/* End PBXFileSystemSynchronizedRootGroup section */
 +
-+    exit_code = Py_RunMain();
-+    XCTAssertEqual(exit_code, 0, @"Test suite did not pass");
++/* Begin PBXFrameworksBuildPhase section */
++		EE989E4B2DCD6E780036B268 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EE7C8A1F2DCD70CD003206DB /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		EE989E622DCD6E7A0036B268 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EE7C8A1E2DCD6FF3003206DB /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
 +
-+    NSLog(@"---------------------------------------------------------------------------");
++/* Begin PBXGroup section */
++		EE989E452DCD6E780036B268 = {
++			isa = PBXGroup;
++			children = (
++				6077B3802E82A4BE00E3D6A3 /* tvOSTestbed.xctestplan */,
++				EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */,
++				EE989E502DCD6E780036B268 /* tvOSTestbed */,
++				EE989E682DCD6E7A0036B268 /* TestbedTests */,
++				EE989E4F2DCD6E780036B268 /* Products */,
++			);
++			sourceTree = "<group>";
++		};
++		EE989E4F2DCD6E780036B268 /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				EE989E4E2DCD6E780036B268 /* tvOSTestbed.app */,
++				EE989E652DCD6E7A0036B268 /* TestbedTests.xctest */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
 +
-+    Py_Finalize();
-+}
++/* Begin PBXNativeTarget section */
++		EE989E4D2DCD6E780036B268 /* tvOSTestbed */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = EE989E792DCD6E7A0036B268 /* Build configuration list for PBXNativeTarget "tvOSTestbed" */;
++			buildPhases = (
++				EE989E4A2DCD6E780036B268 /* Sources */,
++				EE989E4B2DCD6E780036B268 /* Frameworks */,
++				EE989E4C2DCD6E780036B268 /* Resources */,
++				EE7C8A222DCD70F4003206DB /* Process Python libraries */,
++				EE7C8A212DCD70CD003206DB /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			fileSystemSynchronizedGroups = (
++				EE989E502DCD6E780036B268 /* tvOSTestbed */,
++			);
++			name = tvOSTestbed;
++			packageProductDependencies = (
++			);
++			productName = tvOSTestbed;
++			productReference = EE989E4E2DCD6E780036B268 /* tvOSTestbed.app */;
++			productType = "com.apple.product-type.application";
++		};
++		EE989E642DCD6E7A0036B268 /* TestbedTests */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = EE989E7C2DCD6E7A0036B268 /* Build configuration list for PBXNativeTarget "TestbedTests" */;
++			buildPhases = (
++				EE989E612DCD6E7A0036B268 /* Sources */,
++				EE989E622DCD6E7A0036B268 /* Frameworks */,
++				EE989E632DCD6E7A0036B268 /* Resources */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++				EE989E672DCD6E7A0036B268 /* PBXTargetDependency */,
++			);
++			fileSystemSynchronizedGroups = (
++				EE989E682DCD6E7A0036B268 /* TestbedTests */,
++			);
++			name = TestbedTests;
++			packageProductDependencies = (
++			);
++			productName = TestbedTests;
++			productReference = EE989E652DCD6E7A0036B268 /* TestbedTests.xctest */;
++			productType = "com.apple.product-type.bundle.unit-test";
++		};
++/* End PBXNativeTarget section */
 +
++/* Begin PBXProject section */
++		EE989E462DCD6E780036B268 /* Project object */ = {
++			isa = PBXProject;
++			attributes = {
++				BuildIndependentTargetsInParallel = 1;
++				LastUpgradeCheck = 1620;
++				TargetAttributes = {
++					EE989E4D2DCD6E780036B268 = {
++						CreatedOnToolsVersion = 16.2;
++					};
++					EE989E642DCD6E7A0036B268 = {
++						CreatedOnToolsVersion = 16.2;
++						TestTargetID = EE989E4D2DCD6E780036B268;
++					};
++				};
++			};
++			buildConfigurationList = EE989E492DCD6E780036B268 /* Build configuration list for PBXProject "tvOSTestbed" */;
++			developmentRegion = en;
++			hasScannedForEncodings = 0;
++			knownRegions = (
++				en,
++				Base,
++			);
++			mainGroup = EE989E452DCD6E780036B268;
++			minimizedProjectReferenceProxies = 1;
++			preferredProjectObjectVersion = 77;
++			productRefGroup = EE989E4F2DCD6E780036B268 /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				EE989E4D2DCD6E780036B268 /* tvOSTestbed */,
++				EE989E642DCD6E7A0036B268 /* TestbedTests */,
++			);
++		};
++/* End PBXProject section */
 +
-+@end
---- /dev/null
-+++ b/watchOS/README.rst
-@@ -0,0 +1,108 @@
-+========================
-+Python on watchOS README
-+========================
++/* Begin PBXResourcesBuildPhase section */
++		EE989E4C2DCD6E780036B268 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		EE989E632DCD6E7A0036B268 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
 +
-+:Authors:
-+    Russell Keith-Magee (2023-11)
++/* Begin PBXShellScriptBuildPhase section */
++		EE7C8A222DCD70F4003206DB /* Process Python libraries */ = {
++			isa = PBXShellScriptBuildPhase;
++			alwaysOutOfDate = 1;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputFileListPaths = (
++			);
++			inputPaths = (
++			);
++			name = "Process Python libraries";
++			outputFileListPaths = (
++			);
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "set -e\n\nsource $PROJECT_DIR/Python.xcframework/build/utils.sh\n\ninstall_python Python.xcframework app app_packages\n";
++		};
++/* End PBXShellScriptBuildPhase section */
 +
-+This document provides a quick overview of some watchOS specific features in the
-+Python distribution.
++/* Begin PBXSourcesBuildPhase section */
++		EE989E4A2DCD6E780036B268 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		EE989E612DCD6E7A0036B268 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
 +
-+Compilers for building on watchOS
-+=================================
++/* Begin PBXTargetDependency section */
++		EE989E672DCD6E7A0036B268 /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = EE989E4D2DCD6E780036B268 /* tvOSTestbed */;
++			targetProxy = EE989E662DCD6E7A0036B268 /* PBXContainerItemProxy */;
++		};
++/* End PBXTargetDependency section */
 +
-+Building for watchOS requires the use of Apple's Xcode tooling. It is strongly
-+recommended that you use the most recent stable release of Xcode, on the
-+most recently released macOS.
++/* Begin XCBuildConfiguration section */
++		EE989E772DCD6E7A0036B268 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = dwarf;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = (
++					"DEBUG=1",
++					"$(inherited)",
++				);
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/Python.framework/Headers";
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
++				MTL_FAST_MATH = YES;
++				ONLY_ACTIVE_ARCH = YES;
++				SDKROOT = appletvos;
++				TVOS_DEPLOYMENT_TARGET = 18.2;
++			};
++			name = Debug;
++		};
++		EE989E782DCD6E7A0036B268 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				ENABLE_NS_ASSERTIONS = NO;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/Python.framework/Headers";
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = NO;
++				MTL_FAST_MATH = YES;
++				SDKROOT = appletvos;
++				TVOS_DEPLOYMENT_TARGET = 18.2;
++				VALIDATE_PRODUCT = YES;
++			};
++			name = Release;
++		};
++		EE989E7A2DCD6E7A0036B268 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				GENERATE_INFOPLIST_FILE = NO;
++				INFOPLIST_FILE = "tvOSTestbed/tvOSTestbed-Info.plist";
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UIUserInterfaceStyle = Automatic;
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.tvOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 3;
++			};
++			name = Debug;
++		};
++		EE989E7B2DCD6E7A0036B268 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				GENERATE_INFOPLIST_FILE = NO;
++				INFOPLIST_FILE = "tvOSTestbed/tvOSTestbed-Info.plist";
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UIUserInterfaceStyle = Automatic;
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.tvOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 3;
++			};
++			name = Release;
++		};
++		EE989E7D2DCD6E7A0036B268 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				GENERATE_INFOPLIST_FILE = YES;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.TestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 3;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tvOSTestbed";
++				TVOS_DEPLOYMENT_TARGET = 18.2;
++			};
++			name = Debug;
++		};
++		EE989E7E2DCD6E7A0036B268 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				GENERATE_INFOPLIST_FILE = YES;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.TestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 3;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tvOSTestbed";
++				TVOS_DEPLOYMENT_TARGET = 18.2;
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
 +
-+watchOS specific arguments to configure
-+=======================================
++/* Begin XCConfigurationList section */
++		EE989E492DCD6E780036B268 /* Build configuration list for PBXProject "tvOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				EE989E772DCD6E7A0036B268 /* Debug */,
++				EE989E782DCD6E7A0036B268 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		EE989E792DCD6E7A0036B268 /* Build configuration list for PBXNativeTarget "tvOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				EE989E7A2DCD6E7A0036B268 /* Debug */,
++				EE989E7B2DCD6E7A0036B268 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		EE989E7C2DCD6E7A0036B268 /* Build configuration list for PBXNativeTarget "TestbedTests" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				EE989E7D2DCD6E7A0036B268 /* Debug */,
++				EE989E7E2DCD6E7A0036B268 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = EE989E462DCD6E780036B268 /* Project object */;
++}
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed.xcodeproj/xcshareddata/xcschemes/tvOSTestbed.xcscheme
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   LastUpgradeVersion = "1640"
++   version = "1.7">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES"
++      buildArchitectures = "Automatic">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "EE989E4D2DCD6E780036B268"
++               BuildableName = "tvOSTestbed.app"
++               BlueprintName = "tvOSTestbed"
++               ReferencedContainer = "container:tvOSTestbed.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      customLLDBInitFile = "$(SOURCE_ROOT)/Testbed.lldbinit"
++      shouldUseLaunchSchemeArgsEnv = "YES">
++      <TestPlans>
++         <TestPlanReference
++            reference = "container:tvOSTestbed.xctestplan"
++            default = "YES">
++         </TestPlanReference>
++      </TestPlans>
++      <Testables>
++         <TestableReference
++            skipped = "NO"
++            parallelizable = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "EE989E642DCD6E7A0036B268"
++               BuildableName = "TestbedTests.xctest"
++               BlueprintName = "TestbedTests"
++               ReferencedContainer = "container:tvOSTestbed.xcodeproj">
++            </BuildableReference>
++         </TestableReference>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      debugServiceExtension = "internal"
++      allowLocationSimulation = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "EE989E4D2DCD6E780036B268"
++            BuildableName = "tvOSTestbed.app"
++            BlueprintName = "tvOSTestbed"
++            ReferencedContainer = "container:tvOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </LaunchAction>
++   <ProfileAction
++      buildConfiguration = "Release"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      debugDocumentVersioning = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "EE989E4D2DCD6E780036B268"
++            BuildableName = "tvOSTestbed.app"
++            BlueprintName = "tvOSTestbed"
++            ReferencedContainer = "container:tvOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed.xctestplan
+@@ -0,0 +1,46 @@
++{
++  "configurations" : [
++    {
++      "id" : "F5A95CE4-1ADE-4A6E-A0E1-CDBAE26DF0C5",
++      "name" : "Test Scheme Action",
++      "options" : {
 +
-+* ``--enable-framework[=DIR]``
++      }
++    }
++  ],
++  "defaultOptions" : {
++    "commandLineArgumentEntries" : [
++      {
++        "argument" : "test"
++      },
++      {
++        "argument" : "-uall"
++      },
++      {
++        "argument" : "--single-process"
++      },
++      {
++        "argument" : "--rerun"
++      },
++      {
++        "argument" : "-W"
++      }
++    ],
++    "targetForVariableExpansion" : {
++      "containerPath" : "container:tvOSTestbed.xcodeproj",
++      "identifier" : "607A66112B0EFA380010BFC8",
++      "name" : "tvOSTestbed"
++    }
++  },
++  "testTargets" : [
++    {
++      "parallelizable" : false,
++      "target" : {
++        "containerPath" : "container:tvOSTestbed.xcodeproj",
++        "identifier" : "EE989E642DCD6E7A0036B268",
++        "name" : "TestbedTests"
++      }
++    }
++  ],
++  "version" : 1
++}
+\ No newline at end of file
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/AppDelegate.h
+@@ -0,0 +1,11 @@
++//
++//  AppDelegate.h
++//  tvOSTestbed
++//
 +
-+  This argument specifies the location where the Python.framework will
-+  be installed.
++#import <UIKit/UIKit.h>
 +
-+* ``--with-framework-name=NAME``
++@interface AppDelegate : UIResponder <UIApplicationDelegate>
 +
-+  Specify the name for the python framework, defaults to ``Python``.
 +
++@end
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/AppDelegate.m
+@@ -0,0 +1,19 @@
++//
++//  AppDelegate.m
++//  tvOSTestbed
++//
 +
-+Building and using Python on watchOS
-+====================================
++#import "AppDelegate.h"
 +
-+ABIs and Architectures
-+----------------------
++@interface AppDelegate ()
 +
-+watchOS apps can be deployed on physical devices, and on the watchOS simulator.
-+Although the API used on these devices is identical, the ABI is different - you
-+need to link against different libraries for an watchOS device build
-+(``watchos``) or an watchOS simulator build (``watchsimulator``). Apple uses the
-+XCframework format to allow specifying a single dependency that supports
-+multiple ABIs. An XCframework is a wrapper around multiple ABI-specific
-+frameworks.
++@end
 +
-+watchOS can also support different CPU architectures within each ABI. At present,
-+there is only a single support ed architecture on physical devices - ARM64.
-+However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
-+Silicon machines), and x86_64 (for running on older Intel-based machines.)
++@implementation AppDelegate
 +
-+To support multiple CPU architectures on a single platform, Apple uses a "fat
-+binary" format - a single physical file that contains support for multiple
-+architectures.
 +
-+How do I build Python for watchOS?
-+-------------------------------
++- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
++    return YES;
++}
 +
-+The Python build system will build a ``Python.framework`` that supports a
-+*single* ABI with a *single* architecture. If you want to use Python in an watchOS
-+project, you need to:
-+
-+1. Produce multiple ``Python.framework`` builds, one for each ABI and architecture;
-+2. Merge the binaries for each architecture on a given ABI into a single "fat" binary;
-+3. Merge the "fat" frameworks for each ABI into a single XCframework.
-+
-+watchOS builds of Python *must* be constructed as framework builds. To support this,
-+you must provide the ``--enable-framework`` flag when configuring the build.
-+
-+The build also requires the use of cross-compilation. The commands for building
-+Python for watchOS will look somethign like::
-+
-+  $ ./configure \
-+        --enable-framework=/path/to/install \
-+        --host=aarch64-apple-watchos \
-+        --build=aarch64-apple-darwin \
-+        --with-build-python=/path/to/python.exe
-+  $ make
-+  $ make install
-+
-+In this invocation:
++@end
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/Base.lproj/LaunchScreen.storyboard
+@@ -0,0 +1,24 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="13122.16" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
++    <dependencies>
++        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
++        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
++        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
++    </dependencies>
++    <scenes>
++        <!--View Controller-->
++        <scene sceneID="tne-QT-ifu">
++            <objects>
++                <viewController id="BYZ-38-t0r" sceneMemberID="viewController">
++                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
++                        <rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
++                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
++                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
++                        <viewLayoutGuide key="safeArea" id="wu6-TO-1qx"/>
++                    </view>
++                </viewController>
++                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
++            </objects>
++        </scene>
++    </scenes>
++</document>
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/app/README
+@@ -0,0 +1,7 @@
++This folder can contain any Python application code.
 +
-+* ``/path/to/install`` is the location where the final Python.framework will be
-+  output.
++During the build, any binary modules found in this folder will be processed into
++Framework form.
 +
-+* ``--host`` is the architecture and ABI that you want to build, in GNU compiler
-+  triple format. This will be one of:
++When the test suite runs, this folder will be on the PYTHONPATH, and will be the
++working directory for the test suite.
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/app_packages/README
+@@ -0,0 +1,7 @@
++This folder can be a target for installing any Python dependencies needed by the
++test suite.
 +
-+  - ``arm64_32-apple-watchos`` for ARM64-32 watchOS devices.
-+  - ``aarch64-apple-watchos-simulator`` for the watchOS simulator running on Apple
-+    Silicon devices.
-+  - ``x86_64-apple-watchos-simulator`` for the watchOS simulator running on Intel
-+    devices.
++During the build, any binary modules found in this folder will be processed into
++Framework form.
 +
-+* ``--build`` is the GNU compiler triple for the machine that will be running
-+  the compiler. This is one of:
++When the test suite runs, this folder will be on the PYTHONPATH.
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/main.m
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  tvOSTestbed
++//
 +
-+  - ``aarch64-apple-darwin`` for Apple Silicon devices.
-+  - ``x86_64-apple-darwin`` for Intel devices.
++#import <UIKit/UIKit.h>
++#import "AppDelegate.h"
 +
-+* ``/path/to/python.exe`` is the path to a Python binary on the machine that
-+  will be running the compiler. This is needed because the Python compilation
-+  process involves running some Python code. On a normal desktop build of
-+  Python, you can compile a python interpreter and then use that interpreter to
-+  run Python code. However, the binaries produced for watchOS won't run on macOS, so
-+  you need to provide an external Python interpreter. This interpreter must be
-+  the version as the Python that is being compiled.
++int main(int argc, char * argv[]) {
++    NSString * appDelegateClassName;
++    @autoreleasepool {
++        appDelegateClassName = NSStringFromClass([AppDelegate class]);
 +
-+Using a framework-based Python on watchOS
-+======================================
++        return UIApplicationMain(argc, argv, nil, appDelegateClassName);
++    }
++}
 --- /dev/null
-+++ b/watchOS/Resources/Info.plist.in
-@@ -0,0 +1,34 @@
++++ b/Apple/testbed/tvOSTestbed/tvOSTestbed-Info.plist
+@@ -0,0 +1,52 @@
 +<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-+<plist version="0.9">
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
 +<dict>
 +	<key>CFBundleDevelopmentRegion</key>
 +	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
 +	<key>CFBundleExecutable</key>
-+	<string>Python</string>
-+	<key>CFBundleGetInfoString</key>
-+	<string>Python Runtime and Library</string>
++	<string>${EXECUTABLE_NAME}</string>
 +	<key>CFBundleIdentifier</key>
-+	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<string>org.python.tvOSTestbed</string>
 +	<key>CFBundleInfoDictionaryVersion</key>
 +	<string>6.0</string>
 +	<key>CFBundleName</key>
-+	<string>Python</string>
++	<string>${PRODUCT_NAME}</string>
 +	<key>CFBundlePackageType</key>
-+	<string>FMWK</string>
++	<string>APPL</string>
 +	<key>CFBundleShortVersionString</key>
-+	<string>%VERSION%</string>
-+	<key>CFBundleLongVersionString</key>
-+	<string>%VERSION%, (c) 2001-2023 Python Software Foundation.</string>
++	<string>1.0</string>
 +	<key>CFBundleSignature</key>
 +	<string>????</string>
 +	<key>CFBundleVersion</key>
-+	<string>%VERSION%</string>
-+	<key>CFBundleSupportedPlatforms</key>
++	<string>1</string>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
++	<key>UIRequiresFullScreen</key>
++	<true/>
++	<key>UILaunchStoryboardName</key>
++	<string>Launch Screen</string>
++	<key>UISupportedInterfaceOrientations</key>
 +	<array>
-+		<string>watchOS</string>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
 +	</array>
-+	<key>MinimumOSVersion</key>
-+	<string>@WATCHOS_DEPLOYMENT_TARGET@</string>
-+</dict>
-+</plist>
---- /dev/null
-+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-ar
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} ar "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target arm64-apple-watchos-simulator "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang++
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target arm64-apple-watchos-simulator "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-cpp
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator clang -target arm64-apple-watchos-simulator -E "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-ar
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchos${WATCHOS_SDK_VERSION} ar "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-clang
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-clang++
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang++ -target arm64_32-apple-watchos "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-cpp
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos -E "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-ar
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} ar "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos-simulator "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang++
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target x86_64-apple-watchos-simulator "$@"
---- /dev/null
-+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-cpp
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos-simulator -E "$@"
---- /dev/null
-+++ b/watchOS/Resources/dylib-Info-template.plist
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleExecutable</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string></string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
-+	<key>CFBundleShortVersionString</key>
-+	<string>1.0</string>
-+	<key>CFBundleSupportedPlatforms</key>
++	<key>UISupportedInterfaceOrientations~ipad</key>
 +	<array>
-+		<string>watchOS</string>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationPortraitUpsideDown</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
 +	</array>
-+	<key>MinimumOSVersion</key>
-+	<string>4.0</string>
-+	<key>CFBundleVersion</key>
-+	<string>1</string>
++	<key>UIApplicationSceneManifest</key>
++	<dict>
++		<key>UIApplicationSupportsMultipleScenes</key>
++		<false/>
++		<key>UISceneConfigurations</key>
++		<dict/>
++	</dict>
 +</dict>
 +</plist>
 --- /dev/null
-+++ b/watchOS/Resources/pyconfig.h
-@@ -0,0 +1,11 @@
-+#ifdef __arm64__
-+#  ifdef __LP64__
-+#include "pyconfig-arm64.h"
-+#  else
-+#include "pyconfig-arm64_32.h"
-+#  endif
-+#endif
++++ b/Apple/testbed/visionOSTestbed.xcodeproj/project.pbxproj
+@@ -0,0 +1,558 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 56;
++	objects = {
 +
-+#ifdef __x86_64__
-+#include "pyconfig-x86_64.h"
-+#endif
++/* Begin PBXBuildFile section */
++		607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66162B0EFA380010BFC8 /* AppDelegate.m */; };
++		607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607A66212B0EFA390010BFC8 /* Assets.xcassets */; };
++		607A66282B0EFA390010BFC8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66272B0EFA390010BFC8 /* main.m */; };
++		607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66312B0EFA3A0010BFC8 /* TestbedTests.m */; };
++		608619542CB77BA900F46182 /* app_packages in Resources */ = {isa = PBXBuildFile; fileRef = 608619532CB77BA900F46182 /* app_packages */; };
++		608619562CB7819B00F46182 /* app in Resources */ = {isa = PBXBuildFile; fileRef = 608619552CB7819B00F46182 /* app */; };
++		EEB367CE2DADF5C900B9A1D7 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		EEB367CF2DADF5D300B9A1D7 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		EEE9C80D2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; };
++		EEE9C80E2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; };
++/* End PBXBuildFile section */
++
++/* Begin PBXContainerItemProxy section */
++		607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = 607A660A2B0EFA380010BFC8 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = 607A66112B0EFA380010BFC8;
++			remoteInfo = iOSTestbed;
++		};
++/* End PBXContainerItemProxy section */
++
++/* Begin PBXCopyFilesBuildPhase section */
++		607A664E2B0EFC080010BFC8 /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				EEB367CF2DADF5D300B9A1D7 /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A66522B0EFFE00010BFC8 /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				EEB367CE2DADF5C900B9A1D7 /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXCopyFilesBuildPhase section */
++
++/* Begin PBXFileReference section */
++		6077B3D62E82E60C00E3D6A3 /* visionOSTestbed.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = visionOSTestbed.xctestplan; sourceTree = "<group>"; };
++		607A66122B0EFA380010BFC8 /* visionOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = visionOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66152B0EFA380010BFC8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
++		607A66162B0EFA380010BFC8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
++		607A66212B0EFA390010BFC8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
++		607A66272B0EFA390010BFC8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
++		607A662D2B0EFA3A0010BFC8 /* TestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66312B0EFA3A0010BFC8 /* TestbedTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestbedTests.m; sourceTree = "<group>"; };
++		607A66592B0F08600010BFC8 /* visionOSTestbed-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "visionOSTestbed-Info.plist"; sourceTree = "<group>"; };
++		608619532CB77BA900F46182 /* app_packages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app_packages; sourceTree = "<group>"; };
++		608619552CB7819B00F46182 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app; sourceTree = "<group>"; };
++		EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
++/* End PBXFileReference section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		607A660F2B0EFA380010BFC8 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EEE9C80D2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A662A2B0EFA3A0010BFC8 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EEE9C80E2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		607A66092B0EFA380010BFC8 = {
++			isa = PBXGroup;
++			children = (
++				6077B3D62E82E60C00E3D6A3 /* visionOSTestbed.xctestplan */,
++				EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */,
++				607A66142B0EFA380010BFC8 /* visionOSTestbed */,
++				607A66302B0EFA3A0010BFC8 /* TestbedTests */,
++				607A66132B0EFA380010BFC8 /* Products */,
++				607A664F2B0EFFE00010BFC8 /* Frameworks */,
++			);
++			sourceTree = "<group>";
++		};
++		607A66132B0EFA380010BFC8 /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				607A66122B0EFA380010BFC8 /* visionOSTestbed.app */,
++				607A662D2B0EFA3A0010BFC8 /* TestbedTests.xctest */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		607A66142B0EFA380010BFC8 /* visionOSTestbed */ = {
++			isa = PBXGroup;
++			children = (
++				608619552CB7819B00F46182 /* app */,
++				608619532CB77BA900F46182 /* app_packages */,
++				607A66592B0F08600010BFC8 /* visionOSTestbed-Info.plist */,
++				607A66152B0EFA380010BFC8 /* AppDelegate.h */,
++				607A66162B0EFA380010BFC8 /* AppDelegate.m */,
++				607A66212B0EFA390010BFC8 /* Assets.xcassets */,
++				607A66272B0EFA390010BFC8 /* main.m */,
++			);
++			path = visionOSTestbed;
++			sourceTree = "<group>";
++		};
++		607A66302B0EFA3A0010BFC8 /* TestbedTests */ = {
++			isa = PBXGroup;
++			children = (
++				607A66312B0EFA3A0010BFC8 /* TestbedTests.m */,
++			);
++			path = TestbedTests;
++			sourceTree = "<group>";
++		};
++		607A664F2B0EFFE00010BFC8 /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		607A66112B0EFA380010BFC8 /* visionOSTestbed */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbed" */;
++			buildPhases = (
++				607A660E2B0EFA380010BFC8 /* Sources */,
++				607A660F2B0EFA380010BFC8 /* Frameworks */,
++				607A66102B0EFA380010BFC8 /* Resources */,
++				607A66552B0F061D0010BFC8 /* Process Python libraries */,
++				607A664E2B0EFC080010BFC8 /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = visionOSTestbed;
++			productName = iOSTestbed;
++			productReference = 607A66122B0EFA380010BFC8 /* visionOSTestbed.app */;
++			productType = "com.apple.product-type.application";
++		};
++		607A662C2B0EFA3A0010BFC8 /* TestbedTests */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "TestbedTests" */;
++			buildPhases = (
++				607A66292B0EFA3A0010BFC8 /* Sources */,
++				607A662A2B0EFA3A0010BFC8 /* Frameworks */,
++				607A662B2B0EFA3A0010BFC8 /* Resources */,
++				607A66522B0EFFE00010BFC8 /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++				607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */,
++			);
++			name = TestbedTests;
++			productName = iOSTestbedTests;
++			productReference = 607A662D2B0EFA3A0010BFC8 /* TestbedTests.xctest */;
++			productType = "com.apple.product-type.bundle.unit-test";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		607A660A2B0EFA380010BFC8 /* Project object */ = {
++			isa = PBXProject;
++			attributes = {
++				BuildIndependentTargetsInParallel = 1;
++				LastUpgradeCheck = 1500;
++				TargetAttributes = {
++					607A66112B0EFA380010BFC8 = {
++						CreatedOnToolsVersion = 15.0.1;
++					};
++					607A662C2B0EFA3A0010BFC8 = {
++						CreatedOnToolsVersion = 15.0.1;
++						TestTargetID = 607A66112B0EFA380010BFC8;
++					};
++				};
++			};
++			buildConfigurationList = 607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "visionOSTestbed" */;
++			compatibilityVersion = "Xcode 14.0";
++			developmentRegion = en;
++			hasScannedForEncodings = 0;
++			knownRegions = (
++				en,
++				Base,
++			);
++			mainGroup = 607A66092B0EFA380010BFC8;
++			productRefGroup = 607A66132B0EFA380010BFC8 /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				607A66112B0EFA380010BFC8 /* visionOSTestbed */,
++				607A662C2B0EFA3A0010BFC8 /* TestbedTests */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		607A66102B0EFA380010BFC8 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				608619562CB7819B00F46182 /* app in Resources */,
++				607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */,
++				608619542CB77BA900F46182 /* app_packages in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A662B2B0EFA3A0010BFC8 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXShellScriptBuildPhase section */
++		607A66552B0F061D0010BFC8 /* Process Python libraries */ = {
++			isa = PBXShellScriptBuildPhase;
++			alwaysOutOfDate = 1;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputFileListPaths = (
++			);
++			inputPaths = (
++			);
++			name = "Process Python libraries";
++			outputFileListPaths = (
++			);
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "set -e\n\nsource $PROJECT_DIR/Python.xcframework/build/utils.sh\n\ninstall_python Python.xcframework app app_packages\n";
++			showEnvVarsInLog = 0;
++		};
++/* End PBXShellScriptBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		607A660E2B0EFA380010BFC8 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */,
++				607A66282B0EFA390010BFC8 /* main.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A66292B0EFA3A0010BFC8 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin PBXTargetDependency section */
++		607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = 607A66112B0EFA380010BFC8 /* visionOSTestbed */;
++			targetProxy = 607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */;
++		};
++/* End PBXTargetDependency section */
++
++/* Begin XCBuildConfiguration section */
++		607A663F2B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = dwarf;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = YES;
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = (
++					"DEBUG=1",
++					"$(inherited)",
++				);
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
++				MTL_FAST_MATH = YES;
++				ONLY_ACTIVE_ARCH = YES;
++				SDKROOT = xros;
++			};
++			name = Debug;
++		};
++		607A66402B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				ENABLE_NS_ASSERTIONS = NO;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = YES;
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = NO;
++				MTL_FAST_MATH = YES;
++				SDKROOT = xros;
++				VALIDATE_PRODUCT = YES;
++			};
++			name = Release;
++		};
++		607A66422B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = "";
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				INFOPLIST_FILE = "visionOSTestbed/visionOSTestbed-Info.plist";
++				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 3.13.0a1;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 7;
++				XROS_DEPLOYMENT_TARGET = 2.0;
++			};
++			name = Debug;
++		};
++		607A66432B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = "";
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				INFOPLIST_FILE = "visionOSTestbed/visionOSTestbed-Info.plist";
++				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 3.13.0a1;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 7;
++				XROS_DEPLOYMENT_TARGET = 2.0;
++			};
++			name = Release;
++		};
++		607A66452B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = 3HEZE76D99;
++				GENERATE_INFOPLIST_FILE = YES;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.TestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 7;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestbed";
++			};
++			name = Debug;
++		};
++		607A66462B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = 3HEZE76D99;
++				GENERATE_INFOPLIST_FILE = YES;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.TestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 7;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestbed";
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "visionOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A663F2B0EFA3A0010BFC8 /* Debug */,
++				607A66402B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A66422B0EFA3A0010BFC8 /* Debug */,
++				607A66432B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "TestbedTests" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A66452B0EFA3A0010BFC8 /* Debug */,
++				607A66462B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = 607A660A2B0EFA380010BFC8 /* Project object */;
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed.xcodeproj/xcshareddata/xcschemes/visionOSTestbed.xcscheme
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   LastUpgradeVersion = "1640"
++   version = "1.7">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES"
++      buildArchitectures = "Automatic">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++               BuildableName = "visionOSTestbed.app"
++               BlueprintName = "visionOSTestbed"
++               ReferencedContainer = "container:visionOSTestbed.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      customLLDBInitFile = "$(SOURCE_ROOT)/Testbed.lldbinit"
++      shouldUseLaunchSchemeArgsEnv = "YES">
++      <TestPlans>
++         <TestPlanReference
++            reference = "container:visionOSTestbed.xctestplan"
++            default = "YES">
++         </TestPlanReference>
++      </TestPlans>
++      <Testables>
++         <TestableReference
++            skipped = "NO"
++            parallelizable = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "607A662C2B0EFA3A0010BFC8"
++               BuildableName = "TestbedTests.xctest"
++               BlueprintName = "TestbedTests"
++               ReferencedContainer = "container:visionOSTestbed.xcodeproj">
++            </BuildableReference>
++         </TestableReference>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      debugServiceExtension = "internal"
++      allowLocationSimulation = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++            BuildableName = "visionOSTestbed.app"
++            BlueprintName = "visionOSTestbed"
++            ReferencedContainer = "container:visionOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </LaunchAction>
++   <ProfileAction
++      buildConfiguration = "Release"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      debugDocumentVersioning = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++            BuildableName = "visionOSTestbed.app"
++            BlueprintName = "visionOSTestbed"
++            ReferencedContainer = "container:visionOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed.xctestplan
+@@ -0,0 +1,46 @@
++{
++  "configurations" : [
++    {
++      "id" : "C17FA044-0B70-48CA-AFF8-BC252081002F",
++      "name" : "Test Scheme Action",
++      "options" : {
++
++      }
++    }
++  ],
++  "defaultOptions" : {
++    "commandLineArgumentEntries" : [
++      {
++        "argument" : "test"
++      },
++      {
++        "argument" : "-uall"
++      },
++      {
++        "argument" : "--single-process"
++      },
++      {
++        "argument" : "--rerun"
++      },
++      {
++        "argument" : "-W"
++      }
++    ],
++    "targetForVariableExpansion" : {
++      "containerPath" : "container:visionOSTestbed.xcodeproj",
++      "identifier" : "607A66112B0EFA380010BFC8",
++      "name" : "visionOSTestbed"
++    }
++  },
++  "testTargets" : [
++    {
++      "parallelizable" : false,
++      "target" : {
++        "containerPath" : "container:visionOSTestbed.xcodeproj",
++        "identifier" : "607A662C2B0EFA3A0010BFC8",
++        "name" : "TestbedTests"
++      }
++    }
++  ],
++  "version" : 1
++}
+\ No newline at end of file
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/AppDelegate.h
+@@ -0,0 +1,11 @@
++//
++//  AppDelegate.h
++//  visionOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++
++@interface AppDelegate : UIResponder <UIApplicationDelegate>
++
++
++@end
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/AppDelegate.m
+@@ -0,0 +1,19 @@
++//
++//  AppDelegate.m
++//  visionOSTestbed
++//
++
++#import "AppDelegate.h"
++
++@interface AppDelegate ()
++
++@end
++
++@implementation AppDelegate
++
++
++- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
++    return YES;
++}
++
++@end
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/Assets.xcassets/AccentColor.colorset/Contents.json
+@@ -0,0 +1,11 @@
++{
++  "colors" : [
++    {
++      "idiom" : "universal"
++    }
++  ],
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/Assets.xcassets/AppIcon.appiconset/Contents.json
+@@ -0,0 +1,13 @@
++{
++  "images" : [
++    {
++      "idiom" : "universal",
++      "platform" : "ios",
++      "size" : "1024x1024"
++    }
++  ],
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/Assets.xcassets/Contents.json
+@@ -0,0 +1,6 @@
++{
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/app/README
+@@ -0,0 +1,7 @@
++This folder can contain any Python application code.
++
++During the build, any binary modules found in this folder will be processed into
++iOS Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH, and will be the
++working directory for the test suite.
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/app_packages/README
+@@ -0,0 +1,7 @@
++This folder can be a target for installing any Python dependencies needed by the
++test suite.
++
++During the build, any binary modules found in this folder will be processed into
++iOS Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH.
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/main.m
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  visionOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++#import "AppDelegate.h"
++
++int main(int argc, char * argv[]) {
++    NSString * appDelegateClassName;
++    @autoreleasepool {
++        appDelegateClassName = NSStringFromClass([AppDelegate class]);
++
++        return UIApplicationMain(argc, argv, nil, appDelegateClassName);
++    }
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/visionOSTestbed-Info.plist
+@@ -0,0 +1,56 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIdentifier</key>
++	<string>org.python.visionOSTestbed</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++	<key>TestArgs</key>
++	<array>
++		<string>test</string>
++		<string>-uall</string>
++		<string>--single-process</string>
++		<string>--rerun</string>
++		<string>-W</string>
++	</array>
++	<key>UIApplicationSceneManifest</key>
++	<dict>
++		<key>UIApplicationSupportsMultipleScenes</key>
++		<false/>
++		<key>UISceneConfigurations</key>
++		<dict/>
++	</dict>
++	<key>UIRequiresFullScreen</key>
++	<true/>
++	<key>UISupportedInterfaceOrientations</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++	<key>UISupportedInterfaceOrientations~ipad</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationPortraitUpsideDown</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/tvOS/README.rst
+@@ -0,0 +1,108 @@
++=====================
++Python on tvOS README
++=====================
++
++:Authors:
++    Russell Keith-Magee (2023-11)
++
++This document provides a quick overview of some tvOS specific features in the
++Python distribution.
++
++Compilers for building on tvOS
++==============================
++
++Building for tvOS requires the use of Apple's Xcode tooling. It is strongly
++recommended that you use the most recent stable release of Xcode, on the
++most recently released macOS.
++
++tvOS specific arguments to configure
++===================================
++
++* ``--enable-framework[=DIR]``
++
++  This argument specifies the location where the Python.framework will
++  be installed.
++
++* ``--with-framework-name=NAME``
++
++  Specify the name for the python framework, defaults to ``Python``.
++
++
++Building and using Python on tvOS
++=================================
++
++ABIs and Architectures
++----------------------
++
++tvOS apps can be deployed on physical devices, and on the tvOS simulator.
++Although the API used on these devices is identical, the ABI is different - you
++need to link against different libraries for an tvOS device build
++(``appletvos``) or an tvOS simulator build (``appletvsimulator``). Apple uses
++the XCframework format to allow specifying a single dependency that supports
++multiple ABIs. An XCframework is a wrapper around multiple ABI-specific
++frameworks.
++
++tvOS can also support different CPU architectures within each ABI. At present,
++there is only a single support ed architecture on physical devices - ARM64.
++However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
++Silicon machines), and x86_64 (for running on older Intel-based machines.)
++
++To support multiple CPU architectures on a single platform, Apple uses a "fat
++binary" format - a single physical file that contains support for multiple
++architectures.
++
++How do I build Python for tvOS?
++-------------------------------
++
++The Python build system will build a ``Python.framework`` that supports a
++*single* ABI with a *single* architecture. If you want to use Python in an tvOS
++project, you need to:
++
++1. Produce multiple ``Python.framework`` builds, one for each ABI and architecture;
++2. Merge the binaries for each architecture on a given ABI into a single "fat" binary;
++3. Merge the "fat" frameworks for each ABI into a single XCframework.
++
++tvOS builds of Python *must* be constructed as framework builds. To support this,
++you must provide the ``--enable-framework`` flag when configuring the build.
++
++The build also requires the use of cross-compilation. The commands for building
++Python for tvOS will look somethign like::
++
++  $ ./configure \
++        --enable-framework=/path/to/install \
++        --host=aarch64-apple-tvos \
++        --build=aarch64-apple-darwin \
++        --with-build-python=/path/to/python.exe
++  $ make
++  $ make install
++
++In this invocation:
++
++* ``/path/to/install`` is the location where the final Python.framework will be
++  output.
++
++* ``--host`` is the architecture and ABI that you want to build, in GNU compiler
++  triple format. This will be one of:
++
++  - ``aarch64-apple-tvos`` for ARM64 tvOS devices.
++  - ``aarch64-apple-tvos-simulator`` for the tvOS simulator running on Apple
++    Silicon devices.
++  - ``x86_64-apple-tvos-simulator`` for the tvOS simulator running on Intel
++    devices.
++
++* ``--build`` is the GNU compiler triple for the machine that will be running
++  the compiler. This is one of:
++
++  - ``aarch64-apple-darwin`` for Apple Silicon devices.
++  - ``x86_64-apple-darwin`` for Intel devices.
++
++* ``/path/to/python.exe`` is the path to a Python binary on the machine that
++  will be running the compiler. This is needed because the Python compilation
++  process involves running some Python code. On a normal desktop build of
++  Python, you can compile a python interpreter and then use that interpreter to
++  run Python code. However, the binaries produced for tvOS won't run on macOS, so
++  you need to provide an external Python interpreter. This interpreter must be
++  the version as the Python that is being compiled.
++
++Using a framework-based Python on tvOS
++======================================
+--- /dev/null
++++ b/Apple/tvOS/Resources/Info.plist.in
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
++<plist version="0.9">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string>Python</string>
++	<key>CFBundleGetInfoString</key>
++	<string>Python Runtime and Library</string>
++	<key>CFBundleIdentifier</key>
++	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>Python</string>
++	<key>CFBundlePackageType</key>
++	<string>FMWK</string>
++	<key>CFBundleShortVersionString</key>
++	<string>%VERSION%</string>
++	<key>CFBundleLongVersionString</key>
++	<string>%VERSION%, (c) 2001-2024 Python Software Foundation.</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>tvOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>@TVOS_DEPLOYMENT_TARGET@</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET} -E "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk iphoneos${TVOS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target x86_64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} strip -arch x86_64 "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/pyconfig.h
+@@ -0,0 +1,7 @@
++#ifdef __arm64__
++#include "pyconfig-arm64.h"
++#endif
++
++#ifdef __x86_64__
++#include "pyconfig-x86_64.h"
++#endif
+--- /dev/null
++++ b/Apple/visionOS/Resources/Info.plist.in
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
++<plist version="0.9">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string>Python</string>
++	<key>CFBundleGetInfoString</key>
++	<string>Python Runtime and Library</string>
++	<key>CFBundleIdentifier</key>
++	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>Python</string>
++	<key>CFBundlePackageType</key>
++	<string>FMWK</string>
++	<key>CFBundleShortVersionString</key>
++	<string>%VERSION%</string>
++	<key>CFBundleLongVersionString</key>
++	<string>%VERSION%, (c) 2001-2023 Python Software Foundation.</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>%VERSION%</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>XROS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>@XROS_DEPLOYMENT_TARGET@</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang++ -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} -E "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang++ -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk xros${XROS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/pyconfig.h
+@@ -0,0 +1,3 @@
++#ifdef __arm64__
++#include "pyconfig-arm64.h"
++#endif
+--- /dev/null
++++ b/Apple/watchOS/README.rst
+@@ -0,0 +1,108 @@
++========================
++Python on watchOS README
++========================
++
++:Authors:
++    Russell Keith-Magee (2023-11)
++
++This document provides a quick overview of some watchOS specific features in the
++Python distribution.
++
++Compilers for building on watchOS
++=================================
++
++Building for watchOS requires the use of Apple's Xcode tooling. It is strongly
++recommended that you use the most recent stable release of Xcode, on the
++most recently released macOS.
++
++watchOS specific arguments to configure
++=======================================
++
++* ``--enable-framework[=DIR]``
++
++  This argument specifies the location where the Python.framework will
++  be installed.
++
++* ``--with-framework-name=NAME``
++
++  Specify the name for the python framework, defaults to ``Python``.
++
++
++Building and using Python on watchOS
++====================================
++
++ABIs and Architectures
++----------------------
++
++watchOS apps can be deployed on physical devices, and on the watchOS simulator.
++Although the API used on these devices is identical, the ABI is different - you
++need to link against different libraries for an watchOS device build
++(``watchos``) or an watchOS simulator build (``watchsimulator``). Apple uses the
++XCframework format to allow specifying a single dependency that supports
++multiple ABIs. An XCframework is a wrapper around multiple ABI-specific
++frameworks.
++
++watchOS can also support different CPU architectures within each ABI. At present,
++there is only a single support ed architecture on physical devices - ARM64.
++However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
++Silicon machines), and x86_64 (for running on older Intel-based machines.)
++
++To support multiple CPU architectures on a single platform, Apple uses a "fat
++binary" format - a single physical file that contains support for multiple
++architectures.
++
++How do I build Python for watchOS?
++-------------------------------
++
++The Python build system will build a ``Python.framework`` that supports a
++*single* ABI with a *single* architecture. If you want to use Python in an watchOS
++project, you need to:
++
++1. Produce multiple ``Python.framework`` builds, one for each ABI and architecture;
++2. Merge the binaries for each architecture on a given ABI into a single "fat" binary;
++3. Merge the "fat" frameworks for each ABI into a single XCframework.
++
++watchOS builds of Python *must* be constructed as framework builds. To support this,
++you must provide the ``--enable-framework`` flag when configuring the build.
++
++The build also requires the use of cross-compilation. The commands for building
++Python for watchOS will look somethign like::
++
++  $ ./configure \
++        --enable-framework=/path/to/install \
++        --host=aarch64-apple-watchos \
++        --build=aarch64-apple-darwin \
++        --with-build-python=/path/to/python.exe
++  $ make
++  $ make install
++
++In this invocation:
++
++* ``/path/to/install`` is the location where the final Python.framework will be
++  output.
++
++* ``--host`` is the architecture and ABI that you want to build, in GNU compiler
++  triple format. This will be one of:
++
++  - ``arm64_32-apple-watchos`` for ARM64-32 watchOS devices.
++  - ``aarch64-apple-watchos-simulator`` for the watchOS simulator running on Apple
++    Silicon devices.
++  - ``x86_64-apple-watchos-simulator`` for the watchOS simulator running on Intel
++    devices.
++
++* ``--build`` is the GNU compiler triple for the machine that will be running
++  the compiler. This is one of:
++
++  - ``aarch64-apple-darwin`` for Apple Silicon devices.
++  - ``x86_64-apple-darwin`` for Intel devices.
++
++* ``/path/to/python.exe`` is the path to a Python binary on the machine that
++  will be running the compiler. This is needed because the Python compilation
++  process involves running some Python code. On a normal desktop build of
++  Python, you can compile a python interpreter and then use that interpreter to
++  run Python code. However, the binaries produced for watchOS won't run on macOS, so
++  you need to provide an external Python interpreter. This interpreter must be
++  the version as the Python that is being compiled.
++
++Using a framework-based Python on watchOS
++======================================
+--- /dev/null
++++ b/Apple/watchOS/Resources/Info.plist.in
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
++<plist version="0.9">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string>Python</string>
++	<key>CFBundleGetInfoString</key>
++	<string>Python Runtime and Library</string>
++	<key>CFBundleIdentifier</key>
++	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>Python</string>
++	<key>CFBundlePackageType</key>
++	<string>FMWK</string>
++	<key>CFBundleShortVersionString</key>
++	<string>%VERSION%</string>
++	<key>CFBundleLongVersionString</key>
++	<string>%VERSION%, (c) 2001-2023 Python Software Foundation.</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>%VERSION%</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>watchOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>@WATCHOS_DEPLOYMENT_TARGET@</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target arm64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target arm64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator clang -target arm64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64_32-apple-watchos-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64_32-apple-watchos-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos${WATCHOS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64_32-apple-watchos-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang++ -target arm64_32-apple-watchos${WATCHOS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64_32-apple-watchos-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos${WATCHOS_DEPLOYMENT_TARGET} -E "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target x86_64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} strip -arch x86_64 "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/pyconfig.h
+@@ -0,0 +1,11 @@
++#ifdef __arm64__
++#  ifdef __LP64__
++#include "pyconfig-arm64.h"
++#  else
++#include "pyconfig-arm64_32.h"
++#  endif
++#endif
++
++#ifdef __x86_64__
++#include "pyconfig-x86_64.h"
++#endif
+diff --git a/Doc/using/ios.rst b/Doc/using/ios.rst
+index 91cfed16f0e..5e4033fb6ce 100644
+--- a/Doc/using/ios.rst
++++ b/Doc/using/ios.rst
+@@ -170,7 +170,7 @@
+ To add Python to an iOS Xcode project:
+ 
+ 1. Build or obtain a Python ``XCFramework``. See the instructions in
+-   :source:`iOS/README.rst` (in the CPython source distribution) for details on
++   :source:`Apple/iOS/README.md` (in the CPython source distribution) for details on
+    how to build a Python ``XCFramework``. At a minimum, you will need a build
+    that supports ``arm64-apple-ios``, plus one of either
+    ``arm64-apple-ios-simulator`` or ``x86_64-apple-ios-simulator``.
+@@ -180,22 +180,19 @@
+    of your project; however, you can use any other location that you want by
+    adjusting paths as needed.
+ 
+-3. Drag the ``iOS/Resources/dylib-Info-template.plist`` file into your project,
+-   and ensure it is associated with the app target.
+-
+-4. Add your application code as a folder in your Xcode project. In the
++3. Add your application code as a folder in your Xcode project. In the
+    following instructions, we'll assume that your user code is in a folder
+    named ``app`` in the root of your project; you can use any other location by
+    adjusting paths as needed. Ensure that this folder is associated with your
+    app target.
+ 
+-5. Select the app target by selecting the root node of your Xcode project, then
++4. Select the app target by selecting the root node of your Xcode project, then
+    the target name in the sidebar that appears.
+ 
+-6. In the "General" settings, under "Frameworks, Libraries and Embedded
++5. In the "General" settings, under "Frameworks, Libraries and Embedded
+    Content", add ``Python.xcframework``, with "Embed & Sign" selected.
+ 
+-7. In the "Build Settings" tab, modify the following:
++6. In the "Build Settings" tab, modify the following:
+ 
+    - Build Options
+ 
+@@ -211,86 +208,24 @@
+ 
+      * Quoted Include In Framework Header: No
+ 
+-8. Add a build step that copies the Python standard library into your app. In
+-   the "Build Phases" tab, add a new "Run Script" build step *before* the
+-   "Embed Frameworks" step, but *after* the "Copy Bundle Resources" step. Name
+-   the step "Install Target Specific Python Standard Library", disable the
+-   "Based on dependency analysis" checkbox, and set the script content to:
++7. Add a build step that processes the Python standard library, and your own
++   Python binary dependencies. In the "Build Phases" tab, add a new "Run
++   Script" build step *before* the "Embed Frameworks" step, but *after* the
++   "Copy Bundle Resources" step. Name the step "Process Python libraries",
++   disable the "Based on dependency analysis" checkbox, and set the script
++   content to:
+ 
+    .. code-block:: bash
+ 
+-       set -e
+-
+-       mkdir -p "$CODESIGNING_FOLDER_PATH/python/lib"
+-       if [ "$EFFECTIVE_PLATFORM_NAME" = "-iphonesimulator" ]; then
+-           echo "Installing Python modules for iOS Simulator"
+-           rsync -au --delete "$PROJECT_DIR/Python.xcframework/ios-arm64_x86_64-simulator/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
+-       else
+-           echo "Installing Python modules for iOS Device"
+-           rsync -au --delete "$PROJECT_DIR/Python.xcframework/ios-arm64/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
+-       fi
++      set -e
++      source $PROJECT_DIR/Python.xcframework/build/build_utils.sh
++      install_python Python.xcframework app
+ 
+-   Note that the name of the simulator "slice" in the XCframework may be
+-   different, depending the CPU architectures your ``XCFramework`` supports.
++   If you have placed your XCframework somewhere other than the root of your
++   project, modify the path to the first argument.
+ 
+-9. Add a second build step that processes the binary extension modules in the
+-   standard library into "Framework" format. Add a "Run Script" build step
+-   *directly after* the one you added in step 8, named "Prepare Python Binary
+-   Modules". It should also have "Based on dependency analysis" unchecked, with
+-   the following script content:
+-
+-   .. code-block:: bash
+-
+-       set -e
+-
+-       install_dylib () {
+-           INSTALL_BASE=$1
+-           FULL_EXT=$2
+-
+-           # The name of the extension file
+-           EXT=$(basename "$FULL_EXT")
+-           # The location of the extension file, relative to the bundle
+-           RELATIVE_EXT=${FULL_EXT#$CODESIGNING_FOLDER_PATH/}
+-           # The path to the extension file, relative to the install base
+-           PYTHON_EXT=${RELATIVE_EXT/$INSTALL_BASE/}
+-           # The full dotted name of the extension module, constructed from the file path.
+-           FULL_MODULE_NAME=$(echo $PYTHON_EXT | cut -d "." -f 1 | tr "/" ".");
+-           # A bundle identifier; not actually used, but required by Xcode framework packaging
+-           FRAMEWORK_BUNDLE_ID=$(echo $PRODUCT_BUNDLE_IDENTIFIER.$FULL_MODULE_NAME | tr "_" "-")
+-           # The name of the framework folder.
+-           FRAMEWORK_FOLDER="Frameworks/$FULL_MODULE_NAME.framework"
+-
+-           # If the framework folder doesn't exist, create it.
+-           if [ ! -d "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER" ]; then
+-               echo "Creating framework for $RELATIVE_EXT"
+-               mkdir -p "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER"
+-               cp "$CODESIGNING_FOLDER_PATH/dylib-Info-template.plist" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
+-               plutil -replace CFBundleExecutable -string "$FULL_MODULE_NAME" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
+-               plutil -replace CFBundleIdentifier -string "$FRAMEWORK_BUNDLE_ID" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
+-           fi
+-
+-           echo "Installing binary for $FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
+-           mv "$FULL_EXT" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
+-           # Create a placeholder .fwork file where the .so was
+-           echo "$FRAMEWORK_FOLDER/$FULL_MODULE_NAME" > ${FULL_EXT%.so}.fwork
+-           # Create a back reference to the .so file location in the framework
+-           echo "${RELATIVE_EXT%.so}.fwork" > "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME.origin"
+-        }
+-
+-        PYTHON_VER=$(ls -1 "$CODESIGNING_FOLDER_PATH/python/lib")
+-        echo "Install Python $PYTHON_VER standard library extension modules..."
+-        find "$CODESIGNING_FOLDER_PATH/python/lib/$PYTHON_VER/lib-dynload" -name "*.so" | while read FULL_EXT; do
+-           install_dylib python/lib/$PYTHON_VER/lib-dynload/ "$FULL_EXT"
+-        done
+-
+-        # Clean up dylib template
+-        rm -f "$CODESIGNING_FOLDER_PATH/dylib-Info-template.plist"
+-
+-        echo "Signing frameworks as $EXPANDED_CODE_SIGN_IDENTITY_NAME ($EXPANDED_CODE_SIGN_IDENTITY)..."
+-        find "$CODESIGNING_FOLDER_PATH/Frameworks" -name "*.framework" -exec /usr/bin/codesign --force --sign "$EXPANDED_CODE_SIGN_IDENTITY" ${OTHER_CODE_SIGN_FLAGS:-} -o runtime --timestamp=none --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der "{}" \;
+-
+-10. Add Objective C code to initialize and use a Python interpreter in embedded
+-    mode. You should ensure that:
++8. Add Objective C code to initialize and use a Python interpreter in embedded
++   mode. You should ensure that:
+ 
+    * UTF-8 mode (:c:member:`PyPreConfig.utf8_mode`) is *enabled*;
+    * Buffered stdio (:c:member:`PyConfig.buffered_stdio`) is *disabled*;
+@@ -309,22 +244,19 @@
+    Your app's bundle location can be determined using ``[[NSBundle mainBundle]
+    resourcePath]``.
+ 
+-Steps 8, 9 and 10 of these instructions assume that you have a single folder of
++Steps 7 and 8 of these instructions assume that you have a single folder of
+ pure Python application code, named ``app``. If you have third-party binary
+ modules in your app, some additional steps will be required:
+ 
+ * You need to ensure that any folders containing third-party binaries are
+-  either associated with the app target, or copied in as part of step 8. Step 8
+-  should also purge any binaries that are not appropriate for the platform a
+-  specific build is targeting (i.e., delete any device binaries if you're
+-  building an app targeting the simulator).
+-
+-* Any folders that contain third-party binaries must be processed into
+-  framework form by step 9. The invocation of ``install_dylib`` that processes
+-  the ``lib-dynload`` folder can be copied and adapted for this purpose.
++  either associated with the app target, or are explicitly copied as part of
++  step 7. Step 7 should also purge any binaries that are not appropriate for
++  the platform a specific build is targeting (i.e., delete any device binaries
++  if you're building an app targeting the simulator).
+ 
+-* If you're using a separate folder for third-party packages, ensure that folder
+-  is included as part of the :envvar:`PYTHONPATH` configuration in step 10.
++* If you're using a separate folder for third-party packages, ensure that
++  folder is added to the end of the call to ``install_python`` in step 7, and
++  as part of the :envvar:`PYTHONPATH` configuration in step 8.
+ 
+ * If any of the folders that contain third-party packages will contain ``.pth``
+   files, you should add that folder as a *site directory* (using
+@@ -334,25 +266,30 @@
+ Testing a Python package
+ ------------------------
+ 
+-The CPython source tree contains :source:`a testbed project <iOS/testbed>` that
++The CPython source tree contains :source:`a testbed project <Apple/iOS/testbed>` that
+ is used to run the CPython test suite on the iOS simulator. This testbed can also
+ be used as a testbed project for running your Python library's test suite on iOS.
+ 
+-After building or obtaining an iOS XCFramework (See :source:`iOS/README.rst`
+-for details), create a clone of the Python iOS testbed project by running:
++After building or obtaining an iOS XCFramework (see :source:`Apple/iOS/README.md`
++for details), create a clone of the Python iOS testbed project. If you used the
++``Apple`` build script to build the XCframework, you can run:
++
++.. code-block:: bash
++
++    $ python cross-build/iOS/testbed clone --app <path/to/module1> --app <path/to/module2> app-testbed
++
++Or, if you've sourced your own XCframework, by running:
+ 
+ .. code-block:: bash
+ 
+-    $ python iOS/testbed clone --framework <path/to/Python.xcframework> --app <path/to/module1> --app <path/to/module2> app-testbed
++    $ python Apple/testbed clone --platform iOS --framework <path/to/Python.xcframework> --app <path/to/module1> --app <path/to/module2> app-testbed
+ 
+-You will need to modify the ``iOS/testbed`` reference to point to that
+-directory in the CPython source tree; any folders specified with the ``--app``
+-flag will be copied into the cloned testbed project. The resulting testbed will
+-be created in the ``app-testbed`` folder. In this example, the ``module1`` and
+-``module2`` would be importable modules at runtime. If your project has
+-additional dependencies, they can be installed into the
+-``app-testbed/iOSTestbed/app_packages`` folder (using ``pip install --target
+-app-testbed/iOSTestbed/app_packages`` or similar).
++Any folders specified with the ``--app`` flag will be copied into the cloned
++testbed project. The resulting testbed will be created in the ``app-testbed``
++folder. In this example, the ``module1`` and ``module2`` would be importable
++modules at runtime. If your project has additional dependencies, they can be
++installed into the ``app-testbed/Testbed/app_packages`` folder (using ``pip
++install --target app-testbed/Testbed/app_packages`` or similar).
+ 
+ You can then use the ``app-testbed`` folder to run the test suite for your app,
+ For example, if ``module1.tests`` was the entry point to your test suite, you
+@@ -381,7 +318,7 @@
+ arguments.
+ 
+ The test plan also disables parallel testing, and specifies the use of the
+-``iOSTestbed.lldbinit`` file for providing configuration of the debugger. The
++``Testbed.lldbinit`` file for providing configuration of the debugger. The
+ default debugger configuration disables automatic breakpoints on the
+ ``SIGINT``, ``SIGUSR1``, ``SIGUSR2``, and ``SIGXFSZ`` signals.
+ 
+@@ -391,7 +328,12 @@
+ The only mechanism for distributing apps to third-party iOS devices is to
+ submit the app to the iOS App Store; apps submitted for distribution must pass
+ Apple's app review process. This process includes a set of automated validation
+-rules that inspect the submitted application bundle for problematic code.
++rules that inspect the submitted application bundle for problematic code. There
++are some steps that must be taken to ensure that your app will be able to pass
++these validation steps.
++
++Incompatible code in the standard library
++-----------------------------------------
+ 
+ The Python standard library contains some code that is known to violate these
+ automated rules. While these violations appear to be false positives, Apple's
+@@ -402,3 +344,18 @@
+ :source:`a patch file <Mac/Resources/app-store-compliance.patch>` that will remove
+ all code that is known to cause issues with the App Store review process. This
+ patch is applied automatically when building for iOS.
++
++Privacy manifests
++-----------------
++
++In April 2025, Apple introduced a requirement for `certain third-party
++libraries to provide a Privacy Manifest
++<https://developer.apple.com/support/third-party-SDK-requirements>`__.
++As a result, if you have a binary module that uses one of the affected
++libraries, you must provide an ``.xcprivacy`` file for that library.
++OpenSSL is one library affected by this requirement, but there are others.
++
++If you produce a binary module named ``mymodule.so``, and use you the Xcode
++build script described in step 7 above, you can place a ``mymodule.xcprivacy``
++file next to ``mymodule.so``, and the privacy manifest will be installed into
++the required location when the binary module is converted into a framework.
+diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
+index 823a3692fd1..69550af2087 100644
+--- a/Lib/ctypes/__init__.py
++++ b/Lib/ctypes/__init__.py
+@@ -419,9 +419,9 @@
+         if name:
+             name = _os.fspath(name)
+ 
+-            # If the filename that has been provided is an iOS/tvOS/watchOS
+-            # .fwork file, dereference the location to the true origin of the
+-            # binary.
++            # If the filename that has been provided is an iOS, tvOS, visionOS
++            # or watchOS .fwork file, dereference the location to the true
++            # origin of the binary.
+             if name.endswith(".fwork"):
+                 with open(name) as f:
+                     name = _os.path.join(
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 378f12167c6..591c69adfb7 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -126,7 +126,7 @@
+                         if (name := _get_module_filename(h)) is not None]
+         return libraries
+ 
+-elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
++elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "visionos", "watchos"}:
+     from ctypes.macholib.dyld import dyld_find as _dyld_find
+     def find_library(name):
+         possible = ['lib%s.dylib' % name,
+@@ -444,7 +444,7 @@
+ # https://man.openbsd.org/dl_iterate_phdr
+ # https://docs.oracle.com/cd/E88353_01/html/E37843/dl-iterate-phdr-3c.html
+ if (os.name == "posix" and
+-    sys.platform not in {"darwin", "ios", "tvos", "watchos"}):
++    sys.platform not in {"darwin", "ios", "tvos", "watchos", "visionos"}):
+     import ctypes
+     if hasattr((_libc := ctypes.CDLL(None)), "dl_iterate_phdr"):
+ 
+diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
+index 8bcd741c446..db11cbe0945 100644
+--- a/Lib/importlib/_bootstrap_external.py
++++ b/Lib/importlib/_bootstrap_external.py
+@@ -52,7 +52,7 @@
+ 
+ # Bootstrap-related code ######################################################
+ _CASE_INSENSITIVE_PLATFORMS_STR_KEY = 'win',
+-_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'watchos'
++_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'visionos', 'watchos'
+ _CASE_INSENSITIVE_PLATFORMS =  (_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY
+                                 + _CASE_INSENSITIVE_PLATFORMS_STR_KEY)
+ 
+@@ -1535,7 +1535,7 @@
+     """
+     extension_loaders = []
+     if hasattr(_imp, 'create_dynamic'):
+-        if sys.platform in {"ios", "tvos", "watchos"}:
++        if sys.platform in {"ios", "tvos", "visionos", "watchos"}:
+             extension_loaders = [(AppleFrameworkLoader, [
+                 suffix.replace(".so", ".fwork")
+                 for suffix in _imp.extension_suffixes()
+diff --git a/Lib/platform.py b/Lib/platform.py
+index 86141f072d2..5c77e30d8b5 100644
+--- a/Lib/platform.py
++++ b/Lib/platform.py
+@@ -534,6 +534,78 @@
+     return IOSVersionInfo(system, release, model, is_simulator)
+ 
+ 
++# A namedtuple for tvOS version information.
++TVOSVersionInfo = collections.namedtuple(
++    "TVOSVersionInfo",
++    ["system", "release", "model", "is_simulator"]
++)
++
++
++def tvos_ver(system="", release="", model="", is_simulator=False):
++    """Get tvOS version information, and return it as a namedtuple:
++        (system, release, model, is_simulator).
++
++    If values can't be determined, they are set to values provided as
++    parameters.
++    """
++    if sys.platform == "tvos":
++        # TODO: Can the iOS implementation be used here?
++        import _ios_support
++        result = _ios_support.get_platform_ios()
++        if result is not None:
++            return TVOSVersionInfo(*result)
++
++    return TVOSVersionInfo(system, release, model, is_simulator)
++
++
++# A namedtuple for watchOS version information.
++WatchOSVersionInfo = collections.namedtuple(
++    "WatchOSVersionInfo",
++    ["system", "release", "model", "is_simulator"]
++)
++
++
++def watchos_ver(system="", release="", model="", is_simulator=False):
++    """Get watchOS version information, and return it as a namedtuple:
++        (system, release, model, is_simulator).
++
++    If values can't be determined, they are set to values provided as
++    parameters.
++    """
++    if sys.platform == "watchos":
++        # TODO: Can the iOS implementation be used here?
++        import _ios_support
++        result = _ios_support.get_platform_ios()
++        if result is not None:
++            return WatchOSVersionInfo(*result)
++
++    return WatchOSVersionInfo(system, release, model, is_simulator)
++
++
++# A namedtuple for visionOS version information.
++VisionOSVersionInfo = collections.namedtuple(
++    "VisionOSVersionInfo",
++    ["system", "release", "model", "is_simulator"]
++)
++
++
++def visionos_ver(system="", release="", model="", is_simulator=False):
++    """Get visionOS version information, and return it as a namedtuple:
++        (system, release, model, is_simulator).
++
++    If values can't be determined, they are set to values provided as
++    parameters.
++    """
++    if sys.platform == "visionos":
++        # TODO: Can the iOS implementation be used here?
++        import _ios_support
++        result = _ios_support.get_platform_ios()
++        if result is not None:
++            return VisionOSVersionInfo(*result)
++
++    return VisionOSVersionInfo(system, release, model, is_simulator)
++
++
+ def _java_getprop(name, default):
+     """This private helper is deprecated in 3.13 and will be removed in 3.15"""
+     from java.lang import System
+@@ -733,7 +805,7 @@
+         default in case the command should fail.
+ 
+     """
+-    if sys.platform in {'dos', 'win32', 'win16', 'ios', 'tvos', 'watchos'}:
++    if sys.platform in {'dos', 'win32', 'win16', 'ios', 'tvos', 'visionos', 'watchos'}:
+         # XXX Others too ?
+         return default
+ 
+@@ -897,14 +969,30 @@
+             csid, cpu_number = vms_lib.getsyi('SYI$_CPU', 0)
+             return 'Alpha' if cpu_number >= 128 else 'VAX'
+ 
+-    # On the iOS simulator, os.uname returns the architecture as uname.machine.
+-    # On device it returns the model name for some reason; but there's only one
+-    # CPU architecture for iOS devices, so we know the right answer.
++    # On the iOS/tvOS/visionOS/watchOS simulator, os.uname returns the
++    # architecture as uname.machine. On device it returns the model name for
++    # some reason; but there's only one CPU architecture for devices, so we know
++    # the right answer.
+     def get_ios():
+         if sys.implementation._multiarch.endswith("simulator"):
+             return os.uname().machine
+         return 'arm64'
+ 
++    def get_tvos():
++        if sys.implementation._multiarch.endswith("simulator"):
++            return os.uname().machine
++        return 'arm64'
++
++    def get_visionos():
++        if sys.implementation._multiarch.endswith("simulator"):
++            return os.uname().machine
++        return 'arm64'
++
++    def get_watchos():
++        if sys.implementation._multiarch.endswith("simulator"):
++            return os.uname().machine
++        return 'arm64_32'
++
+     def from_subprocess():
+         """
+         Fall back to `uname -p`
+@@ -1064,9 +1152,15 @@
+         system = 'Android'
+         release = android_ver().release
+ 
+-    # Normalize responses on iOS
++    # Normalize responses on Apple mobile platforms
+     if sys.platform == 'ios':
+         system, release, _, _ = ios_ver()
++    if sys.platform == 'tvos':
++        system, release, _, _ = tvos_ver()
++    if sys.platform == 'visionos':
++        system, release, _, _ = visionos_ver()
++    if sys.platform == 'watchos':
++        system, release, _, _ = watchos_ver()
+ 
+     vals = system, node, release, version, machine
+     # Replace 'unknown' values with the more portable ''
+@@ -1356,6 +1450,12 @@
+         # macOS and iOS both report as a "Darwin" kernel
+         if sys.platform == "ios":
+             system, release, _, _ = ios_ver()
++        elif sys.platform == "tvos":
++            system, release, _, _ = tvos_ver()
++        elif sys.platform == "visionos":
++            system, release, _, _ = visionos_ver()
++        elif sys.platform == "watchos":
++            system, release, _, _ = watchos_ver()
+         else:
+             macos_release = mac_ver()[0]
+             if macos_release:
+diff --git a/Lib/site.py b/Lib/site.py
+index f9327197159..74899abecb0 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -298,8 +298,8 @@
+     if env_base:
+         return env_base
+ 
+-    # Emscripten, iOS, tvOS, VxWorks, WASI, and watchOS have no home directories
+-    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "wasi", "watchos"}:
++    # Emscripten, iOS, tvOS, visionOS, VxWorks, WASI, and watchOS have no home directories
++    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "visionos", "wasi", "watchos"}:
+         return None
+ 
+     def joinuser(*args):
+diff --git a/Lib/subprocess.py b/Lib/subprocess.py
+index 54c2eb515b6..e02063aefea 100644
+--- a/Lib/subprocess.py
++++ b/Lib/subprocess.py
+@@ -75,7 +75,7 @@
+     _mswindows = True
+ 
+ # some platforms do not support subprocesses
+-_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos"}
++_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "visionos", "watchos"}
+ 
+ if _mswindows:
+     import _winapi
+diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
+index f93b98dd681..07ec7853f85 100644
+--- a/Lib/sysconfig/__init__.py
++++ b/Lib/sysconfig/__init__.py
+@@ -23,6 +23,9 @@
+ _ALWAYS_STR = {
+     'IPHONEOS_DEPLOYMENT_TARGET',
+     'MACOSX_DEPLOYMENT_TARGET',
++    'TVOS_DEPLOYMENT_TARGET',
++    'WATCHOS_DEPLOYMENT_TARGET',
++    'XROS_DEPLOYMENT_TARGET',
+ }
+ 
+ _INSTALL_SCHEMES = {
+@@ -119,7 +122,7 @@
+     # Emscripten, iOS, tvOS, VxWorks, WASI, and watchOS have no home directories.
+     # Use _PYTHON_HOST_PLATFORM to get the correct platform when cross-compiling.
+     system_name = os.environ.get('_PYTHON_HOST_PLATFORM', sys.platform).split('-')[0]
+-    if system_name in {"emscripten", "ios", "tvos", "vxworks", "wasi", "watchos"}:
++    if system_name in {"emscripten", "ios", "tvos", "visionos", "vxworks", "wasi", "watchos"}:
+         return None
+ 
+     def joinuser(*args):
+@@ -730,6 +733,18 @@
+             release = get_config_vars().get("IPHONEOS_DEPLOYMENT_TARGET", "13.0")
+             osname = sys.platform
+             machine = sys.implementation._multiarch
++        elif sys.platform == "tvos":
++            release = get_config_vars().get("TVOS_DEPLOYMENT_TARGET", "12.0")
++            osname = sys.platform
++            machine = sys.implementation._multiarch
++        elif sys.platform == "watchos":
++            release = get_config_vars().get("WATCHOS_DEPLOYMENT_TARGET", "4.0")
++            osname = sys.platform
++            machine = sys.implementation._multiarch
++        elif sys.platform == "visionos":
++            release = get_config_vars().get("XROS_DEPLOYMENT_TARGET", "2.0")
++            osname = sys.platform
++            machine = sys.implementation._multiarch
+         else:
+             import _osx_support
+             osname, release, machine = _osx_support.get_platform_osx(
+diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
+index 1c1cbd03d02..1378985de4a 100644
+--- a/Lib/test/datetimetester.py
++++ b/Lib/test/datetimetester.py
+@@ -7159,9 +7159,9 @@
+                     self.assertEqual(dt_orig, dt_rt)
+ 
+     def test_type_check_in_subinterp(self):
+-        # iOS requires the use of the custom framework loader,
++        # Apple mobile platforms require the use of the custom framework loader,
+         # not the ExtensionFileLoader.
+-        if sys.platform == "ios":
++        if support.is_apple_mobile:
+             extension_loader = "AppleFrameworkLoader"
+         else:
+             extension_loader = "ExtensionFileLoader"
+diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
+index a719e49ef37..c0cacd2a8d5 100644
+--- a/Lib/test/support/__init__.py
++++ b/Lib/test/support/__init__.py
+@@ -563,7 +563,7 @@
+         sys.platform == "android", f"Android blocks {name} with SELinux"
+     )
+ 
+-if sys.platform not in {"win32", "vxworks", "ios", "tvos", "watchos"}:
++if sys.platform not in {"win32", "vxworks", "ios", "tvos", "visionos", "watchos"}:
+     unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
+ else:
+     unix_shell = None
+@@ -582,7 +582,7 @@
+ def skip_wasi_stack_overflow():
+     return unittest.skipIf(is_wasi, "Exhausts stack on WASI")
+ 
+-is_apple_mobile = sys.platform in {"ios", "tvos", "watchos"}
++is_apple_mobile = sys.platform in {"ios", "tvos", "visionos", "watchos"}
+ is_apple = is_apple_mobile or sys.platform == "darwin"
+ 
+ has_fork_support = hasattr(os, "fork") and not (
+diff --git a/Lib/test/test__interpreters.py b/Lib/test/test__interpreters.py
+index a32d5d81d2b..f9421619e98 100644
+--- a/Lib/test/test__interpreters.py
++++ b/Lib/test/test__interpreters.py
+@@ -612,6 +612,7 @@
+                     f'assert(obj == {obj!r})',
+                 )
+ 
++    @support.requires_subprocess()
+     def test_os_exec(self):
+         expected = 'spam spam spam spam spam'
+         subinterp = _interpreters.create()
+diff --git a/Lib/test/test_ctypes/test_dllist.py b/Lib/test/test_ctypes/test_dllist.py
+index 15603dc3d77..bff6c0fb95f 100644
+--- a/Lib/test/test_ctypes/test_dllist.py
++++ b/Lib/test/test_ctypes/test_dllist.py
+@@ -7,7 +7,7 @@
+ 
+ 
+ WINDOWS = os.name == "nt"
+-APPLE = sys.platform in {"darwin", "ios", "tvos", "watchos"}
++APPLE = sys.platform in {"darwin", "ios", "tvos", "watchos", "visionos"}
+ 
+ if WINDOWS:
+     KNOWN_LIBRARIES = ["KERNEL32.DLL"]
+diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
+index 6224c989e65..c5ccf225662 100644
+--- a/Lib/test/test_platform.py
++++ b/Lib/test/test_platform.py
+@@ -271,13 +271,21 @@
+             if sys.platform == "android":
+                 self.assertEqual(res.system, "Android")
+                 self.assertEqual(res.release, platform.android_ver().release)
+-            elif sys.platform == "ios":
++            elif support.is_apple_mobile:
+                 # Platform module needs ctypes for full operation. If ctypes
+                 # isn't available, there's no ObjC module, and dummy values are
+                 # returned.
+                 if _ctypes:
+-                    self.assertIn(res.system, {"iOS", "iPadOS"})
+-                    self.assertEqual(res.release, platform.ios_ver().release)
++                    if sys.platform == "ios":
++                        # iPads also identify as iOS
++                        self.assertIn(res.system, {"iOS", "iPadOS"})
++                    else:
++                        # All other platforms - sys.platform is the lower case
++                        # form of system (e.g., visionOS->visionos)
++                        self.assertEqual(res.system.lower(), sys.platform)
++                    # Use the platform-specific version method
++                    platform_ver = getattr(platform, f"{sys.platform}_ver")
++                    self.assertEqual(res.release, platform_ver().release)
+                 else:
+                     self.assertEqual(res.system, "")
+                     self.assertEqual(res.release, "")
+diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
+index 4c3ea1cd8df..04a210e5c86 100644
+--- a/Lib/test/test_webbrowser.py
++++ b/Lib/test/test_webbrowser.py
+@@ -236,7 +236,8 @@
+                    arguments=[f'openURL({URL},new-tab)'])
+ 
+ 
+-@unittest.skipUnless(sys.platform == "ios", "Test only applicable to iOS")
++@unittest.skipUnless(sys.platform in {"ios", "visionOS"},
++                     "Test only applicable to iOS and visionOS")
+ class IOSBrowserTest(unittest.TestCase):
+     def _obj_ref(self, *args):
+         # Construct a string representation of the arguments that can be used
+diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
+index f2e2394089d..2efbbfb0014 100644
+--- a/Lib/webbrowser.py
++++ b/Lib/webbrowser.py
+@@ -488,7 +488,8 @@
+         # macOS can use below Unix support (but we prefer using the macOS
+         # specific stuff)
+ 
+-    if sys.platform == "ios":
++    if sys.platform in {"ios", "visionos"}:
++        # iOS and visionOS provide a browser; tvOS and watchOS don't.
+         register("iosbrowser", None, IOSBrowser(), preferred=True)
+ 
+     if sys.platform == "serenityos":
+@@ -653,9 +654,10 @@
+             return not rc
+ 
+ #
+-# Platform support for iOS
++# Platform support for Apple Mobile platforms that provide a browser
++# (i.e., iOS and visionOS)
+ #
+-if sys.platform == "ios":
++if sys.platform in {"ios", "visionos"}:
+     from _ios_support import objc
+     if objc:
+         # If objc exists, we know ctypes is also importable.
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 764eef5be3e..19a332ffdcb 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -209,6 +209,12 @@
+ # the build, and is only listed here so it will be included in sysconfigdata.
+ IPHONEOS_DEPLOYMENT_TARGET=@IPHONEOS_DEPLOYMENT_TARGET@
+ 
++# visionOS Deployment target is *actually* used during the build, by the
++# compiler shims; export.
++XROS_DEPLOYMENT_TARGET=@XROS_DEPLOYMENT_TARGET@
++@EXPORT_XROS_DEPLOYMENT_TARGET@export XROS_DEPLOYMENT_TARGET
++
++
+ # Option to install to strip binaries
+ STRIPFLAG=-s
+ 
+@@ -2315,7 +2321,7 @@
+ 	fi
+ 
+ 	# Clone the testbed project into the XCFOLDER
+-	$(PYTHON_FOR_BUILD) $(srcdir)/iOS/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
++	$(PYTHON_FOR_BUILD) $(srcdir)/Apple/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
+ 
+ 	# Run the testbed project
+ 	$(PYTHON_FOR_BUILD) "$(XCFOLDER)" run --verbose -- test -uall --single-process --rerun -W
+@@ -3219,10 +3225,10 @@
+ 	-find build -type f -a ! -name '*.gc??' -exec rm -f {} ';'
+ 	-rm -f Include/pydtrace_probes.h
+ 	-rm -f profile-gen-stamp
+-	-rm -rf iOS/testbed/Python.xcframework/ios-*/bin
+-	-rm -rf iOS/testbed/Python.xcframework/ios-*/lib
+-	-rm -rf iOS/testbed/Python.xcframework/ios-*/include
+-	-rm -rf iOS/testbed/Python.xcframework/ios-*/Python.framework
++	-rm -rf Apple/iOS/testbed/Python.xcframework/ios-*/bin
++	-rm -rf Apple/iOS/testbed/Python.xcframework/ios-*/lib
++	-rm -rf Apple/iOS/testbed/Python.xcframework/ios-*/include
++	-rm -rf Apple/iOS/testbed/Python.xcframework/ios-*/Python.framework
+ 
+ .PHONY: profile-removal
+ profile-removal:
+@@ -3248,7 +3254,7 @@
+ 		config.cache config.log pyconfig.h Modules/config.c
+ 	-rm -rf build platform
+ 	-rm -rf $(PYTHONFRAMEWORKDIR)
+-	-rm -rf iOS/Frameworks
++	-rm -rf Apple/iOS/Frameworks
+ 	-rm -rf iOSTestbed.*
+ 	-rm -f python-config.py python-config
+ 	-rm -rf cross-build
+diff --git a/Misc/platform_triplet.c b/Misc/platform_triplet.c
+index f5cd73bdea8..6c1863c943b 100644
+--- a/Misc/platform_triplet.c
++++ b/Misc/platform_triplet.c
+@@ -257,6 +257,32 @@
+ #    else
+ PLATFORM_TRIPLET=arm64-iphoneos
+ #    endif
++#  elif defined(TARGET_OS_TV) && TARGET_OS_TV
++#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
++#      if __x86_64__
++PLATFORM_TRIPLET=x86_64-appletvsimulator
++#      else
++PLATFORM_TRIPLET=arm64-appletvsimulator
++#      endif
++#    else
++PLATFORM_TRIPLET=arm64-appletvos
++#    endif
++#  elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH
++#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
++#      if __x86_64__
++PLATFORM_TRIPLET=x86_64-watchsimulator
++#      else
++PLATFORM_TRIPLET=arm64-watchsimulator
++#      endif
++#    else
++PLATFORM_TRIPLET=arm64_32-watchos
++#    endif
++#  elif defined(TARGET_OS_VISION) && TARGET_OS_VISION
++#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
++PLATFORM_TRIPLET=arm64-xrsimulator
++#    else
++PLATFORM_TRIPLET=arm64-xros
++#    endif
+ // Older macOS SDKs do not define TARGET_OS_OSX
+ #  elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX
+ PLATFORM_TRIPLET=darwin
+diff --git a/config.sub b/config.sub
+index 1bb6a05dc11..49febd56a37 100755
+--- a/config.sub
++++ b/config.sub
+@@ -1743,7 +1743,7 @@
+ 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+ 	     | hiux* | abug | nacl* | netware* | windows* \
+-	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
++	     | os9* | macos* | osx* | ios* | tvos* | watchos* | xros* \
+ 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+ 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+ 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+@@ -1867,7 +1867,7 @@
+ 		;;
+ 	*-eabi*- | *-gnueabi*-)
+ 		;;
+-	ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
++	ios*-simulator- | tvos*-simulator- | watchos*-simulator- | xros*-simulator-)
+ 		;;
+ 	none--*)
+ 		# None (no kernel, i.e. freestanding / bare metal),
+diff --git a/configure b/configure
+index 6383271b477..b177687b0bc 100755
+--- a/configure
++++ b/configure
+@@ -982,6 +982,10 @@
+ CFLAGS
+ CC
+ HAS_XCRUN
++EXPORT_XROS_DEPLOYMENT_TARGET
++WATCHOS_DEPLOYMENT_TARGET
++XROS_DEPLOYMENT_TARGET
++TVOS_DEPLOYMENT_TARGET
+ IPHONEOS_DEPLOYMENT_TARGET
+ EXPORT_MACOSX_DEPLOYMENT_TARGET
+ CONFIGURE_MACOSX_DEPLOYMENT_TARGET
+@@ -4116,6 +4120,15 @@
+ 	*-apple-ios*)
+ 		ac_sys_system=iOS
+ 		;;
++	*-apple-tvos*)
++		ac_sys_system=tvOS
++		;;
++	*-apple-xros*)
++		ac_sys_system=visionOS
++		;;
++	*-apple-watchos*)
++		ac_sys_system=watchOS
++		;;
+ 	*-*-darwin*)
+ 		ac_sys_system=Darwin
+ 		;;
+@@ -4197,7 +4210,7 @@
+ # On cross-compile builds, configure will look for a host-specific compiler by
+ # prepending the user-provided host triple to the required binary name.
+ #
+-# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
++# On iOS/tvOS/visionOS/watchOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
+ # which isn't a binary that exists, and isn't very convenient, as it contains the
+ # iOS version. As the default cross-compiler name won't exist, configure falls
+ # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
+@@ -4212,6 +4225,17 @@
+ 		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
+ 		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
+ 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
++
++		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
++		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
++		x86_64-apple-tvos*-simulator)  AR=x86_64-apple-tvos-simulator-ar ;;
++
++		aarch64-apple-xros*-simulator) AR=arm64-apple-xros-simulator-ar ;;
++		aarch64-apple-xros*)           AR=arm64-apple-xros-ar ;;
++
++		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
++		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
++		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
+ 		*)
+ 	esac
+ fi
+@@ -4220,6 +4244,17 @@
+ 		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
+ 		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
+ 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
++
++		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
++		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
++		x86_64-apple-tvos*-simulator)  CC=x86_64-apple-tvos-simulator-clang ;;
++
++		aarch64-apple-xros*-simulator) CC=arm64-apple-xros-simulator-clang ;;
++		aarch64-apple-xros*)           CC=arm64-apple-xros-clang ;;
++
++		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
++		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
++		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
+ 		*)
+ 	esac
+ fi
+@@ -4228,6 +4263,17 @@
+ 		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
+ 		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
+ 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
++
++		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
++		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
++		x86_64-apple-tvos*-simulator)  CPP=x86_64-apple-tvos-simulator-cpp ;;
++
++		aarch64-apple-xros*-simulator) CPP=arm64-apple-xros-simulator-cpp ;;
++		aarch64-apple-xros*)           CPP=arm64-apple-xros-cpp ;;
++
++		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
++		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
++		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
+ 		*)
+ 	esac
+ fi
+@@ -4236,6 +4282,17 @@
+ 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+ 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+ 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
++
++		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
++		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
++		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
++
++		aarch64-apple-xros*-simulator) CXX=arm64-apple-xros-simulator-clang++ ;;
++		aarch64-apple-xros*)           CXX=arm64-apple-xros-clang++ ;;
++
++		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
++		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
++		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
+ 		*)
+ 	esac
+ fi
+@@ -4358,8 +4415,11 @@
+ 	case $enableval in
+ 	yes)
+ 		case $ac_sys_system in
+-			Darwin) enableval=/Library/Frameworks ;;
+-			iOS)    enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
++			Darwin)  enableval=/Library/Frameworks ;;
++			iOS)     enableval=Apple/iOS/Frameworks/\$\(MULTIARCH\) ;;
++			tvOS)    enableval=Apple/tvOS/Frameworks/\$\(MULTIARCH\) ;;
++			visionOS) enableval=Apple/visionOS/Frameworks/\$\(MULTIARCH\) ;;
++			watchOS) enableval=Apple/watchOS/Frameworks/\$\(MULTIARCH\) ;;
+ 			*) as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
+ 		esac
+ 	esac
+@@ -4368,6 +4428,9 @@
+ 	no)
+ 		case $ac_sys_system in
+ 			iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
++			tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
++			visionOS) as_fn_error $? "visionOS builds must use --enable-framework" "$LINENO" 5 ;;
++			watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
+ 			*)
+ 				PYTHONFRAMEWORK=
+ 				PYTHONFRAMEWORKDIR=no-framework
+@@ -4470,9 +4533,54 @@
+ 
+ 				prefix=$PYTHONFRAMEWORKPREFIX
+ 				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
+-				RESSRCDIR=iOS/Resources
++				RESSRCDIR=Apple/iOS/Resources
++
++				ac_config_files="$ac_config_files Apple/iOS/Resources/Info.plist"
++
++				;;
++			tvOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/tvOS/Resources
++
++				ac_config_files="$ac_config_files Apple/tvOS/Resources/Info.plist"
++
++				;;
++			visionOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/visionOS/Resources
++
++				ac_config_files="$ac_config_files Apple/visionOS/Resources/Info.plist"
++
++				;;
++			watchOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/watchOS/Resources
+ 
+-				ac_config_files="$ac_config_files iOS/Resources/Info.plist"
++				ac_config_files="$ac_config_files Apple/watchOS/Resources/Info.plist"
+ 
+ 				;;
+ 			*)
+@@ -4485,6 +4593,9 @@
+   e)
+ 	case $ac_sys_system in
+ 		iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
++		tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
++		visionOS) as_fn_error $? "visionOS builds must use --enable-framework" "$LINENO" 5 ;;
++		watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
+ 		*)
+ 			PYTHONFRAMEWORK=
+ 			PYTHONFRAMEWORKDIR=no-framework
+@@ -4539,8 +4650,8 @@
+     case "$withval" in
+     yes)
+       case $ac_sys_system in
+-        Darwin|iOS)
+-          # iOS is able to share the macOS patch
++        Darwin|iOS|tvOS|visionOS|watchOS)
++          # iOS/tvOS/visionOS/watchOS is able to share the macOS patch
+           APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+           ;;
+         *) as_fn_error $? "no default app store compliance patch available for $ac_sys_system" "$LINENO" 5 ;;
+@@ -4558,8 +4669,8 @@
+ else case e in #(
+   e)
+     case $ac_sys_system in
+-      iOS)
+-        # Always apply the compliance patch on iOS; we can use the macOS patch
++      iOS|tvOS|visionOS|watchOS)
++        # Always apply the compliance patch on iOS/tvOS/visionOS/watchOS; we can use the macOS patch
+         APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: applying default app store compliance patch" >&5
+ printf "%s\n" "applying default app store compliance patch" >&6; }
+@@ -4577,6 +4688,8 @@
+ 
+ 
+ 
++EXPORT_XROS_DEPLOYMENT_TARGET='#'
++
+ 
+ if test "$cross_compiling" = yes; then
+ 	case "$host" in
+@@ -4614,6 +4727,78 @@
+ 				;;
+ 		esac
+ 		;;
++	*-apple-tvos*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# TVOS_DEPLOYMENT_TARGET is the minimum supported tvOS version
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking tvOS deployment target" >&5
++printf %s "checking tvOS deployment target... " >&6; }
++		TVOS_DEPLOYMENT_TARGET=${_host_os:4}
++		TVOS_DEPLOYMENT_TARGET=${TVOS_DEPLOYMENT_TARGET:=12.0}
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TVOS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$TVOS_DEPLOYMENT_TARGET" >&6; }
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${TVOS_DEPLOYMENT_TARGET}-arm64-appletv${_host_device}
++				;;
++			*)
++				_host_ident=${TVOS_DEPLOYMENT_TARGET}-$host_cpu-appletv${_host_device}
++				;;
++		esac
++		;;
++	*-apple-xros*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# XROS_DEPLOYMENT_TARGET is the minimum supported visionOS version
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking visionOS deployment target" >&5
++printf %s "checking visionOS deployment target... " >&6; }
++		XROS_DEPLOYMENT_TARGET=${_host_os:8}
++		XROS_DEPLOYMENT_TARGET=${XROS_DEPLOYMENT_TARGET:=2.0}
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XROS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$XROS_DEPLOYMENT_TARGET" >&6; }
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking exporting flag of visionOS deployment target" >&5
++printf %s "checking exporting flag of visionOS deployment target... " >&6; }
++        	export XROS_DEPLOYMENT_TARGET
++		EXPORT_XROS_DEPLOYMENT_TARGET=''
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXPORT_XROS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$EXPORT_XROS_DEPLOYMENT_TARGET" >&6; }
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-arm64-xr${_host_device}
++				;;
++			*)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-$host_cpu-xr${_host_device}
++				;;
++		esac
++		;;
++	*-apple-watchos*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# WATCHOS_DEPLOYMENT_TARGET is the minimum supported watchOS version
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking watchOS deployment target" >&5
++printf %s "checking watchOS deployment target... " >&6; }
++		WATCHOS_DEPLOYMENT_TARGET=${_host_os:7}
++		WATCHOS_DEPLOYMENT_TARGET=${WATCHOS_DEPLOYMENT_TARGET:=4.0}
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WATCHOS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$WATCHOS_DEPLOYMENT_TARGET" >&6; }
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-arm64-watch${_host_device}
++				;;
++			*)
++				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
++				;;
++		esac
++		;;
+ 	*-*-darwin*)
+ 		case "$host_cpu" in
+ 		arm*)
+@@ -4704,9 +4889,15 @@
+     define_xopen_source=no;;
+   Darwin/[12][0-9].*)
+     define_xopen_source=no;;
+-  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
++  # On iOS/tvOS/visionOS/watchOS, defining _POSIX_C_SOURCE also disables platform specific features.
+   iOS/*)
+     define_xopen_source=no;;
++  tvOS/*)
++    define_xopen_source=no;;
++  visionOS/*)
++    define_xopen_source=no;;
++  watchOS/*)
++    define_xopen_source=no;;
+   # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
+   # defining NI_NUMERICHOST.
+   QNX/6.3.2)
+@@ -4769,7 +4960,14 @@
+ CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
+ EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
+ 
+-# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
++# XROS_DEPLOYMENT_TARGET / WATCHOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++
++
++
++
++
++# XROS_DEPLOYMENT_TARGET should get exported
+ 
+ 
+ # checks for alternative programs
+@@ -4810,6 +5008,16 @@
+     as_fn_append CFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
+     as_fn_append LDFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
+    ;; #(
++  tvOS) :
++
++    as_fn_append CFLAGS " -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"
++    as_fn_append LDFLAGS " -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"
++   ;; #(
++  watchOS) :
++
++    as_fn_append CFLAGS " -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"
++    as_fn_append LDFLAGS " -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"
++   ;; #(
+   *) :
+      ;;
+ esac
+@@ -7179,6 +7387,12 @@
+     MULTIARCH="" ;; #(
+   iOS) :
+     MULTIARCH="" ;; #(
++  tvOS) :
++    MULTIARCH="" ;; #(
++  visionOS) :
++    MULTIARCH="" ;; #(
++  watchOS) :
++    MULTIARCH="" ;; #(
+   FreeBSD*) :
+     MULTIARCH="" ;; #(
+   *) :
+@@ -7199,7 +7413,7 @@
+ printf "%s\n" "$MULTIARCH" >&6; }
+ 
+ case $ac_sys_system in #(
+-  iOS) :
++  iOS|tvOS|visionOS|watchOS) :
+     SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2` ;; #(
+   *) :
+     SOABI_PLATFORM=$PLATFORM_TRIPLET
+@@ -7250,6 +7464,18 @@
+     PY_SUPPORT_TIER=3 ;; #(
+     aarch64-apple-ios*/clang) :
+     PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-tvos*-simulator/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-tvos*/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-xros*-simulator/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-xros*/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-watchos*-simulator/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    arm64_32-apple-watchos*/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
+     aarch64-*-linux-android/clang) :
+     PY_SUPPORT_TIER=3 ;; #(
+     x86_64-*-linux-android/clang) :
+@@ -7688,7 +7914,7 @@
+   case $ac_sys_system in
+     Darwin)
+       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
+-    iOS)
++    iOS|tvOS|visionOS|watchOS)
+       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
+     *)
+       as_fn_error $? "Unknown platform for framework build" "$LINENO" 5;;
+@@ -7754,7 +7980,7 @@
+       BLDLIBRARY='-L. -lpython$(LDVERSION)'
+       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+       ;;
+-    iOS)
++    iOS|tvOS|visionOS|watchOS)
+       LDLIBRARY='libpython$(LDVERSION).dylib'
+       ;;
+     AIX*)
+@@ -13570,7 +13796,7 @@
+ 			BLDSHARED="$LDSHARED"
+ 		fi
+ 		;;
+-	iOS/*)
++	iOS/*|tvOS/*|visionOS/*|watchOS/*)
+ 		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
+ 		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
+ 		BLDSHARED="$LDSHARED"
+@@ -13703,7 +13929,7 @@
+ 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
+ 	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	# -u libsys_s pulls in all symbols in libsys
+-	Darwin/*|iOS/*)
++	Darwin/*|iOS/*|tvOS/*|visionOS/*|watchOS/*)
+ 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+ 
+ 		# Issue #18075: the default maximum stack size (8MBytes) is too
+@@ -13727,7 +13953,7 @@
+ 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ 			fi
+ 			LINKFORSHARED="$LINKFORSHARED"
+-		elif test $ac_sys_system = "iOS"; then
++		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "visionOS" -o "$ac_sys_system" = "watchOS"; then
+ 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
+ 		fi
+ 		;;
+@@ -15504,7 +15730,7 @@
+ 
+             ctypes_malloc_closure=yes
+      ;; #(
+-  iOS) :
++  iOS|tvOS|visionOS|watchOS) :
+ 
+       ctypes_malloc_closure=yes
+      ;; #(
+@@ -19256,12 +19482,6 @@
+ then :
+   printf "%s\n" "#define HAVE_DUP3 1" >>confdefs.h
+ 
+-fi
+-ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
+-if test "x$ac_cv_func_execv" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
+-
+ fi
+ ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
+ if test "x$ac_cv_func_explicit_bzero" = xyes
+@@ -19322,18 +19542,6 @@
+ then :
+   printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h
+ 
+-fi
+-ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
+-if test "x$ac_cv_func_fork" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
+-
+-fi
+-ac_fn_c_check_func "$LINENO" "fork1" "ac_cv_func_fork1"
+-if test "x$ac_cv_func_fork1" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_FORK1 1" >>confdefs.h
+-
+ fi
+ ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
+ if test "x$ac_cv_func_fpathconf" = xyes
+@@ -19766,24 +19974,6 @@
+ then :
+   printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h
+ 
+-fi
+-ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
+-if test "x$ac_cv_func_posix_spawn" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
+-
+-fi
+-ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
+-if test "x$ac_cv_func_posix_spawnp" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
+-
+-fi
+-ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addclosefrom_np" "ac_cv_func_posix_spawn_file_actions_addclosefrom_np"
+-if test "x$ac_cv_func_posix_spawn_file_actions_addclosefrom_np" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP 1" >>confdefs.h
+-
+ fi
+ ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
+ if test "x$ac_cv_func_pread" = xyes
+@@ -20102,12 +20292,6 @@
+ then :
+   printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
+ 
+-fi
+-ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
+-if test "x$ac_cv_func_sigaltstack" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
+-
+ fi
+ ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
+ if test "x$ac_cv_func_sigfillset" = xyes
+@@ -20376,11 +20560,11 @@
+ 
+ fi
+ 
+-# iOS defines some system methods that can be linked (so they are
++# iOS/tvOS/visionOS/watchOS define some system methods that can be linked (so they are
+ # found by configure), but either raise a compilation error (because the
+ # header definition prevents usage - autoconf doesn't use the headers), or
+ # raise an error if used at runtime. Force these symbols off.
+-if test "$ac_sys_system" != "iOS" ; then
++if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "visionOS" -a "$ac_sys_system" != "watchOS" ; then
+   ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
+ if test "x$ac_cv_func_getentropy" = xyes
+ then :
+@@ -20402,6 +20586,53 @@
+ 
+ fi
+ 
++# tvOS/watchOS have some additional methods that can be found, but not used.
++if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
++  ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
++if test "x$ac_cv_func_execv" = xyes
++then :
++  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
++if test "x$ac_cv_func_fork" = xyes
++then :
++  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "fork1" "ac_cv_func_fork1"
++if test "x$ac_cv_func_fork1" = xyes
++then :
++  printf "%s\n" "#define HAVE_FORK1 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
++if test "x$ac_cv_func_posix_spawn" = xyes
++then :
++  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
++if test "x$ac_cv_func_posix_spawnp" = xyes
++then :
++  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addclosefrom_np" "ac_cv_func_posix_spawn_file_actions_addclosefrom_np"
++if test "x$ac_cv_func_posix_spawn_file_actions_addclosefrom_np" = xyes
++then :
++  printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
++if test "x$ac_cv_func_sigaltstack" = xyes
++then :
++  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
++
++fi
++
++fi
++
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
+ printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+ if test ${ac_cv_c_undeclared_builtin_options+y}
+@@ -23873,7 +24104,8 @@
+ 
+ 
+ # check for openpty, login_tty, and forkpty
+-
++# tvOS/watchOS have functions for tty, but can't use them
++if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
+ 
+   for ac_func in openpty
+ do :
+@@ -23987,7 +24219,7 @@
+ fi
+ 
+ done
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
++  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
+ printf %s "checking for library containing login_tty... " >&6; }
+ if test ${ac_cv_search_login_tty+y}
+ then :
+@@ -24170,6 +24402,7 @@
+ fi
+ 
+ done
++fi
+ 
+ # check for long file support functions
+ ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
+@@ -24435,10 +24668,10 @@
+ 
+ done
+ 
+-# On Android and iOS, clock_settime can be linked (so it is found by
++# On Android, iOS, tvOS, visionOS, and watchOS, clock_settime can be linked (so it is found by
+ # configure), but when used in an unprivileged process, it crashes rather than
+ # returning an error. Force the symbol off.
+-if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
++if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "visionOS" -a "$ac_sys_system" != "watchOS"
+ then
+ 
+   for ac_func in clock_settime
+@@ -24755,7 +24988,7 @@
+   e) if test "$cross_compiling" = yes
+ then :
+ 
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS" || test "$ac_sys_system" = "tvOS" || test "$ac_sys_system" = "visionOS" || test "$ac_sys_system" = "watchOS"; then
+   ac_cv_buggy_getaddrinfo="no"
+ elif test "${enable_ipv6+set}" = set; then
+   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
+@@ -26777,8 +27010,8 @@
+   LIBPYTHON="\$(BLDLIBRARY)"
+ fi
+ 
+-# On iOS the shared libraries must be linked with the Python framework
+-if test "$ac_sys_system" = "iOS"; then
++# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
++if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "visionOS" -o $ac_sys_system = "watchOS"; then
+   MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
+ fi
+ 
+@@ -29648,7 +29881,7 @@
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
+ printf "%s\n" "$as_me: checking for device files" >&6;}
+ 
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "visionOS"  -o "$ac_sys_system" = "watchOS" ; then
+   ac_cv_file__dev_ptmx=no
+   ac_cv_file__dev_ptc=no
+ else
+@@ -30155,7 +30388,7 @@
+     with_ensurepip=no ;; #(
+   WASI) :
+     with_ensurepip=no ;; #(
+-  iOS) :
++  iOS|tvOS|visionOS|watchOS) :
+     with_ensurepip=no ;; #(
+   *) :
+     with_ensurepip=upgrade
+@@ -31105,6 +31338,9 @@
+   NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
+   Darwin) _PYTHREAD_NAME_MAXLEN=63;;
+   iOS) _PYTHREAD_NAME_MAXLEN=63;;
++  tvOS) _PYTHREAD_NAME_MAXLEN=63;;
++  visionOS) _PYTHREAD_NAME_MAXLEN=63;;
++  watchOS) _PYTHREAD_NAME_MAXLEN=63;;
+   FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
+   OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
+   *) _PYTHREAD_NAME_MAXLEN=;;
+@@ -31136,7 +31372,7 @@
+  ;; #(
+     Darwin) :
+      ;; #(
+-  iOS) :
++  iOS|tvOS|visionOS|watchOS) :
+ 
+ 
+ 
+@@ -35303,7 +35539,10 @@
+     "Mac/PythonLauncher/Makefile") CONFIG_FILES="$CONFIG_FILES Mac/PythonLauncher/Makefile" ;;
+     "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
+     "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
+-    "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
++    "Apple/iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Apple/iOS/Resources/Info.plist" ;;
++    "Apple/tvOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Apple/tvOS/Resources/Info.plist" ;;
++    "Apple/visionOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Apple/visionOS/Resources/Info.plist" ;;
++    "Apple/watchOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Apple/watchOS/Resources/Info.plist" ;;
+     "Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
+     "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
+     "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
+diff --git a/configure.ac b/configure.ac
+index 42d94776cc7..4cf79576a55 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -330,6 +330,15 @@
+ 	*-apple-ios*)
+ 		ac_sys_system=iOS
+ 		;;
++	*-apple-tvos*)
++		ac_sys_system=tvOS
++		;;
++	*-apple-xros*)
++		ac_sys_system=visionOS
++		;;
++	*-apple-watchos*)
++		ac_sys_system=watchOS
++		;;
+ 	*-*-darwin*)
+ 		ac_sys_system=Darwin
+ 		;;
+@@ -405,7 +414,7 @@
+ # On cross-compile builds, configure will look for a host-specific compiler by
+ # prepending the user-provided host triple to the required binary name.
+ #
+-# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
++# On iOS/tvOS/visionOS/watchOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
+ # which isn't a binary that exists, and isn't very convenient, as it contains the
+ # iOS version. As the default cross-compiler name won't exist, configure falls
+ # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
+@@ -420,6 +429,17 @@
+ 		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
+ 		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
+ 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
++
++		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
++		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
++		x86_64-apple-tvos*-simulator)  AR=x86_64-apple-tvos-simulator-ar ;;
++
++		aarch64-apple-xros*-simulator) AR=arm64-apple-xros-simulator-ar ;;
++		aarch64-apple-xros*)           AR=arm64-apple-xros-ar ;;
++
++		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
++		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
++		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
+ 		*)
+ 	esac
+ fi
+@@ -428,6 +448,17 @@
+ 		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
+ 		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
+ 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
++
++		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
++		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
++		x86_64-apple-tvos*-simulator)  CC=x86_64-apple-tvos-simulator-clang ;;
++
++		aarch64-apple-xros*-simulator) CC=arm64-apple-xros-simulator-clang ;;
++		aarch64-apple-xros*)           CC=arm64-apple-xros-clang ;;
++
++		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
++		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
++		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
+ 		*)
+ 	esac
+ fi
+@@ -436,6 +467,17 @@
+ 		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
+ 		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
+ 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
++
++		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
++		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
++		x86_64-apple-tvos*-simulator)  CPP=x86_64-apple-tvos-simulator-cpp ;;
++
++		aarch64-apple-xros*-simulator) CPP=arm64-apple-xros-simulator-cpp ;;
++		aarch64-apple-xros*)           CPP=arm64-apple-xros-cpp ;;
++
++		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
++		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
++		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
+ 		*)
+ 	esac
+ fi
+@@ -444,6 +486,17 @@
+ 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+ 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+ 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
++
++		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
++		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
++		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
++
++		aarch64-apple-xros*-simulator) CXX=arm64-apple-xros-simulator-clang++ ;;
++		aarch64-apple-xros*)           CXX=arm64-apple-xros-clang++ ;;
++
++		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
++		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
++		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
+ 		*)
+ 	esac
+ fi
+@@ -558,8 +611,11 @@
+ 	case $enableval in
+ 	yes)
+ 		case $ac_sys_system in
+-			Darwin) enableval=/Library/Frameworks ;;
+-			iOS)    enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
++			Darwin)  enableval=/Library/Frameworks ;;
++			iOS)     enableval=Apple/iOS/Frameworks/\$\(MULTIARCH\) ;;
++			tvOS)    enableval=Apple/tvOS/Frameworks/\$\(MULTIARCH\) ;;
++			visionOS) enableval=Apple/visionOS/Frameworks/\$\(MULTIARCH\) ;;
++			watchOS) enableval=Apple/watchOS/Frameworks/\$\(MULTIARCH\) ;;
+ 			*) AC_MSG_ERROR([Unknown platform for framework build])
+ 		esac
+ 	esac
+@@ -568,6 +624,9 @@
+ 	no)
+ 		case $ac_sys_system in
+ 			iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
++			tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
++			visionOS) AC_MSG_ERROR([visionOS builds must use --enable-framework]) ;;
++			watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
+ 			*)
+ 				PYTHONFRAMEWORK=
+ 				PYTHONFRAMEWORKDIR=no-framework
+@@ -666,9 +725,51 @@
+ 
+ 				prefix=$PYTHONFRAMEWORKPREFIX
+ 				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
+-				RESSRCDIR=iOS/Resources
++				RESSRCDIR=Apple/iOS/Resources
+ 
+-				AC_CONFIG_FILES([iOS/Resources/Info.plist])
++				AC_CONFIG_FILES([Apple/iOS/Resources/Info.plist])
++				;;
++			tvOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/tvOS/Resources
++
++				AC_CONFIG_FILES([Apple/tvOS/Resources/Info.plist])
++				;;
++			visionOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/visionOS/Resources
++
++				AC_CONFIG_FILES([Apple/visionOS/Resources/Info.plist])
++				;;
++			watchOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/watchOS/Resources
++
++				AC_CONFIG_FILES([Apple/watchOS/Resources/Info.plist])
+ 				;;
+ 			*)
+ 				AC_MSG_ERROR([Unknown platform for framework build])
+@@ -678,6 +779,9 @@
+ 	],[
+ 	case $ac_sys_system in
+ 		iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
++		tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
++		visionOS) AC_MSG_ERROR([visionOS builds must use --enable-framework]) ;;
++		watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
+ 		*)
+ 			PYTHONFRAMEWORK=
+ 			PYTHONFRAMEWORKDIR=no-framework
+@@ -730,8 +834,8 @@
+     case "$withval" in
+     yes)
+       case $ac_sys_system in
+-        Darwin|iOS)
+-          # iOS is able to share the macOS patch
++        Darwin|iOS|tvOS|visionOS|watchOS)
++          # iOS/tvOS/visionOS/watchOS is able to share the macOS patch
+           APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+           ;;
+         *) AC_MSG_ERROR([no default app store compliance patch available for $ac_sys_system]) ;;
+@@ -745,8 +849,8 @@
+     esac
+   ],[
+     case $ac_sys_system in
+-      iOS)
+-        # Always apply the compliance patch on iOS; we can use the macOS patch
++      iOS|tvOS|visionOS|watchOS)
++        # Always apply the compliance patch on iOS/tvOS/visionOS/watchOS; we can use the macOS patch
+         APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+         AC_MSG_RESULT([applying default app store compliance patch])
+         ;;
+@@ -759,6 +863,8 @@
+ ])
+ AC_SUBST([APP_STORE_COMPLIANCE_PATCH])
+ 
++EXPORT_XROS_DEPLOYMENT_TARGET='#'
++
+ AC_SUBST([_PYTHON_HOST_PLATFORM])
+ if test "$cross_compiling" = yes; then
+ 	case "$host" in
+@@ -794,6 +900,70 @@
+ 				;;
+ 		esac
+ 		;;
++	*-apple-tvos*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# TVOS_DEPLOYMENT_TARGET is the minimum supported tvOS version
++		AC_MSG_CHECKING([tvOS deployment target])
++		TVOS_DEPLOYMENT_TARGET=${_host_os:4}
++		TVOS_DEPLOYMENT_TARGET=${TVOS_DEPLOYMENT_TARGET:=12.0}
++		AC_MSG_RESULT([$TVOS_DEPLOYMENT_TARGET])
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${TVOS_DEPLOYMENT_TARGET}-arm64-appletv${_host_device}
++				;;
++			*)
++				_host_ident=${TVOS_DEPLOYMENT_TARGET}-$host_cpu-appletv${_host_device}
++				;;
++		esac
++		;;
++	*-apple-xros*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# XROS_DEPLOYMENT_TARGET is the minimum supported visionOS version
++		AC_MSG_CHECKING([visionOS deployment target])
++		XROS_DEPLOYMENT_TARGET=${_host_os:8}
++		XROS_DEPLOYMENT_TARGET=${XROS_DEPLOYMENT_TARGET:=2.0}
++		AC_MSG_RESULT([$XROS_DEPLOYMENT_TARGET])
++		AC_MSG_CHECKING([exporting flag of visionOS deployment target])
++        	export XROS_DEPLOYMENT_TARGET
++		EXPORT_XROS_DEPLOYMENT_TARGET=''
++		AC_MSG_RESULT([$EXPORT_XROS_DEPLOYMENT_TARGET])
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-arm64-xr${_host_device}
++				;;
++			*)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-$host_cpu-xr${_host_device}
++				;;
++		esac
++		;;
++	*-apple-watchos*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# WATCHOS_DEPLOYMENT_TARGET is the minimum supported watchOS version
++		AC_MSG_CHECKING([watchOS deployment target])
++		WATCHOS_DEPLOYMENT_TARGET=${_host_os:7}
++		WATCHOS_DEPLOYMENT_TARGET=${WATCHOS_DEPLOYMENT_TARGET:=4.0}
++		AC_MSG_RESULT([$WATCHOS_DEPLOYMENT_TARGET])
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-arm64-watch${_host_device}
++				;;
++			*)
++				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
++				;;
++		esac
++		;;
+ 	*-*-darwin*)
+ 		case "$host_cpu" in
+ 		arm*)
+@@ -883,9 +1053,15 @@
+     define_xopen_source=no;;
+   Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
+     define_xopen_source=no;;
+-  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
++  # On iOS/tvOS/visionOS/watchOS, defining _POSIX_C_SOURCE also disables platform specific features.
+   iOS/*)
+     define_xopen_source=no;;
++  tvOS/*)
++    define_xopen_source=no;;
++  visionOS/*)
++    define_xopen_source=no;;
++  watchOS/*)
++    define_xopen_source=no;;
+   # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
+   # defining NI_NUMERICHOST.
+   QNX/6.3.2)
+@@ -944,8 +1120,15 @@
+ CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
+ EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
+ 
+-# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
++# XROS_DEPLOYMENT_TARGET / WATCHOS_DEPLOYMENT_TARGET enforced by the selected host triple.
+ AC_SUBST([IPHONEOS_DEPLOYMENT_TARGET])
++AC_SUBST([TVOS_DEPLOYMENT_TARGET])
++AC_SUBST([XROS_DEPLOYMENT_TARGET])
++AC_SUBST([WATCHOS_DEPLOYMENT_TARGET])
++
++# XROS_DEPLOYMENT_TARGET should get exported
++AC_SUBST([EXPORT_XROS_DEPLOYMENT_TARGET])
+ 
+ # checks for alternative programs
+ 
+@@ -979,11 +1162,19 @@
+   ],
+ )
+ 
+-dnl Add the compiler flag for the iOS minimum supported OS version.
++dnl Add the compiler flag for the iOS/tvOS/watchOS minimum supported OS
++dnl version. visionOS doesn't use an explicit -mxros-version-min option -
++dnl it encodes the min version into the target triple.
+ AS_CASE([$ac_sys_system],
+   [iOS], [
+     AS_VAR_APPEND([CFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
+     AS_VAR_APPEND([LDFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
++  ],[tvOS], [
++    AS_VAR_APPEND([CFLAGS], [" -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"])
++    AS_VAR_APPEND([LDFLAGS], [" -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"])
++  ],[watchOS], [
++    AS_VAR_APPEND([CFLAGS], [" -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"])
++    AS_VAR_APPEND([LDFLAGS], [" -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"])
+   ],
+ )
+ 
+@@ -1172,6 +1363,9 @@
+ AS_CASE([$ac_sys_system],
+   [Darwin*], [MULTIARCH=""],
+   [iOS], [MULTIARCH=""],
++  [tvOS], [MULTIARCH=""],
++  [visionOS], [MULTIARCH=""],
++  [watchOS], [MULTIARCH=""],
+   [FreeBSD*], [MULTIARCH=""],
+   [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
+ )
+@@ -1193,7 +1387,7 @@
+ dnl use a single "fat" binary at runtime. SOABI_PLATFORM is the component of
+ dnl the PLATFORM_TRIPLET that will be used in binary module extensions.
+ AS_CASE([$ac_sys_system],
+-  [iOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
++  [iOS|tvOS|visionOS|watchOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
+   [SOABI_PLATFORM=$PLATFORM_TRIPLET]
+ )
+ 
+@@ -1220,16 +1414,22 @@
+   [wasm32-unknown-wasip1/clang],         [PY_SUPPORT_TIER=2], dnl WebAssembly System Interface preview1, clang
+   [x86_64-*-linux-gnu/clang],            [PY_SUPPORT_TIER=2], dnl Linux on AMD64, any vendor, glibc, clang
+ 
+-  [aarch64-pc-windows-msvc/msvc],        [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC
+-  [armv7l-*-linux-gnueabihf/gcc],        [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
+-  [powerpc64le-*-linux-gnu/clang],       [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
+-  [s390x-*-linux-gnu/gcc],               [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
+-  [x86_64-*-freebsd*/clang],             [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
+-  [aarch64-apple-ios*-simulator/clang],  [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
+-  [aarch64-apple-ios*/clang],            [PY_SUPPORT_TIER=3], dnl iOS on ARM64
+-  [aarch64-*-linux-android/clang],       [PY_SUPPORT_TIER=3], dnl Android on ARM64
+-  [x86_64-*-linux-android/clang],        [PY_SUPPORT_TIER=3], dnl Android on AMD64
+-  [wasm32-*-emscripten/emcc],            [PY_SUPPORT_TIER=3], dnl Emscripten
++  [aarch64-pc-windows-msvc/msvc],           [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC
++  [armv7l-*-linux-gnueabihf/gcc],           [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
++  [powerpc64le-*-linux-gnu/clang],          [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
++  [s390x-*-linux-gnu/gcc],                  [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
++  [x86_64-*-freebsd*/clang],                [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
++  [aarch64-apple-ios*-simulator/clang],     [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
++  [aarch64-apple-ios*/clang],               [PY_SUPPORT_TIER=3], dnl iOS on ARM64
++  [aarch64-apple-tvos*-simulator/clang],    [PY_SUPPORT_TIER=3], dnl tvOS Simulator on arm64
++  [aarch64-apple-tvos*/clang],              [PY_SUPPORT_TIER=3], dnl tvOS on ARM64
++  [aarch64-apple-xros*-simulator/clang],    [PY_SUPPORT_TIER=3], dnl visionOS Simulator on arm64
++  [aarch64-apple-xros*/clang],              [PY_SUPPORT_TIER=3],    dnl visionOS on ARM64
++  [aarch64-apple-watchos*-simulator/clang], [PY_SUPPORT_TIER=3], dnl watchOS Simulator on arm64
++  [arm64_32-apple-watchos*/clang],          [PY_SUPPORT_TIER=3], dnl watchOS on ARM64
++  [aarch64-*-linux-android/clang],          [PY_SUPPORT_TIER=3], dnl Android on ARM64
++  [x86_64-*-linux-android/clang],           [PY_SUPPORT_TIER=3], dnl Android on AMD64
++  [wasm32-*-emscripten/emcc],               [PY_SUPPORT_TIER=3], dnl Emscripten
+ 
+   [PY_SUPPORT_TIER=0]
+ )
+@@ -1537,7 +1737,7 @@
+   case $ac_sys_system in
+     Darwin)
+       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
+-    iOS)
++    iOS|tvOS|visionOS|watchOS)
+       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
+     *)
+       AC_MSG_ERROR([Unknown platform for framework build]);;
+@@ -1602,7 +1802,7 @@
+       BLDLIBRARY='-L. -lpython$(LDVERSION)'
+       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+       ;;
+-    iOS)
++    iOS|tvOS|visionOS|watchOS)
+       LDLIBRARY='libpython$(LDVERSION).dylib'
+       ;;
+     AIX*)
+@@ -3469,7 +3669,7 @@
+ 			BLDSHARED="$LDSHARED"
+ 		fi
+ 		;;
+-	iOS/*)
++	iOS/*|tvOS/*|visionOS/*|watchOS/*)
+ 		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
+ 		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
+ 		BLDSHARED="$LDSHARED"
+@@ -3593,7 +3793,7 @@
+ 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
+ 	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	# -u libsys_s pulls in all symbols in libsys
+-	Darwin/*|iOS/*)
++	Darwin/*|iOS/*|tvOS/*|visionOS/*|watchOS/*)
+ 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+ 
+ 		# Issue #18075: the default maximum stack size (8MBytes) is too
+@@ -3617,7 +3817,7 @@
+ 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ 			fi
+ 			LINKFORSHARED="$LINKFORSHARED"
+-		elif test $ac_sys_system = "iOS"; then
++		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "visionOS" -o "$ac_sys_system" = "watchOS"; then
+ 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
+ 		fi
+ 		;;
+@@ -4105,7 +4305,7 @@
+       dnl when do we need USING_APPLE_OS_LIBFFI?
+       ctypes_malloc_closure=yes
+     ],
+-    [iOS], [
++    [iOS|tvOS|visionOS|watchOS], [
+       ctypes_malloc_closure=yes
+     ],
+     [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]
+@@ -5214,9 +5414,9 @@
+ # checks for library functions
+ AC_CHECK_FUNCS([ \
+   accept4 alarm bind_textdomain_codeset chmod chown clock closefrom close_range confstr \
+-  copy_file_range ctermid dladdr dup dup3 execv explicit_bzero explicit_memset \
++  copy_file_range ctermid dladdr dup dup3 explicit_bzero explicit_memset \
+   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
+-  fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
++  fpathconf fstatat ftime ftruncate futimens futimes futimesat \
+   gai_strerror getegid geteuid getgid getgrent getgrgid getgrgid_r \
+   getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin getlogin_r \
+   getpeername getpgid getpid getppid getpriority _getpty \
+@@ -5224,8 +5424,7 @@
+   getspnam getuid getwd grantpt if_nameindex initgroups kill killpg lchown linkat \
+   lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
+   mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
+-  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt posix_spawn posix_spawnp \
+-  posix_spawn_file_actions_addclosefrom_np \
++  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt \
+   pread preadv preadv2 process_vm_readv \
+   pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \
+   pthread_kill pthread_get_name_np pthread_getname_np pthread_set_name_np
+@@ -5235,7 +5434,7 @@
+   sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \
+   sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \
+   setitimer setlocale setpgid setpgrp setpriority setregid setresgid \
+-  setresuid setreuid setsid setuid setvbuf shutdown sigaction sigaltstack \
++  setresuid setreuid setsid setuid setvbuf shutdown sigaction \
+   sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
+   sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
+   sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
+@@ -5250,12 +5449,20 @@
+   AC_CHECK_FUNCS([lchmod])
+ fi
+ 
+-# iOS defines some system methods that can be linked (so they are
++# iOS/tvOS/visionOS/watchOS define some system methods that can be linked (so they are
+ # found by configure), but either raise a compilation error (because the
+ # header definition prevents usage - autoconf doesn't use the headers), or
+ # raise an error if used at runtime. Force these symbols off.
+-if test "$ac_sys_system" != "iOS" ; then
+-  AC_CHECK_FUNCS([getentropy getgroups system])
++if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "visionOS" -a "$ac_sys_system" != "watchOS" ; then
++  AC_CHECK_FUNCS([ getentropy getgroups system ])
++fi
++
++# tvOS/watchOS have some additional methods that can be found, but not used.
++if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
++  AC_CHECK_FUNCS([ \
++    execv fork fork1 posix_spawn posix_spawnp posix_spawn_file_actions_addclosefrom_np \
++    sigaltstack \
++  ])
+ fi
+ 
+ AC_CHECK_DECL([dirfd],
+@@ -5550,20 +5757,22 @@
+               [@%:@include <utmp.h>])
+ 
+ # check for openpty, login_tty, and forkpty
+-
+-AC_CHECK_FUNCS([openpty], [],
+-  [AC_CHECK_LIB([util], [openpty],
+-    [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lutil"],
+-    [AC_CHECK_LIB([bsd], [openpty],
+-      [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lbsd"])])])
+-AC_SEARCH_LIBS([login_tty], [util],
+- [AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
+-)
+-AC_CHECK_FUNCS([forkpty], [],
+-  [AC_CHECK_LIB([util], [forkpty],
+-    [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lutil"],
+-    [AC_CHECK_LIB([bsd], [forkpty],
+-      [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])])
++# tvOS/watchOS have functions for tty, but can't use them
++if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
++  AC_CHECK_FUNCS([openpty], [],
++    [AC_CHECK_LIB([util], [openpty],
++      [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lutil"],
++      [AC_CHECK_LIB([bsd], [openpty],
++        [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lbsd"])])])
++  AC_SEARCH_LIBS([login_tty], [util],
++   [AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
++  )
++  AC_CHECK_FUNCS([forkpty], [],
++    [AC_CHECK_LIB([util], [forkpty],
++      [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lutil"],
++      [AC_CHECK_LIB([bsd], [forkpty],
++        [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])])
++fi
+ 
+ # check for long file support functions
+ AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
+@@ -5602,10 +5811,10 @@
+     ])
+ ])
+ 
+-# On Android and iOS, clock_settime can be linked (so it is found by
++# On Android, iOS, tvOS, visionOS, and watchOS, clock_settime can be linked (so it is found by
+ # configure), but when used in an unprivileged process, it crashes rather than
+ # returning an error. Force the symbol off.
+-if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
++if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "visionOS" -a "$ac_sys_system" != "watchOS"
+ then
+   AC_CHECK_FUNCS([clock_settime], [], [
+       AC_CHECK_LIB([rt], [clock_settime], [
+@@ -5763,7 +5972,7 @@
+ [ac_cv_buggy_getaddrinfo=no],
+ [ac_cv_buggy_getaddrinfo=yes],
+ [
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS" || test "$ac_sys_system" = "tvOS" || test "$ac_sys_system" = "visionOS" || test "$ac_sys_system" = "watchOS"; then
+   ac_cv_buggy_getaddrinfo="no"
+ elif test "${enable_ipv6+set}" = set; then
+   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
+@@ -6356,8 +6565,8 @@
+   LIBPYTHON="\$(BLDLIBRARY)"
+ fi
+ 
+-# On iOS the shared libraries must be linked with the Python framework
+-if test "$ac_sys_system" = "iOS"; then
++# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
++if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "visionOS" -o $ac_sys_system = "watchOS"; then
+   MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
+ fi
+ 
+@@ -7016,7 +7225,7 @@
+ dnl NOTE: Inform user how to proceed with files when cross compiling.
+ dnl Some cross-compile builds are predictable; they won't ever
+ dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "visionOS"  -o "$ac_sys_system" = "watchOS" ; then
+   ac_cv_file__dev_ptmx=no
+   ac_cv_file__dev_ptc=no
+ else
+@@ -7316,7 +7525,7 @@
+       AS_CASE([$ac_sys_system],
+         [Emscripten], [with_ensurepip=no],
+         [WASI], [with_ensurepip=no],
+-        [iOS], [with_ensurepip=no],
++        [iOS|tvOS|visionOS|watchOS], [with_ensurepip=no],
+         [with_ensurepip=upgrade]
+       )
+     ])
+@@ -7704,6 +7913,9 @@
+   NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268
+   Darwin) _PYTHREAD_NAME_MAXLEN=63;;
+   iOS) _PYTHREAD_NAME_MAXLEN=63;;
++  tvOS) _PYTHREAD_NAME_MAXLEN=63;;
++  visionOS) _PYTHREAD_NAME_MAXLEN=63;;
++  watchOS) _PYTHREAD_NAME_MAXLEN=63;;
+   FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268
+   OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268
+   *) _PYTHREAD_NAME_MAXLEN=;;
+@@ -7728,7 +7940,7 @@
+   [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
+   dnl The _scproxy module is available on macOS
+   [Darwin], [],
+-  [iOS], [
++  [iOS|tvOS|visionOS|watchOS], [
+     dnl subprocess and multiprocessing are not supported (no fork syscall).
+     dnl curses and tkinter user interface are not available.
+     dnl gdbm and nis aren't available

From dc68cd6380fb97f807bd9fc5f1e6efe021f1dd36 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun, 28 Sep 2025 21:32:26 +0800
Subject: [PATCH 39/40] Update patch to 3.13.7.

---
 .github/workflows/ci.yaml      |   66 +-
 .github/workflows/publish.yaml |    7 +-
 .github/workflows/release.yaml |    4 +-
 Makefile                       |   35 +-
 README.md                      |   29 +-
 USAGE.md                       |   83 +-
 patch/Python/Python.patch      | 9305 ++++++++++++++++++++++++++------
 7 files changed, 7726 insertions(+), 1803 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9e9a824e..bf644ccb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -56,7 +56,7 @@ jobs:
       XZ_VERSION: ${{ steps.extract.outputs.XZ_VERSION }}
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
 
     - name: Extract config variables
       id: extract
@@ -84,18 +84,27 @@ jobs:
         echo "XZ_VERSION=${XZ_VERSION}" | tee -a ${GITHUB_OUTPUT}
 
   build:
-    runs-on: macOS-latest
+    runs-on: macOS-15
     needs: [ config ]
     strategy:
       fail-fast: false
       matrix:
-        platform: ['macOS', 'iOS', 'tvOS', 'watchOS']
+        platform: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS']
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
+
+    - name: Set up Xcode
+      # GitHub recommends explicitly selecting the desired Xcode version:
+      # https://github.com/actions/runner-images/issues/12541#issuecomment-3083850140
+      # This became a necessity as a result of
+      # https://github.com/actions/runner-images/issues/12541 and
+      # https://github.com/actions/runner-images/issues/12751.
+      run: |
+        sudo xcode-select --switch /Applications/Xcode_16.4.app
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
@@ -117,7 +126,7 @@ jobs:
 
   briefcase-testbed:
     name: Briefcase testbed (${{ matrix.platform }})
-    runs-on: macOS-latest
+    runs-on: macOS-15
     needs: [ config, build ]
     strategy:
       fail-fast: false
@@ -127,20 +136,29 @@ jobs:
             - briefcase-run-args:
 
             - platform: iOS
-              briefcase-run-args: ' -d "iPhone SE (3rd generation)"'
+              briefcase-run-args: ' -d "iPhone 16e::iOS 18.5"'
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
+
+    - name: Set up Xcode
+      # GitHub recommends explicitly selecting the desired Xcode version:
+      # https://github.com/actions/runner-images/issues/12541#issuecomment-3083850140
+      # This became a necessity as a result of
+      # https://github.com/actions/runner-images/issues/12541 and
+      # https://github.com/actions/runner-images/issues/12751.
+      run: |
+        sudo xcode-select --switch /Applications/Xcode_16.4.app
 
     - name: Get build artifact
-      uses: actions/download-artifact@v4.3.0
+      uses: actions/download-artifact@v5.0.0
       with:
         pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist
         merge-multiple: true
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
@@ -149,7 +167,7 @@ jobs:
         # It's an edge case, but when a new alpha is released, we need to use it ASAP.
         check-latest: true
 
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
       with:
         repository: beeware/Python-support-testbed
         path: Python-support-testbed
@@ -160,31 +178,35 @@ jobs:
         python -m pip install git+https://github.com/beeware/briefcase.git
 
     - name: Run support testbed check
-      timeout-minutes: 10
+      timeout-minutes: 15
       working-directory: Python-support-testbed
       run: briefcase run ${{ matrix.platform }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\'
 
   cpython-testbed:
     name: CPython testbed (${{ matrix.platform }})
-    runs-on: macOS-latest
+    runs-on: macOS-15
     needs: [ config, build ]
     strategy:
       fail-fast: false
       matrix:
-        platform: ["iOS"]
+        platform: ["iOS", "tvOS", "visionOS"]
+        include:
+          # Needed to disambiguate simulator options.
+          - platform: "visionOS"
+            testbed-args: '--simulator "Apple Vision Pro,arch=arm64,OS=2.5"'
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
 
     - name: Get build artifact
-      uses: actions/download-artifact@v4.3.0
+      uses: actions/download-artifact@v5.0.0
       with:
         pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist
         merge-multiple: true
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
@@ -200,7 +222,7 @@ jobs:
         tar zxvf ../../../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
 
     - name: Run CPython testbed
-      timeout-minutes: 10
+      timeout-minutes: 15
       working-directory: support/${{ needs.config.outputs.PYTHON_VER }}/${{ matrix.platform }}
       run: |
         # Run a representative subset of CPython core tests:
@@ -209,7 +231,7 @@ jobs:
         # - test_os as a test of system library calls
         # - test_bz2 as a simple test of third party libraries
         # - test_ctypes as a test of FFI
-        python -m testbed run -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes
+        python -m testbed run --verbose ${{ matrix.testbed-args }} -- test --single-process --rerun -W test_builtin test_grammar test_os test_bz2 test_ctypes
 
   crossenv-test:
     name: Cross-platform env test (${{ matrix.multiarch }})
@@ -230,17 +252,17 @@ jobs:
             multiarch: arm64-iphoneos
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5
 
     - name: Get build artifact
-      uses: actions/download-artifact@v4.3.0
+      uses: actions/download-artifact@v5.0.0
       with:
         pattern: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.platform }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist
         merge-multiple: true
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 338f86e6..9b45abb2 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -8,10 +8,10 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Set up Python environment
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6.0.0
       with:
         python-version: "3.X"
 
@@ -48,3 +48,6 @@ jobs:
         # watchOS build
         curl -o watchOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.outputs.TAG }}/Python-${{ steps.build-vars.outputs.PYTHON_VER }}-watchOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
         aws s3 cp watchOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.outputs.PYTHON_VER }}/watchOS/Python-${{ steps.build-vars.outputs.PYTHON_VER }}-watchOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
+        # visionOS build
+        curl -o visionOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.outputs.TAG }}/Python-${{ steps.build-vars.outputs.PYTHON_VER }}-visionOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
+        aws s3 cp visionOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.outputs.PYTHON_VER }}/visionOS/Python-${{ steps.build-vars.outputs.PYTHON_VER }}-visionOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6767d2ef..617fbf58 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -40,14 +40,14 @@ jobs:
     needs: [ config, ci ]
     steps:
     - name: Get build artifacts
-      uses: actions/download-artifact@v4.3.0
+      uses: actions/download-artifact@v5.0.0
       with:
         pattern: Python-*
         path: dist
         merge-multiple: true
 
     - name: Create Release
-      uses: ncipollo/release-action@v1.18.0
+      uses: ncipollo/release-action@v1.20.0
       with:
         name: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}
         tag: ${{ needs.ci.outputs.PYTHON_VER }}-${{ needs.config.outputs.BUILD_NUMBER }}
diff --git a/Makefile b/Makefile
index c0b61216..28607145 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@
 # - iOS             - build everything for iOS
 # - tvOS            - build everything for tvOS
 # - watchOS         - build everything for watchOS
+# - visionOS        - build everything for visionOS
 
 # Current directory
 PROJECT_DIR=$(shell pwd)
@@ -18,7 +19,7 @@ BUILD_NUMBER=custom
 # of a release cycle, as official binaries won't be published.
 # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
 # PYTHON_VER is the major/minor version (e.g., 3.10)
-PYTHON_VERSION=3.13.5
+PYTHON_VERSION=3.13.7
 PYTHON_PKG_VERSION=$(PYTHON_VERSION)
 PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
@@ -33,32 +34,37 @@ OPENSSL_VERSION=3.0.16-2
 XZ_VERSION=5.6.4-2
 
 # Supported OS
-OS_LIST=macOS iOS tvOS watchOS
+OS_LIST=macOS iOS tvOS watchOS visionOS
 
 CURL_FLAGS=--disable --fail --location --create-dirs --progress-bar
 
 # macOS targets
 TARGETS-macOS=macosx.x86_64 macosx.arm64
 TRIPLE_OS-macOS=macos
+PLATFORM_NAME-macOS=macOS
 VERSION_MIN-macOS=11.0
 
 # iOS targets
 TARGETS-iOS=iphonesimulator.x86_64 iphonesimulator.arm64 iphoneos.arm64
 TRIPLE_OS-iOS=ios
+PLATFORM_NAME-iOS=iOS
 VERSION_MIN-iOS=13.0
 
 # tvOS targets
 TARGETS-tvOS=appletvsimulator.x86_64 appletvsimulator.arm64 appletvos.arm64
 TRIPLE_OS-tvOS=tvos
+PLATFORM_NAME-tvOS=tvOS
 VERSION_MIN-tvOS=12.0
 
 # watchOS targets
 TARGETS-watchOS=watchsimulator.x86_64 watchsimulator.arm64 watchos.arm64_32
 TRIPLE_OS-watchOS=watchos
+PLATFORM_NAME-watchOS=watchOS
 VERSION_MIN-watchOS=4.0
 
 TARGETS-visionOS=xrsimulator.arm64 xros.arm64
 TRIPLE_OS-visionOS=xros
+PLATFORM_NAME-visionOS=xrOS
 VERSION_MIN-visionOS=2.0
 
 # The architecture of the machine doing the build
@@ -94,7 +100,7 @@ update-patch:
 	# call
 	if [ -z "$(PYTHON_REPO_DIR)" ]; then echo "\n\nPYTHON_REPO_DIR must be set to the root of your Python github checkout\n\n"; fi
 	cd $(PYTHON_REPO_DIR) && \
-		git diff -D v$(PYTHON_VERSION) $(PYTHON_VER)-patched \
+		git diff --no-renames -D v$(PYTHON_VERSION) $(PYTHON_VER)-patched \
 			| PATH="/usr/local/bin:/opt/homebrew/bin:$(PATH)" filterdiff \
 				-X $(PROJECT_DIR)/patch/Python/diff.exclude -p 1 --clean \
 					> $(PROJECT_DIR)/patch/Python/Python.patch
@@ -286,7 +292,7 @@ $$(PYTHON_SRCDIR-$(target))/configure: \
 	# Apply target Python patches
 	cd $$(PYTHON_SRCDIR-$(target)) && patch -p1 < $(PROJECT_DIR)/patch/Python/Python.patch
 	# Make sure the binary scripts are executable
-	chmod 755 $$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin/*
+	chmod 755 $$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin/*
 	# Touch the configure script to ensure that Make identifies it as up to date.
 	touch $$(PYTHON_SRCDIR-$(target))/configure
 
@@ -294,7 +300,7 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
 		$$(PYTHON_SRCDIR-$(target))/configure
 	# Configure target Python
 	cd $$(PYTHON_SRCDIR-$(target)) && \
-		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin:$(PATH)" \
+		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
 		./configure \
 			LIBLZMA_CFLAGS="-I$$(XZ_INSTALL-$(target))/include" \
 			LIBLZMA_LIBS="-L$$(XZ_INSTALL-$(target))/lib -llzma" \
@@ -316,14 +322,14 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
 $$(PYTHON_SRCDIR-$(target))/python.exe: $$(PYTHON_SRCDIR-$(target))/Makefile
 	@echo ">>> Build Python for $(target)"
 	cd $$(PYTHON_SRCDIR-$(target)) && \
-		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin:$(PATH)" \
+		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
 			make -j8 all \
 			2>&1 | tee -a ../python-$(PYTHON_VERSION).build.log
 
 $$(PYTHON_LIB-$(target)): $$(PYTHON_SRCDIR-$(target))/python.exe
 	@echo ">>> Install Python for $(target)"
 	cd $$(PYTHON_SRCDIR-$(target)) && \
-		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin:$(PATH)" \
+		PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
 			make install \
 			2>&1 | tee -a ../python-$(PYTHON_VERSION).install.log
 
@@ -489,15 +495,11 @@ $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h: $$(PYTHON_LIB-$(sdk))
 	mkdir -p $$(PYTHON_INSTALL-$(sdk))/include
 	ln -si ../Python.framework/Headers $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER)
 
-ifeq ($(os), visionOS)
-	echo "Skipping arch-specific header copying for visionOS"
-else
 	# Add the individual headers from each target in an arch-specific name
 	$$(foreach target,$$(SDK_TARGETS-$(sdk)),cp $$(PYTHON_INCLUDE-$$(target))/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig-$$(ARCH-$$(target)).h; )
 
 	# Copy the cross-target header from the source folder of the first target in the $(sdk) SDK
-	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/$(os)/Resources/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h
-endif
+	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/Apple/$(os)/Resources/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h
 
 
 $$(PYTHON_STDLIB-$(sdk))/LICENSE.TXT: $$(PYTHON_LIB-$(sdk)) $$(PYTHON_FRAMEWORK-$(sdk))/Info.plist $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h $$(foreach target,$$(SDK_TARGETS-$(sdk)),$$(PYTHON_PLATFORM_SITECUSTOMIZE-$$(target)))
@@ -663,6 +665,11 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 		-output $$(PYTHON_XCFRAMEWORK-$(os)) $$(foreach sdk,$$(SDKS-$(os)),-framework $$(PYTHON_FRAMEWORK-$$(sdk))) \
 		2>&1 | tee -a support/$(PYTHON_VER)/python-$(os).xcframework.log
 
+	@echo ">>> Install build tools for $(os)"
+	mkdir $$(PYTHON_XCFRAMEWORK-$(os))/build
+	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed/Python.xcframework/build/utils.sh $$(PYTHON_XCFRAMEWORK-$(os))/build
+	cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed/Python.xcframework/build/$$(PLATFORM_NAME-$(os))-dylib-Info-template.plist $$(PYTHON_XCFRAMEWORK-$(os))/build
+
 	@echo ">>> Install PYTHONHOME for $(os)"
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/include $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 	$$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/bin $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
@@ -671,9 +678,9 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 	# Disable dSYM production (for now)
 	# $$(foreach sdk,$$(SDKS-$(os)),cp -r $$(PYTHON_INSTALL-$$(sdk))/Python.dSYM $$(PYTHON_XCFRAMEWORK-$(os))/$$(SDK_SLICE-$$(sdk)); )
 
-ifeq ($(filter $(os),iOS visionOS),$(os))
+ifeq ($(filter $(os),iOS tvOS visionOS),$(os))
 	@echo ">>> Clone testbed project for $(os)"
-	$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/$(os)/testbed clone --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
+	$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed clone --platform $(os) --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
 endif
 
 	@echo ">>> Create VERSIONS file for $(os)"
diff --git a/README.md b/README.md
index 8a3963be..2e373d41 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Python Apple Support
 
 This is a meta-package for building a version of Python that can be
-embedded into a macOS, iOS, tvOS, or watchOS project.
+embedded into a macOS, iOS, tvOS, watchOS, or visionOS project.
 
 **This branch builds a packaged version of Python 3.13**. Other Python
 versions are available by cloning other branches of the main repository:
@@ -26,16 +26,17 @@ The macOS package is a re-bundling of the official macOS binary,
 modified so that it is relocatable, with the IDLE, Tkinter and turtle
 packages removed, and the App Store compliance patch applied.
 
-The iOS, tvOS, and watchOS packages compiled by this project
+The iOS, tvOS, watchOS, and visionOS packages compiled by this project
 use the official [PEP 730](https://peps.python.org/pep-0730/) code that
 is part of Python 3.13 to provide iOS support; the relevant patches have
 been backported to 3.9-3.12. Additional patches have been applied to add
-tvOS, and watchOS support.
+tvOS, watchOS, and visionOS support.
 
 The binaries support x86_64 and arm64 for macOS; arm64 for iOS and
-appleTV devices; and arm64_32 for watchOS devices.
-It also supports device simulators on both x86_64 and M1
-hardware. This should enable the code to run on:
+appleTV devices; arm64_32 for watchOS devices; and arm64 for visionOS
+devices. It also supports device simulators on both x86_64 and M1
+hardware, except for visionOS, for which x86_64 simulators are
+officially unsupported. This should enable the code to run on:
 
 - macOS 11 (Big Sur) or later, on:
   - MacBook (including MacBooks using Apple Silicon)
@@ -58,6 +59,9 @@ hardware. This should enable the code to run on:
 - watchOS 4.0 or later, on:
   - Apple Watch (4th gen or later)
 
+- visionOS 2.0 or later, on:
+  - Apple Vision Pro
+
 ## Quickstart
 
 The easist way to use these packages is by creating a project with
@@ -78,6 +82,7 @@ repository, and then in the root directory, and run:
 - `make iOS` to build everything for iOS.
 - `make tvOS` to build everything for tvOS.
 - `make watchOS` to build everything for watchOS.
+- `make visionOS` to build everything for visionOS.
 
 This should:
 
@@ -95,7 +100,7 @@ Each support package contains:
 - `Python.xcframework`, a multi-architecture build of the Python runtime
   library.
 
-On iOS/tvOS/watchOS, the `Python.xcframework` contains a slice
+On iOS/tvOS/watchOS/visionOS, the `Python.xcframework` contains a slice
 for each supported ABI (device and simulator). The folder containing the
 slice can also be used as a `PYTHONHOME`, as it contains a `bin`,
 `include` and `lib` directory.
@@ -106,10 +111,10 @@ that are needed to build packages. This is required because Xcode uses
 the `xcrun` alias to dynamically generate the name of binaries, but a
 lot of C tooling expects that `CC` will not contain spaces.
 
-Each slice of an iOS/tvOS/watchOS XCframework also contains a
+Each slice of an iOS/tvOS/watchOS/visionOS XCframework also contains a
 `platform-config` folder with a subfolder for each supported
 architecture in that slice. These subfolders can be used to make a macOS
-Python environment behave as if it were on an iOS/tvOS/watchOS
+Python environment behave as if it were on an iOS/tvOS/watchOS/visionOS
 device. This works in one of two ways:
 
 1.  **A sitecustomize.py script**. If the `platform-config` subfolder is
@@ -126,8 +131,8 @@ device. This works in one of two ways:
     patches will also be applied to the isolated build environment that
     is created.
 
-iOS distributions also contain a copy of the iOS
-`testbed` project - an Xcode project that can be used to run
+iOS and visionOS distributions also contain a copy of the iOS or
+visionOS `testbed` project - an Xcode project that can be used to run
 test suites of Python code. See the [CPython documentation on testing
 packages](https://docs.python.org/3/using/ios.html#testing-a-python-package)
 for details on how to use this testbed.
@@ -141,7 +146,7 @@ This project packages the Python standard library, but does not address
 building binary wheels. Binary wheels for macOS can be obtained from
 PyPI. [Mobile Forge](https://github.com/beeware/mobile-forge) is a
 project that provides the tooling to build build binary wheels for iOS
-(and potentially for tvOS, and watchOS, although that hasn't
+(and potentially for tvOS, watchOS, and visionOS, although that hasn't
 been tested).
 
 ## Historical support
diff --git a/USAGE.md b/USAGE.md
index 114ded23..b205cdcc 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -2,15 +2,15 @@
 
 ## The easy way
 
-The easist way to use these packages is by creating a project with
-(Briefcase)[https://github.com/beeware/briefcase]. Briefcase will download
+The easiest way to use these packages is by creating a project with
+[Briefcase](https://github.com/beeware/briefcase). Briefcase will download
 pre-compiled versions of these support packages, and add them to an Xcode project
 (or pre-build stub application, in the case of macOS).
 
 ## The manual way
 
 **NOTE** Briefcase usage is the officially supported approach for using this
-support package. If you are experiencing diffculties, one approach for debugging
+support package. If you are experiencing difficulties, one approach for debugging
 is to generate a "Hello World" project with Briefcase, and compare the project that
 Briefcase has generated with your own project.
 
@@ -22,13 +22,13 @@ guides:
 * [macOS](https://docs.python.org/3/using/mac.html)
 * [iOS](https://docs.python.org/3/using/ios.html#adding-python-to-an-ios-project)
 
-For tvOS and watchOS, you should be able to broadly follow the instructions
+For tvOS, watchOS, and visionOS, you should be able to broadly follow the instructions
 in the iOS guide, changing some platform names in the first script. The testbed projects
-generated on iOS may be used as rough references as well.
+generated on iOS and visionOS may be used as rough references as well.
 
 ### Using Objective C
 
-Once you've added the Python XCframework to your project, you'll need to
+Once you've added the Python XCFramework to your project, you'll need to
 initialize the Python runtime in your Objective C code (This is step 10 of the
 iOS guide linked above). This initialization should generally be done as early
 as possible in the application's lifecycle, but definitely needs to be done
@@ -89,75 +89,6 @@ code will look something like this:
    Python you are using; and you will likely need to use `PyPreConfig` and
    `PreConfig` APIs.
 
-### Using Objective C
-
-Once you've added the Python XCframework to your project, you'll need to
-initialize the Python runtime in your Objective C code (This is step 10 of the
-iOS guide linked above). This initialization should generally be done as early
-as possible in the application's lifecycle, but definitely needs to be done
-before you invoke Python code.
-
-As a *bare minimum*, you can do the following:
-
-1. Import the Python C API headers:
-   ```objc
-   #include <Python/Python.h>
-   ```
-
-2. Initialize the Python interpreter:
-   ```objc
-   NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
-   NSString *pythonHome = [NSString stringWithFormat:@"%@/python", resourcePath, nil];
-   NSString *pythonPath = [NSString stringWithFormat:@"%@/lib/python3.13", python_home, nil];
-   NSString *libDynloadPath = [NSString stringWithFormat:@"%@/lib/python3.13/lib-dynload", python_home, nil];
-   NSString *appPath = [NSString stringWithFormat:@"%@/app", resourcePath, nil];
-
-   setenv("PYTHONHOME", pythonHome, 1);
-   setenv("PYTHONPATH", [NSString stringWithFormat:@"%@:%@:%@", pythonpath, libDynloadPath, appPath, nil]);
-
-   Py_Initialize();
-
-   // we now have a Python interpreter ready to be used
-   ```
-   References to a specific Python version should reflect the version of
-   Python you are using.
-
-Again - this is the *bare minimum* initialization. In practice, you will likely
-need to configure other aspects of the Python interpreter using the
-`PyPreConfig`  and `PyConfig` mechanisms. Consult the [Python documentation on
-interpreter configuration](https://docs.python.org/3/c-api/init_config.html) for
-more details on the configuration options that are available. You may find the
-[bootstrap mainline code used by
-Briefcase](https://github.com/beeware/briefcase-iOS-Xcode-template/blob/main/%7B%7B%20cookiecutter.format%20%7D%7D/%7B%7B%20cookiecutter.class_name%20%7D%7D/main.m)
-a helpful point of comparison.
-
-### Using Swift
-
-If you want to use Swift instead of Objective C, the bare minimum initialization
-code will look something like this:
-
-1. Import the Python framework:
-   ```swift
-   import Python
-   ```
-
-2. Initialize the Python interpreter:
-   ```swift
-   guard let pythonHome = Bundle.main.path(forResource: "python", ofType: nil) else { return }
-   guard let pythonPath = Bundle.main.path(forResource: "python/lib/python3.13", ofType: nil) else { return }
-   guard let libDynloadPath = Bundle.main.path(forResource: "python/lib/python3.13/lib-dynload", ofType: nil) else { return }
-   let appPath = Bundle.main.path(forResource: "app", ofType: nil)
-
-   setenv("PYTHONHOME", pythonHome, 1)
-   setenv("PYTHONPATH", [pythonPath, libDynloadPath, appPath].compactMap { $0 }.joined(separator: ":"), 1)
-   Py_Initialize()
-   // we now have a Python interpreter ready to be used
-   ```
-
-   Again, references to a specific Python version should reflect the version of
-   Python you are using; and you will likely need to use `PyPreConfig` and
-   `PreConfig` APIs.
-
 ## Accessing the Python runtime
 
 There are 2 ways to access the Python runtime in your project code.
@@ -166,7 +97,7 @@ There are 2 ways to access the Python runtime in your project code.
 
 You can use the [Python Embedded C
 API](https://docs.python.org/3/extending/embedding.html) to invoke Python code
-and interact with Python objects. This is a raw C API that is accesible to both
+and interact with Python objects. This is a raw C API that is accessible to both
 Objective C and Swift.
 
 ### PythonKit
diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
index fb34d0fb..327b96ba 100644
--- a/patch/Python/Python.patch
+++ b/patch/Python/Python.patch
@@ -1,1761 +1,1373 @@
-diff --git a/Doc/using/ios.rst b/Doc/using/ios.rst
-index dff694941d0..685d8e81add 100644
---- a/Doc/using/ios.rst
-+++ b/Doc/using/ios.rst
-@@ -296,9 +296,9 @@
-    * Buffered stdio (:c:member:`PyConfig.buffered_stdio`) is *disabled*;
-    * Writing bytecode (:c:member:`PyConfig.write_bytecode`) is *disabled*;
-    * Signal handlers (:c:member:`PyConfig.install_signal_handlers`) are *enabled*;
--   * ``PYTHONHOME`` for the interpreter is configured to point at the
-+   * :envvar:`PYTHONHOME` for the interpreter is configured to point at the
-      ``python`` subfolder of your app's bundle; and
--   * The ``PYTHONPATH`` for the interpreter includes:
-+   * The :envvar:`PYTHONPATH` for the interpreter includes:
- 
-      - the ``python/lib/python3.X`` subfolder of your app's bundle,
-      - the ``python/lib/python3.X/lib-dynload`` subfolder of your app's bundle, and
-@@ -322,7 +322,12 @@
-   the ``lib-dynload`` folder can be copied and adapted for this purpose.
- 
- * If you're using a separate folder for third-party packages, ensure that folder
--  is included as part of the ``PYTHONPATH`` configuration in step 10.
-+  is included as part of the :envvar:`PYTHONPATH` configuration in step 10.
-+
-+* If any of the folders that contain third-party packages will contain ``.pth``
-+  files, you should add that folder as a *site directory* (using
-+  :meth:`site.addsitedir`), rather than adding to :envvar:`PYTHONPATH` or
-+  :attr:`sys.path` directly.
- 
- Testing a Python package
- ------------------------
-diff --git a/Lib/platform.py b/Lib/platform.py
-index 8895177e326..eab586011ed 100755
---- a/Lib/platform.py
-+++ b/Lib/platform.py
-@@ -522,6 +522,54 @@
-     return IOSVersionInfo(system, release, model, is_simulator)
- 
- 
-+# A namedtuple for tvOS version information.
-+TVOSVersionInfo = collections.namedtuple(
-+    "TVOSVersionInfo",
-+    ["system", "release", "model", "is_simulator"]
-+)
+--- /dev/null
++++ b/Apple/__main__.py
+@@ -0,0 +1,1034 @@
++#!/usr/bin/env python3
++##########################################################################
++# Apple XCframework build script
++#
++# This script simplifies the process of configuring, compiling and packaging an
++# XCframework for an Apple platform.
++#
++# At present, it supports iOS, tvOS, visionOS and watchOS, but it has been
++# constructed so that it could be used on any Apple platform.
++#
++# The simplest entry point is:
++#
++#   $ python Apple ci iOS
++#
++# (replace iOS with tvOS, visionOS or watchOS as required.)
++#
++# which will:
++# * Clean any pre-existing build artefacts
++# * Configure and make a Python that can be used for the build
++# * Configure and make a Python for each supported iOS/tvOS architecture and ABI
++# * Combine the outputs of the builds from the previous step into a single
++#   XCframework, merging binaries into a "fat" binary if necessary
++# * Clone a copy of the testbed, configured to use the XCframework
++# * Construct a tarball containing the release artefacts
++# * Run the test suite using the generated XCframework.
++#
++# This is the complete sequence that would be needed in CI to build and test a
++# candidate release artefact.
++#
++# Each individual step can be invoked individually - there are commands to
++# clean, configure-build, make-build, configure-host, make-host, package, and
++# test.
++#
++# There is also a build command that can be used to combine the configure and
++# make steps for the build Python, an individual host, all hosts, or all builds.
++# #########################################################################
++from __future__ import annotations
 +
++import argparse
++import os
++import platform
++import re
++import shlex
++import shutil
++import signal
++import subprocess
++import sys
++import sysconfig
++import time
++from collections.abc import Sequence
++from contextlib import contextmanager
++from datetime import datetime, timezone
++from os.path import basename, relpath
++from pathlib import Path
++from subprocess import CalledProcessError
++from typing import Callable
 +
-+def tvos_ver(system="", release="", model="", is_simulator=False):
-+    """Get tvOS version information, and return it as a namedtuple:
-+        (system, release, model, is_simulator).
++EnvironmentT = dict[str, str]
++ArgsT = Sequence[str | Path]
 +
-+    If values can't be determined, they are set to values provided as
-+    parameters.
-+    """
-+    if sys.platform == "tvos":
-+        # TODO: Can the iOS implementation be used here?
-+        import _ios_support
-+        result = _ios_support.get_platform_ios()
-+        if result is not None:
-+            return TVOSVersionInfo(*result)
++SCRIPT_NAME = Path(__file__).name
++PYTHON_DIR = Path(__file__).resolve().parent.parent
 +
-+    return TVOSVersionInfo(system, release, model, is_simulator)
++CROSS_BUILD_DIR = PYTHON_DIR / "cross-build"
 +
++HOSTS: dict[str, dict[str, dict[str, str]]] = {
++    # Structure of this data:
++    # * Platform identifier
++    #   * an XCframework slice that must exist for that platform
++    #     * a host triple: the multiarch spec for that host
++    "iOS": {
++        "ios-arm64": {
++            "arm64-apple-ios": "arm64-iphoneos",
++        },
++        "ios-arm64_x86_64-simulator": {
++            "arm64-apple-ios-simulator": "arm64-iphonesimulator",
++            "x86_64-apple-ios-simulator": "x86_64-iphonesimulator",
++        },
++    },
++    "tvOS": {
++        "tvos-arm64": {
++            "arm64-apple-tvos": "arm64-appletvos",
++        },
++        "tvos-arm64_x86_64-simulator": {
++            "arm64-apple-tvos-simulator": "arm64-appletvsimulator",
++            "x86_64-apple-tvos-simulator": "x86_64-appletvsimulator",
++        },
++    },
++    "visionOS": {
++        "xros-arm64": {
++            "arm64-apple-xros": "arm64-xros",
++        },
++        "xros-arm64-simulator": {
++            "arm64-apple-xros-simulator": "arm64-xrsimulator",
++        },
++    },
++    "watchOS": {
++        "watchos-arm64_32": {
++            "arm64_32-apple-watchos": "arm64_32-watchos",
++        },
++        "watchos-arm64_x86_64-simulator": {
++            "arm64-apple-watchos-simulator": "arm64-watchsimulator",
++            "x86_64-apple-watchos-simulator": "x86_64-watchsimulator",
++        },
++    },
++}
 +
-+# A namedtuple for watchOS version information.
-+WatchOSVersionInfo = collections.namedtuple(
-+    "WatchOSVersionInfo",
-+    ["system", "release", "model", "is_simulator"]
-+)
 +
++def subdir(name: str, create: bool = False) -> Path:
++    """Ensure that a cross-build directory for the given name exists."""
++    path = CROSS_BUILD_DIR / name
++    if not path.exists():
++        if not create:
++            sys.exit(
++                f"{path} does not exist. Create it by running the appropriate "
++                f"`configure` subcommand of {SCRIPT_NAME}."
++            )
++        else:
++            path.mkdir(parents=True)
++    return path
 +
-+def watchos_ver(system="", release="", model="", is_simulator=False):
-+    """Get watchOS version information, and return it as a namedtuple:
-+        (system, release, model, is_simulator).
 +
-+    If values can't be determined, they are set to values provided as
-+    parameters.
++def run(
++    command: ArgsT,
++    *,
++    host: str | None = None,
++    env: EnvironmentT | None = None,
++    log: bool | None = True,
++    **kwargs,
++) -> subprocess.CompletedProcess:
++    """Run a command in an Apple development environment.
++
++    Optionally logs the executed command to the console.
 +    """
-+    if sys.platform == "watchos":
-+        # TODO: Can the iOS implementation be used here?
-+        import _ios_support
-+        result = _ios_support.get_platform_ios()
-+        if result is not None:
-+            return WatchOSVersionInfo(*result)
++    kwargs.setdefault("check", True)
++    if env is None:
++        env = os.environ.copy()
 +
-+    return WatchOSVersionInfo(system, release, model, is_simulator)
++    if host:
++        host_env = apple_env(host)
++        print_env(host_env)
++        env.update(host_env)
 +
++    if log:
++        print(">", join_command(command))
++    return subprocess.run(command, env=env, **kwargs)
 +
- def _java_getprop(name, default):
-     """This private helper is deprecated in 3.13 and will be removed in 3.15"""
-     from java.lang import System
-@@ -885,14 +933,25 @@
-             csid, cpu_number = vms_lib.getsyi('SYI$_CPU', 0)
-             return 'Alpha' if cpu_number >= 128 else 'VAX'
- 
--    # On the iOS simulator, os.uname returns the architecture as uname.machine.
--    # On device it returns the model name for some reason; but there's only one
--    # CPU architecture for iOS devices, so we know the right answer.
-+    # On the iOS/tvOS/watchOS simulator, os.uname returns the architecture as
-+    # uname.machine. On device it returns the model name for some reason; but
-+    # there's only one CPU architecture for devices, so we know the right
-+    # answer.
-     def get_ios():
-         if sys.implementation._multiarch.endswith("simulator"):
-             return os.uname().machine
-         return 'arm64'
- 
-+    def get_tvos():
-+        if sys.implementation._multiarch.endswith("simulator"):
-+            return os.uname().machine
-+        return 'arm64'
 +
-+    def get_watchos():
-+        if sys.implementation._multiarch.endswith("simulator"):
-+            return os.uname().machine
-+        return 'arm64_32'
++def join_command(args: str | Path | ArgsT) -> str:
++    """Format a command so it can be copied into a shell.
 +
-     def from_subprocess():
-         """
-         Fall back to `uname -p`
-@@ -1052,9 +1111,13 @@
-         system = 'Android'
-         release = android_ver().release
- 
--    # Normalize responses on iOS
-+    # Normalize responses on Apple mobile platforms
-     if sys.platform == 'ios':
-         system, release, _, _ = ios_ver()
-+    if sys.platform == 'tvos':
-+        system, release, _, _ = tvos_ver()
-+    if sys.platform == 'watchos':
-+        system, release, _, _ = watchos_ver()
- 
-     vals = system, node, release, version, machine
-     # Replace 'unknown' values with the more portable ''
-@@ -1344,6 +1407,10 @@
-         # macOS and iOS both report as a "Darwin" kernel
-         if sys.platform == "ios":
-             system, release, _, _ = ios_ver()
-+        elif sys.platform == "tvos":
-+            system, release, _, _ = tvos_ver()
-+        elif sys.platform == "watchos":
-+            system, release, _, _ = watchos_ver()
-         else:
-             macos_release = mac_ver()[0]
-             if macos_release:
-diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index 510c7b9568a..810b08879f6 100644
---- a/Lib/sysconfig/__init__.py
-+++ b/Lib/sysconfig/__init__.py
-@@ -676,6 +676,14 @@
-             release = get_config_vars().get("IPHONEOS_DEPLOYMENT_TARGET", "13.0")
-             osname = sys.platform
-             machine = sys.implementation._multiarch
-+        elif sys.platform == "tvos":
-+            release = get_config_vars().get("TVOS_DEPLOYMENT_TARGET", "9.0")
-+            osname = sys.platform
-+            machine = sys.implementation._multiarch
-+        elif sys.platform == "watchos":
-+            release = get_config_vars().get("WATCHOS_DEPLOYMENT_TARGET", "4.0")
-+            osname = sys.platform
-+            machine = sys.implementation._multiarch
-         else:
-             import _osx_support
-             osname, release, machine = _osx_support.get_platform_osx(
-diff --git a/Misc/platform_triplet.c b/Misc/platform_triplet.c
-index f5cd73bdea8..50f2f8988b7 100644
---- a/Misc/platform_triplet.c
-+++ b/Misc/platform_triplet.c
-@@ -257,6 +257,26 @@
- #    else
- PLATFORM_TRIPLET=arm64-iphoneos
- #    endif
-+#  elif defined(TARGET_OS_TV) && TARGET_OS_TV
-+#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
-+#      if __x86_64__
-+PLATFORM_TRIPLET=x86_64-appletvsimulator
-+#      else
-+PLATFORM_TRIPLET=arm64-appletvsimulator
-+#      endif
-+#    else
-+PLATFORM_TRIPLET=arm64-appletvos
-+#    endif
-+#  elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH
-+#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
-+#      if __x86_64__
-+PLATFORM_TRIPLET=x86_64-watchsimulator
-+#      else
-+PLATFORM_TRIPLET=arm64-watchsimulator
-+#      endif
-+#    else
-+PLATFORM_TRIPLET=arm64_32-watchos
-+#    endif
- // Older macOS SDKs do not define TARGET_OS_OSX
- #  elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX
- PLATFORM_TRIPLET=darwin
-diff --git a/configure b/configure
-index 519caa8ca74..5ae6de9bb44 100755
---- a/configure
-+++ b/configure
-@@ -979,6 +979,8 @@
- CFLAGS
- CC
- HAS_XCRUN
-+WATCHOS_DEPLOYMENT_TARGET
-+TVOS_DEPLOYMENT_TARGET
- IPHONEOS_DEPLOYMENT_TARGET
- EXPORT_MACOSX_DEPLOYMENT_TARGET
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET
-@@ -4058,6 +4060,12 @@
- 	*-apple-ios*)
- 		ac_sys_system=iOS
- 		;;
-+	*-apple-tvos*)
-+		ac_sys_system=tvOS
-+		;;
-+	*-apple-watchos*)
-+		ac_sys_system=watchOS
-+		;;
- 	*-*-vxworks*)
- 	    ac_sys_system=VxWorks
- 	    ;;
-@@ -4112,7 +4120,7 @@
- # On cross-compile builds, configure will look for a host-specific compiler by
- # prepending the user-provided host triple to the required binary name.
- #
--# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
-+# On iOS/tvOS/watchOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
- # which isn't a binary that exists, and isn't very convenient, as it contains the
- # iOS version. As the default cross-compiler name won't exist, configure falls
- # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
-@@ -4127,6 +4135,14 @@
- 		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
- 		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
- 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
++    Similar to `shlex.join`, but also accepts arguments which are Paths, or a
++    single string/Path outside of a list.
++    """
++    if isinstance(args, (str, Path)):
++        return str(args)
++    else:
++        return shlex.join(map(str, args))
 +
-+		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
-+		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
-+		x86_64-apple-tvos*-simulator)  AR=x86_64-apple-tvos-simulator-ar ;;
 +
-+		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
-+		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
-+		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
- 		*)
- 	esac
- fi
-@@ -4135,6 +4151,14 @@
- 		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
- 		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
- 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
++def print_env(env: EnvironmentT) -> None:
++    """Format the environment so it can be pasted into a shell."""
++    for key, value in sorted(env.items()):
++        print(f"export {key}={shlex.quote(value)}")
 +
-+		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
-+		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
-+		x86_64-apple-tvos*-simulator)  CC=x86_64-apple-tvos-simulator-clang ;;
 +
-+		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
-+		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
-+		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
- 		*)
- 	esac
- fi
-@@ -4143,6 +4167,14 @@
- 		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
- 		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
- 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
++def platform_for_host(host):
++    """Determine the platform for a given host triple."""
++    for plat, slices in HOSTS.items():
++        for _, candidates in slices.items():
++            for candidate in candidates:
++                if candidate == host:
++                    return plat
++    raise KeyError(host)
 +
-+		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
-+		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
-+		x86_64-apple-tvos*-simulator)  CPP=x86_64-apple-tvos-simulator-cpp ;;
 +
-+		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
-+		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
-+		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
- 		*)
- 	esac
- fi
-@@ -4151,6 +4183,14 @@
- 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
- 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
- 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
++def apple_env(host: str) -> EnvironmentT:
++    """Construct an Apple development environment for the given host."""
++    env = {
++        "PATH": ":".join(
++            [
++                str(PYTHON_DIR / f"Apple/{platform_for_host(host)}/Resources/bin"),
++                str(subdir(host) / "prefix"),
++                "/usr/bin",
++                "/bin",
++                "/usr/sbin",
++                "/sbin",
++                "/Library/Apple/usr/bin",
++            ]
++        ),
++    }
 +
-+		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
-+		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
-+		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
++    return env
 +
-+		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
-+		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
-+		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
- 		*)
- 	esac
- fi
-@@ -4271,8 +4311,10 @@
- 	case $enableval in
- 	yes)
- 		case $ac_sys_system in
--			Darwin) enableval=/Library/Frameworks ;;
--			iOS)    enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
-+			Darwin)  enableval=/Library/Frameworks ;;
-+			iOS)     enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
-+			tvOS)    enableval=tvOS/Frameworks/\$\(MULTIARCH\) ;;
-+			watchOS) enableval=watchOS/Frameworks/\$\(MULTIARCH\) ;;
- 			*) as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
- 		esac
- 	esac
-@@ -4281,6 +4323,8 @@
- 	no)
- 		case $ac_sys_system in
- 			iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
-+			tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
-+			watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
- 			*)
- 				PYTHONFRAMEWORK=
- 				PYTHONFRAMEWORKDIR=no-framework
-@@ -4387,6 +4431,36 @@
- 
- 				ac_config_files="$ac_config_files iOS/Resources/Info.plist"
- 
-+				;;
-+			tvOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=tvOS/Resources
++def delete_path(name: str) -> None:
++    """Delete the named cross-build directory, if it exists."""
++    path = CROSS_BUILD_DIR / name
++    if path.exists():
++        print(f"Deleting {path} ...")
++        shutil.rmtree(path)
 +
-+				ac_config_files="$ac_config_files tvOS/Resources/Info.plist"
 +
-+				;;
-+			watchOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++def all_host_triples(platform: str) -> list[str]:
++    """Return all host triples for the given platform.
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=watchOS/Resources
++    The host triples are the platform definitions used as input to configure
++    (e.g., "arm64-apple-ios-simulator").
++    """
++    triples = []
++    for slice_name, slice_parts in HOSTS[platform].items():
++        triples.extend(list(slice_parts))
++    return triples
 +
-+				ac_config_files="$ac_config_files watchOS/Resources/Info.plist"
 +
- 				;;
- 			*)
- 				as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
-@@ -4398,6 +4472,8 @@
- 
- 	case $ac_sys_system in
- 		iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
-+		tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
-+		watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
- 		*)
- 			PYTHONFRAMEWORK=
- 			PYTHONFRAMEWORKDIR=no-framework
-@@ -4451,8 +4527,8 @@
-     case "$withval" in
-     yes)
-       case $ac_sys_system in
--        Darwin|iOS)
--          # iOS is able to share the macOS patch
-+        Darwin|iOS|tvOS|watchOS)
-+          # iOS/tvOS/watchOS is able to share the macOS patch
-           APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
-           ;;
-         *) as_fn_error $? "no default app store compliance patch available for $ac_sys_system" "$LINENO" 5 ;;
-@@ -4470,8 +4546,8 @@
- else $as_nop
- 
-     case $ac_sys_system in
--      iOS)
--        # Always apply the compliance patch on iOS; we can use the macOS patch
-+      iOS|tvOS|watchOS)
-+        # Always apply the compliance patch on iOS/tvOS/watchOS; we can use the macOS patch
-         APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: applying default app store compliance patch" >&5
- printf "%s\n" "applying default app store compliance patch" >&6; }
-@@ -4525,6 +4601,50 @@
- 				;;
- 		esac
- 		;;
-+	*-apple-tvos*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
++def clean(context: argparse.Namespace, target: str = "all") -> None:
++    """The implementation of the "clean" command."""
++    # If we're explicitly targeting the build, there's no platform or
++    # distribution artefacts. If we're cleaning tests, we keep all built
++    # artefacts. Otherwise, the built artefacts must be dirty, so we remove
++    # them.
++    if target not in {"build", "test"}:
++        paths = ["dist", context.platform] + list(HOSTS[context.platform])
++    else:
++        paths = []
 +
-+		# TVOS_DEPLOYMENT_TARGET is the minimum supported tvOS version
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking tvOS deployment target" >&5
-+printf %s "checking tvOS deployment target... " >&6; }
-+		TVOS_DEPLOYMENT_TARGET=${_host_os:4}
-+		TVOS_DEPLOYMENT_TARGET=${TVOS_DEPLOYMENT_TARGET:=12.0}
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TVOS_DEPLOYMENT_TARGET" >&5
-+printf "%s\n" "$TVOS_DEPLOYMENT_TARGET" >&6; }
++    if target in {"all", "build"}:
++        paths.append("build")
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${TVOS_DEPLOYMENT_TARGET}-arm64-appletv${_host_device}
-+				;;
-+			*)
-+				_host_ident=${TVOS_DEPLOYMENT_TARGET}-$host_cpu-appletv${_host_device}
-+				;;
-+		esac
-+		;;
-+	*-apple-watchos*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
++    if target in {"all", "hosts"}:
++        paths.extend(all_host_triples(context.platform))
++    elif target not in {"build", "test", "package"}:
++        paths.append(target)
 +
-+		# WATCHOS_DEPLOYMENT_TARGET is the minimum supported watchOS version
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking watchOS deployment target" >&5
-+printf %s "checking watchOS deployment target... " >&6; }
-+		WATCHOS_DEPLOYMENT_TARGET=${_host_os:7}
-+		WATCHOS_DEPLOYMENT_TARGET=${WATCHOS_DEPLOYMENT_TARGET:=4.0}
-+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WATCHOS_DEPLOYMENT_TARGET" >&5
-+printf "%s\n" "$WATCHOS_DEPLOYMENT_TARGET" >&6; }
++    if target in {"all", "hosts", "test"}:
++        paths.extend(
++            [
++                path.name
++                for path in CROSS_BUILD_DIR.glob(f"{context.platform}-testbed.*")
++            ]
++        )
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-arm64-watch${_host_device}
-+				;;
-+			*)
-+				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
-+				;;
-+		esac
-+		;;
- 	*-*-vxworks*)
- 		_host_ident=$host_cpu
- 		;;
-@@ -4603,9 +4723,13 @@
-     define_xopen_source=no;;
-   Darwin/[12][0-9].*)
-     define_xopen_source=no;;
--  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
-+  # On iOS/tvOS/watchOS, defining _POSIX_C_SOURCE also disables platform specific features.
-   iOS/*)
-     define_xopen_source=no;;
-+  tvOS/*)
-+    define_xopen_source=no;;
-+  watchOS/*)
-+    define_xopen_source=no;;
-   # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
-   # defining NI_NUMERICHOST.
-   QNX/6.3.2)
-@@ -4668,7 +4792,10 @@
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
- EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
- 
--# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
-+# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
-+# WATCHOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++    for path in paths:
++        delete_path(path)
 +
 +
- 
- 
- # checks for alternative programs
-@@ -4709,6 +4836,16 @@
-     as_fn_append CFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
-     as_fn_append LDFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
-    ;; #(
-+  tvOS) :
++def build_python_path() -> Path:
++    """The path to the build Python binary."""
++    build_dir = subdir("build")
++    binary = build_dir / "python"
++    if not binary.is_file():
++        binary = binary.with_suffix(".exe")
++        if not binary.is_file():
++            raise FileNotFoundError(f"Unable to find `python(.exe)` in {build_dir}")
 +
-+    as_fn_append CFLAGS " -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"
-+    as_fn_append LDFLAGS " -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"
-+   ;; #(
-+  watchOS) :
++    return binary
 +
-+    as_fn_append CFLAGS " -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"
-+    as_fn_append LDFLAGS " -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"
-+   ;; #(
-   *) :
-      ;;
- esac
-@@ -7010,6 +7147,10 @@
-     MULTIARCH="" ;; #(
-   iOS) :
-     MULTIARCH="" ;; #(
-+  tvOS) :
-+    MULTIARCH="" ;; #(
-+  watchOS) :
-+    MULTIARCH="" ;; #(
-   FreeBSD*) :
-     MULTIARCH="" ;; #(
-   *) :
-@@ -7030,7 +7171,7 @@
- printf "%s\n" "$MULTIARCH" >&6; }
- 
- case $ac_sys_system in #(
--  iOS) :
-+  iOS|tvOS|watchOS) :
-     SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2` ;; #(
-   *) :
-     SOABI_PLATFORM=$PLATFORM_TRIPLET
-@@ -7081,6 +7222,14 @@
-     PY_SUPPORT_TIER=3 ;; #(
-     aarch64-apple-ios*/clang) :
-     PY_SUPPORT_TIER=3 ;; #(
-+    aarch64-apple-tvos*-simulator/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-+    aarch64-apple-tvos*/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-+    aarch64-apple-watchos*-simulator/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-+    arm64_32-apple-watchos*/clang) :
-+    PY_SUPPORT_TIER=3 ;; #(
-     aarch64-*-linux-android/clang) :
-     PY_SUPPORT_TIER=3 ;; #(
-     x86_64-*-linux-android/clang) :
-@@ -7554,7 +7703,7 @@
-   case $ac_sys_system in
-     Darwin)
-       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
--    iOS)
-+    iOS|tvOS|watchOS)
-       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
-     *)
-       as_fn_error $? "Unknown platform for framework build" "$LINENO" 5;;
-@@ -7620,7 +7769,7 @@
-       BLDLIBRARY='-L. -lpython$(LDVERSION)'
-       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
-       ;;
--    iOS)
-+    iOS|tvOS|watchOS)
-       LDLIBRARY='libpython$(LDVERSION).dylib'
-       ;;
-     AIX*)
-@@ -12975,7 +13124,7 @@
- 			BLDSHARED="$LDSHARED"
- 		fi
- 		;;
--	iOS/*)
-+	iOS/*|tvOS/*|watchOS/*)
- 		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
- 		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
- 		BLDSHARED="$LDSHARED"
-@@ -13108,7 +13257,7 @@
- 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
- 	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
- 	# -u libsys_s pulls in all symbols in libsys
--	Darwin/*|iOS/*)
-+	Darwin/*|iOS/*|tvOS/*|watchOS/*)
- 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
- 
- 		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -13132,7 +13281,7 @@
- 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- 			fi
- 			LINKFORSHARED="$LINKFORSHARED"
--		elif test $ac_sys_system = "iOS"; then
-+		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS"; then
- 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
- 		fi
- 		;;
-@@ -14531,7 +14680,7 @@
- 
-             ctypes_malloc_closure=yes
-      ;; #(
--  iOS) :
-+  iOS|tvOS|watchOS) :
- 
-       ctypes_malloc_closure=yes
-      ;; #(
-@@ -17982,12 +18131,6 @@
- then :
-   printf "%s\n" "#define HAVE_DUP3 1" >>confdefs.h
- 
--fi
--ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
--if test "x$ac_cv_func_execv" = xyes
--then :
--  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
--
- fi
- ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
- if test "x$ac_cv_func_explicit_bzero" = xyes
-@@ -18048,18 +18191,6 @@
- then :
-   printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h
- 
--fi
--ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
--if test "x$ac_cv_func_fork" = xyes
--then :
--  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
--
--fi
--ac_fn_c_check_func "$LINENO" "fork1" "ac_cv_func_fork1"
--if test "x$ac_cv_func_fork1" = xyes
--then :
--  printf "%s\n" "#define HAVE_FORK1 1" >>confdefs.h
--
- fi
- ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
- if test "x$ac_cv_func_fpathconf" = xyes
-@@ -18492,24 +18623,6 @@
- then :
-   printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h
- 
--fi
--ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
--if test "x$ac_cv_func_posix_spawn" = xyes
--then :
--  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
--
--fi
--ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
--if test "x$ac_cv_func_posix_spawnp" = xyes
--then :
--  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
--
--fi
--ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addclosefrom_np" "ac_cv_func_posix_spawn_file_actions_addclosefrom_np"
--if test "x$ac_cv_func_posix_spawn_file_actions_addclosefrom_np" = xyes
--then :
--  printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP 1" >>confdefs.h
--
- fi
- ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
- if test "x$ac_cv_func_pread" = xyes
-@@ -18798,12 +18911,6 @@
- then :
-   printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
- 
--fi
--ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
--if test "x$ac_cv_func_sigaltstack" = xyes
--then :
--  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
--
- fi
- ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
- if test "x$ac_cv_func_sigfillset" = xyes
-@@ -19072,11 +19179,11 @@
- 
- fi
- 
--# iOS defines some system methods that can be linked (so they are
-+# iOS/tvOS/watchOS define some system methods that can be linked (so they are
- # found by configure), but either raise a compilation error (because the
- # header definition prevents usage - autoconf doesn't use the headers), or
- # raise an error if used at runtime. Force these symbols off.
--if test "$ac_sys_system" != "iOS" ; then
-+if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
-   ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
- if test "x$ac_cv_func_getentropy" = xyes
- then :
-@@ -19098,6 +19205,53 @@
- 
- fi
- 
-+# tvOS/watchOS have some additional methods that can be found, but not used.
-+if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
-+  ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
-+if test "x$ac_cv_func_execv" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
-+if test "x$ac_cv_func_fork" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
++@contextmanager
++def group(text: str):
++    """A context manager that outputs a log marker around a section of a build.
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "fork1" "ac_cv_func_fork1"
-+if test "x$ac_cv_func_fork1" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_FORK1 1" >>confdefs.h
++    If running in a GitHub Actions environment, the GitHub syntax for
++    collapsible log sections is used.
++    """
++    if "GITHUB_ACTIONS" in os.environ:
++        print(f"::group::{text}")
++    else:
++        print(f"===== {text} " + "=" * (70 - len(text)))
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
-+if test "x$ac_cv_func_posix_spawn" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
++    yield
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
-+if test "x$ac_cv_func_posix_spawnp" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
++    if "GITHUB_ACTIONS" in os.environ:
++        print("::endgroup::")
++    else:
++        print()
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addclosefrom_np" "ac_cv_func_posix_spawn_file_actions_addclosefrom_np"
-+if test "x$ac_cv_func_posix_spawn_file_actions_addclosefrom_np" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP 1" >>confdefs.h
 +
-+fi
-+ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
-+if test "x$ac_cv_func_sigaltstack" = xyes
-+then :
-+  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
++@contextmanager
++def cwd(subdir: Path):
++    """A context manager that sets the current working directory."""
++    orig = os.getcwd()
++    os.chdir(subdir)
++    yield
++    os.chdir(orig)
 +
-+fi
 +
-+fi
++def configure_build_python(context: argparse.Namespace) -> None:
++    """The implementation of the "configure-build" command."""
++    if context.clean:
++        clean(context, "build")
 +
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
- printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
- if test ${ac_cv_c_undeclared_builtin_options+y}
-@@ -21920,7 +22074,8 @@
- 
- 
- # check for openpty, login_tty, and forkpty
--
-+# tvOS/watchOS have functions for tty, but can't use them
-+if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
- 
-   for ac_func in openpty
- do :
-@@ -22016,7 +22171,7 @@
- fi
- 
- done
--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
-+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
- printf %s "checking for library containing login_tty... " >&6; }
- if test ${ac_cv_search_login_tty+y}
- then :
-@@ -22173,6 +22328,7 @@
- fi
- 
- done
-+fi
- 
- # check for long file support functions
- ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
-@@ -22419,10 +22575,10 @@
- 
- done
- 
--# On Android and iOS, clock_settime can be linked (so it is found by
-+# On Android, iOS, tvOS and watchOS, clock_settime can be linked (so it is found by
- # configure), but when used in an unprivileged process, it crashes rather than
- # returning an error. Force the symbol off.
--if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
-+if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS"
- then
- 
-   for ac_func in clock_settime
-@@ -24654,8 +24810,8 @@
-   LIBPYTHON="\$(BLDLIBRARY)"
- fi
- 
--# On iOS the shared libraries must be linked with the Python framework
--if test "$ac_sys_system" = "iOS"; then
-+# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
-+if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "watchOS"; then
-   MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
- fi
- 
-@@ -27303,7 +27459,7 @@
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
- printf "%s\n" "$as_me: checking for device files" >&6;}
- 
--if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
-+if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS" ; then
-   ac_cv_file__dev_ptmx=no
-   ac_cv_file__dev_ptc=no
- else
-@@ -27736,7 +27892,7 @@
-     with_ensurepip=no ;; #(
-   WASI) :
-     with_ensurepip=no ;; #(
--  iOS) :
-+  iOS|tvOS|watchOS) :
-     with_ensurepip=no ;; #(
-   *) :
-     with_ensurepip=upgrade
-@@ -28755,7 +28911,7 @@
-  ;; #(
-     Darwin) :
-      ;; #(
--  iOS) :
-+  iOS|tvOS|watchOS) :
- 
- 
- 
-@@ -32520,6 +32676,8 @@
-     "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
-     "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
-     "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
-+    "tvOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES tvOS/Resources/Info.plist" ;;
-+    "watchOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES watchOS/Resources/Info.plist" ;;
-     "Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
-     "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
-     "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
-diff --git a/configure.ac b/configure.ac
-index 2a037569e49..39f84269378 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -330,6 +330,12 @@
- 	*-apple-ios*)
- 		ac_sys_system=iOS
- 		;;
-+	*-apple-tvos*)
-+		ac_sys_system=tvOS
-+		;;
-+	*-apple-watchos*)
-+		ac_sys_system=watchOS
-+		;;
- 	*-*-vxworks*)
- 	    ac_sys_system=VxWorks
- 	    ;;
-@@ -382,7 +388,7 @@
- # On cross-compile builds, configure will look for a host-specific compiler by
- # prepending the user-provided host triple to the required binary name.
- #
--# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
-+# On iOS/tvOS/watchOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
- # which isn't a binary that exists, and isn't very convenient, as it contains the
- # iOS version. As the default cross-compiler name won't exist, configure falls
- # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
-@@ -397,6 +403,14 @@
- 		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
- 		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
- 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
++    with (
++        group("Configuring build Python"),
++        cwd(subdir("build", create=True)),
++    ):
++        command = [relpath(PYTHON_DIR / "configure")]
++        if context.args:
++            command.extend(context.args)
++        run(command)
 +
-+		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
-+		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
-+		x86_64-apple-tvos*-simulator)  AR=x86_64-apple-tvos-simulator-ar ;;
 +
-+		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
-+		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
-+		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
- 		*)
- 	esac
- fi
-@@ -405,6 +419,14 @@
- 		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
- 		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
- 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
++def make_build_python(context: argparse.Namespace) -> None:
++    """The implementation of the "make-build" command."""
++    with (
++        group("Compiling build Python"),
++        cwd(subdir("build")),
++    ):
++        run(["make", "-j", str(os.cpu_count())])
 +
-+		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
-+		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
-+		x86_64-apple-tvos*-simulator)  CC=x86_64-apple-tvos-simulator-clang ;;
 +
-+		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
-+		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
-+		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
- 		*)
- 	esac
- fi
-@@ -413,6 +435,14 @@
- 		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
- 		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
- 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
++def apple_target(host: str) -> str:
++    """Return the Apple platform identifier for a given host triple."""
++    for _, platform_slices in HOSTS.items():
++        for slice_name, slice_parts in platform_slices.items():
++            for host_triple, multiarch in slice_parts.items():
++                if host == host_triple:
++                    return ".".join(multiarch.split("-")[::-1])
 +
-+		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
-+		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
-+		x86_64-apple-tvos*-simulator)  CPP=x86_64-apple-tvos-simulator-cpp ;;
++    raise KeyError(host)
 +
-+		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
-+		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
-+		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
- 		*)
- 	esac
- fi
-@@ -421,6 +451,14 @@
- 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
- 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
- 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
 +
-+		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
-+		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
-+		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
++def apple_multiarch(host: str) -> str:
++    """Return the multiarch descriptor for a given host triple."""
++    for _, platform_slices in HOSTS.items():
++        for slice_name, slice_parts in platform_slices.items():
++            for host_triple, multiarch in slice_parts.items():
++                if host == host_triple:
++                    return multiarch
 +
-+		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
-+		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
-+		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
- 		*)
- 	esac
- fi
-@@ -535,8 +573,10 @@
- 	case $enableval in
- 	yes)
- 		case $ac_sys_system in
--			Darwin) enableval=/Library/Frameworks ;;
--			iOS)    enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
-+			Darwin)  enableval=/Library/Frameworks ;;
-+			iOS)     enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
-+			tvOS)    enableval=tvOS/Frameworks/\$\(MULTIARCH\) ;;
-+			watchOS) enableval=watchOS/Frameworks/\$\(MULTIARCH\) ;;
- 			*) AC_MSG_ERROR([Unknown platform for framework build])
- 		esac
- 	esac
-@@ -545,6 +585,8 @@
- 	no)
- 		case $ac_sys_system in
- 			iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
-+			tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
-+			watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
- 			*)
- 				PYTHONFRAMEWORK=
- 				PYTHONFRAMEWORKDIR=no-framework
-@@ -647,6 +689,34 @@
- 
- 				AC_CONFIG_FILES([iOS/Resources/Info.plist])
- 				;;
-+			tvOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++    raise KeyError(host)
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=tvOS/Resources
 +
-+				AC_CONFIG_FILES([tvOS/Resources/Info.plist])
-+				;;
-+			watchOS) :
-+				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
-+				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
-+				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
-+				FRAMEWORKPYTHONW=
-+				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++def unpack_deps(
++    platform: str,
++    host: str,
++    prefix_dir: Path,
++    cache_dir: Path,
++) -> None:
++    """Unpack binary dependencies into a provided directory.
 +
-+				prefix=$PYTHONFRAMEWORKPREFIX
-+				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
-+				RESSRCDIR=watchOS/Resources
++    Downloads binaries if they aren't already present. Downloads will be stored
++    in provided cache directory.
 +
-+				AC_CONFIG_FILES([watchOS/Resources/Info.plist])
-+				;;
- 			*)
- 				AC_MSG_ERROR([Unknown platform for framework build])
- 				;;
-@@ -655,6 +725,8 @@
- 	],[
- 	case $ac_sys_system in
- 		iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
-+		tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
-+		watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
- 		*)
- 			PYTHONFRAMEWORK=
- 			PYTHONFRAMEWORKDIR=no-framework
-@@ -707,8 +779,8 @@
-     case "$withval" in
-     yes)
-       case $ac_sys_system in
--        Darwin|iOS)
--          # iOS is able to share the macOS patch
-+        Darwin|iOS|tvOS|watchOS)
-+          # iOS/tvOS/watchOS is able to share the macOS patch
-           APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
-           ;;
-         *) AC_MSG_ERROR([no default app store compliance patch available for $ac_sys_system]) ;;
-@@ -722,8 +794,8 @@
-     esac
-   ],[
-     case $ac_sys_system in
--      iOS)
--        # Always apply the compliance patch on iOS; we can use the macOS patch
-+      iOS|tvOS|watchOS)
-+        # Always apply the compliance patch on iOS/tvOS/watchOS; we can use the macOS patch
-         APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
-         AC_MSG_RESULT([applying default app store compliance patch])
-         ;;
-@@ -771,6 +843,46 @@
- 				;;
- 		esac
- 		;;
-+	*-apple-tvos*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
++    On non-macOS platforms, as a safety mechanism, any dynamic libraries will be
++    purged from the unpacked dependencies.
++    """
++    deps_url = "https://github.com/beeware/cpython-apple-source-deps/releases/download"
++    for name_ver in [
++        "BZip2-1.0.8-2",
++        "libFFI-3.4.7-2",
++        "OpenSSL-3.0.17-1",
++        "XZ-5.6.4-2",
++        "mpdecimal-4.0.0-2",
++        "zstd-1.5.7-1",
++    ]:
++        filename = f"{name_ver.lower()}-{apple_target(host)}.tar.gz"
++        archive_path = download(
++            f"{deps_url}/{name_ver}/{filename}",
++            target_dir=cache_dir,
++        )
++        shutil.unpack_archive(archive_path, prefix_dir)
 +
-+		# TVOS_DEPLOYMENT_TARGET is the minimum supported tvOS version
-+		AC_MSG_CHECKING([tvOS deployment target])
-+		TVOS_DEPLOYMENT_TARGET=${_host_os:4}
-+		TVOS_DEPLOYMENT_TARGET=${TVOS_DEPLOYMENT_TARGET:=12.0}
-+		AC_MSG_RESULT([$TVOS_DEPLOYMENT_TARGET])
++    # Dynamic libraries will be preferentially linked over static; On non-macOS
++    # platforms, ensure that no dylibs are available in the prefix folder.
++    if platform != "macOS":
++        for dylib in prefix_dir.glob("**/*.dylib"):
++            dylib.unlink()
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${TVOS_DEPLOYMENT_TARGET}-arm64-appletv${_host_device}
-+				;;
-+			*)
-+				_host_ident=${TVOS_DEPLOYMENT_TARGET}-$host_cpu-appletv${_host_device}
-+				;;
-+		esac
-+		;;
-+	*-apple-watchos*)
-+		_host_os=`echo $host | cut -d '-' -f3`
-+		_host_device=`echo $host | cut -d '-' -f4`
-+		_host_device=${_host_device:=os}
 +
-+		# WATCHOS_DEPLOYMENT_TARGET is the minimum supported watchOS version
-+		AC_MSG_CHECKING([watchOS deployment target])
-+		WATCHOS_DEPLOYMENT_TARGET=${_host_os:7}
-+		WATCHOS_DEPLOYMENT_TARGET=${WATCHOS_DEPLOYMENT_TARGET:=4.0}
-+		AC_MSG_RESULT([$WATCHOS_DEPLOYMENT_TARGET])
++def download(url: str, target_dir: Path) -> Path:
++    """Download the specified URL into the given directory.
 +
-+		case "$host_cpu" in
-+			aarch64)
-+				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-arm64-watch${_host_device}
-+				;;
-+			*)
-+				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
-+				;;
-+		esac
-+		;;
- 	*-*-vxworks*)
- 		_host_ident=$host_cpu
- 		;;
-@@ -848,9 +960,13 @@
-     define_xopen_source=no;;
-   Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
-     define_xopen_source=no;;
--  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
-+  # On iOS/tvOS/watchOS, defining _POSIX_C_SOURCE also disables platform specific features.
-   iOS/*)
-     define_xopen_source=no;;
-+  tvOS/*)
-+    define_xopen_source=no;;
-+  watchOS/*)
-+    define_xopen_source=no;;
-   # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
-   # defining NI_NUMERICHOST.
-   QNX/6.3.2)
-@@ -909,8 +1025,11 @@
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
- EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
- 
--# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
-+# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
-+# WATCHOS_DEPLOYMENT_TARGET enforced by the selected host triple.
- AC_SUBST([IPHONEOS_DEPLOYMENT_TARGET])
-+AC_SUBST([TVOS_DEPLOYMENT_TARGET])
-+AC_SUBST([WATCHOS_DEPLOYMENT_TARGET])
- 
- # checks for alternative programs
- 
-@@ -944,11 +1063,17 @@
-   ],
- )
- 
--dnl Add the compiler flag for the iOS minimum supported OS version.
-+dnl Add the compiler flag for the iOS/tvOS/watchOS minimum supported OS version.
- AS_CASE([$ac_sys_system],
-   [iOS], [
-     AS_VAR_APPEND([CFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
-     AS_VAR_APPEND([LDFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
-+  ],[tvOS], [
-+    AS_VAR_APPEND([CFLAGS], [" -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"])
-+    AS_VAR_APPEND([LDFLAGS], [" -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"])
-+  ],[watchOS], [
-+    AS_VAR_APPEND([CFLAGS], [" -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"])
-+    AS_VAR_APPEND([LDFLAGS], [" -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"])
-   ],
- )
- 
-@@ -1136,6 +1261,8 @@
- AS_CASE([$ac_sys_system],
-   [Darwin*], [MULTIARCH=""],
-   [iOS], [MULTIARCH=""],
-+  [tvOS], [MULTIARCH=""],
-+  [watchOS], [MULTIARCH=""],
-   [FreeBSD*], [MULTIARCH=""],
-   [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
- )
-@@ -1157,7 +1284,7 @@
- dnl use a single "fat" binary at runtime. SOABI_PLATFORM is the component of
- dnl the PLATFORM_TRIPLET that will be used in binary module extensions.
- AS_CASE([$ac_sys_system],
--  [iOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
-+  [iOS|tvOS|watchOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
-   [SOABI_PLATFORM=$PLATFORM_TRIPLET]
- )
- 
-@@ -1191,6 +1318,10 @@
-   [x86_64-*-freebsd*/clang],         [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
-   [aarch64-apple-ios*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
-   [aarch64-apple-ios*/clang],             [PY_SUPPORT_TIER=3], dnl iOS on ARM64
-+  [aarch64-apple-tvos*-simulator/clang],  [PY_SUPPORT_TIER=3], dnl tvOS Simulator on arm64
-+  [aarch64-apple-tvos*/clang],            [PY_SUPPORT_TIER=3], dnl tvOS on ARM64
-+  [aarch64-apple-watchos*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl watchOS Simulator on arm64
-+  [arm64_32-apple-watchos*/clang],            [PY_SUPPORT_TIER=3], dnl watchOS on ARM64
-   [aarch64-*-linux-android/clang],   [PY_SUPPORT_TIER=3], dnl Android on ARM64
-   [x86_64-*-linux-android/clang],    [PY_SUPPORT_TIER=3], dnl Android on AMD64
- 
-@@ -1525,7 +1656,7 @@
-   case $ac_sys_system in
-     Darwin)
-       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
--    iOS)
-+    iOS|tvOS|watchOS)
-       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
-     *)
-       AC_MSG_ERROR([Unknown platform for framework build]);;
-@@ -1590,7 +1721,7 @@
-       BLDLIBRARY='-L. -lpython$(LDVERSION)'
-       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
-       ;;
--    iOS)
-+    iOS|tvOS|watchOS)
-       LDLIBRARY='libpython$(LDVERSION).dylib'
-       ;;
-     AIX*)
-@@ -3486,7 +3617,7 @@
- 			BLDSHARED="$LDSHARED"
- 		fi
- 		;;
--	iOS/*)
-+	iOS/*|tvOS/*|watchOS/*)
- 		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
- 		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
- 		BLDSHARED="$LDSHARED"
-@@ -3610,7 +3741,7 @@
- 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
- 	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
- 	# -u libsys_s pulls in all symbols in libsys
--	Darwin/*|iOS/*)
-+	Darwin/*|iOS/*|tvOS/*|watchOS/*)
- 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
- 
- 		# Issue #18075: the default maximum stack size (8MBytes) is too
-@@ -3634,7 +3765,7 @@
- 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- 			fi
- 			LINKFORSHARED="$LINKFORSHARED"
--		elif test $ac_sys_system = "iOS"; then
-+		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS"; then
- 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
- 		fi
- 		;;
-@@ -4018,7 +4149,7 @@
-       dnl when do we need USING_APPLE_OS_LIBFFI?
-       ctypes_malloc_closure=yes
-     ],
--    [iOS], [
-+    [iOS|tvOS|watchOS], [
-       ctypes_malloc_closure=yes
-     ],
-     [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]
-@@ -5112,9 +5243,9 @@
- # checks for library functions
- AC_CHECK_FUNCS([ \
-   accept4 alarm bind_textdomain_codeset chmod chown clock closefrom close_range confstr \
--  copy_file_range ctermid dup dup3 execv explicit_bzero explicit_memset \
-+  copy_file_range ctermid dup dup3 explicit_bzero explicit_memset \
-   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
--  fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
-+  fpathconf fstatat ftime ftruncate futimens futimes futimesat \
-   gai_strerror getegid geteuid getgid getgrent getgrgid getgrgid_r \
-   getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin getlogin_r \
-   getpeername getpgid getpid getppid getpriority _getpty \
-@@ -5122,15 +5253,14 @@
-   getspnam getuid getwd grantpt if_nameindex initgroups kill killpg lchown linkat \
-   lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
-   mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
--  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt posix_spawn posix_spawnp \
--  posix_spawn_file_actions_addclosefrom_np \
-+  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt \
-   pread preadv preadv2 process_vm_readv pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \
-   pthread_kill ptsname ptsname_r pwrite pwritev pwritev2 readlink readlinkat readv realpath renameat \
-   rtpSpawn sched_get_priority_max sched_rr_get_interval sched_setaffinity \
-   sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \
-   sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \
-   setitimer setlocale setpgid setpgrp setpriority setregid setresgid \
--  setresuid setreuid setsid setuid setvbuf shutdown sigaction sigaltstack \
-+  setresuid setreuid setsid setuid setvbuf shutdown sigaction \
-   sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
-   sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
-   sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
-@@ -5145,12 +5275,20 @@
-   AC_CHECK_FUNCS([lchmod])
- fi
- 
--# iOS defines some system methods that can be linked (so they are
-+# iOS/tvOS/watchOS define some system methods that can be linked (so they are
- # found by configure), but either raise a compilation error (because the
- # header definition prevents usage - autoconf doesn't use the headers), or
- # raise an error if used at runtime. Force these symbols off.
--if test "$ac_sys_system" != "iOS" ; then
--  AC_CHECK_FUNCS([getentropy getgroups system])
-+if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
-+  AC_CHECK_FUNCS([ getentropy getgroups system ])
-+fi
++    :return: The path to the downloaded archive.
++    """
++    target_path = Path(target_dir).resolve()
++    target_path.mkdir(exist_ok=True, parents=True)
 +
-+# tvOS/watchOS have some additional methods that can be found, but not used.
-+if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
-+  AC_CHECK_FUNCS([ \
-+    execv fork fork1 posix_spawn posix_spawnp posix_spawn_file_actions_addclosefrom_np \
-+    sigaltstack \
-+  ])
- fi
- 
- AC_CHECK_DECL([dirfd],
-@@ -5413,20 +5551,22 @@
-               [@%:@include <utmp.h>])
- 
- # check for openpty, login_tty, and forkpty
--
--AC_CHECK_FUNCS([openpty], [],
--  [AC_CHECK_LIB([util], [openpty],
--    [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lutil"],
--    [AC_CHECK_LIB([bsd], [openpty],
--      [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lbsd"])])])
--AC_SEARCH_LIBS([login_tty], [util],
-- [AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
--)
--AC_CHECK_FUNCS([forkpty], [],
--  [AC_CHECK_LIB([util], [forkpty],
--    [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lutil"],
--    [AC_CHECK_LIB([bsd], [forkpty],
--      [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])])
-+# tvOS/watchOS have functions for tty, but can't use them
-+if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
-+  AC_CHECK_FUNCS([openpty], [],
-+    [AC_CHECK_LIB([util], [openpty],
-+      [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lutil"],
-+      [AC_CHECK_LIB([bsd], [openpty],
-+        [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lbsd"])])])
-+  AC_SEARCH_LIBS([login_tty], [util],
-+   [AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
-+  )
-+  AC_CHECK_FUNCS([forkpty], [],
-+    [AC_CHECK_LIB([util], [forkpty],
-+      [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lutil"],
-+      [AC_CHECK_LIB([bsd], [forkpty],
-+        [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])])
-+fi
- 
- # check for long file support functions
- AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
-@@ -5465,10 +5605,10 @@
-     ])
- ])
- 
--# On Android and iOS, clock_settime can be linked (so it is found by
-+# On Android, iOS, tvOS and watchOS, clock_settime can be linked (so it is found by
- # configure), but when used in an unprivileged process, it crashes rather than
- # returning an error. Force the symbol off.
--if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
-+if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS"
- then
-   AC_CHECK_FUNCS([clock_settime], [], [
-       AC_CHECK_LIB([rt], [clock_settime], [
-@@ -6217,8 +6357,8 @@
-   LIBPYTHON="\$(BLDLIBRARY)"
- fi
- 
--# On iOS the shared libraries must be linked with the Python framework
--if test "$ac_sys_system" = "iOS"; then
-+# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
-+if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "watchOS"; then
-   MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
- fi
- 
-@@ -6826,7 +6966,7 @@
- dnl NOTE: Inform user how to proceed with files when cross compiling.
- dnl Some cross-compile builds are predictable; they won't ever
- dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
--if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
-+if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "watchOS" ; then
-   ac_cv_file__dev_ptmx=no
-   ac_cv_file__dev_ptc=no
- else
-@@ -7083,7 +7223,7 @@
-       AS_CASE([$ac_sys_system],
-         [Emscripten], [with_ensurepip=no],
-         [WASI], [with_ensurepip=no],
--        [iOS], [with_ensurepip=no],
-+        [iOS|tvOS|watchOS], [with_ensurepip=no],
-         [with_ensurepip=upgrade]
-       )
-     ])
-@@ -7491,7 +7631,7 @@
-   [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
-   dnl The _scproxy module is available on macOS
-   [Darwin], [],
--  [iOS], [
-+  [iOS|tvOS|watchOS], [
-     dnl subprocess and multiprocessing are not supported (no fork syscall).
-     dnl curses and tkinter user interface are not available.
-     dnl gdbm and nis aren't available
-diff --git a/iOS/Resources/Info.plist.in b/iOS/Resources/Info.plist.in
-index c3e261ecd9e..26ef7a95de4 100644
---- a/iOS/Resources/Info.plist.in
-+++ b/iOS/Resources/Info.plist.in
-@@ -17,13 +17,13 @@
- 	<key>CFBundlePackageType</key>
- 	<string>FMWK</string>
- 	<key>CFBundleShortVersionString</key>
--	<string>@VERSION@</string>
-+	<string>%VERSION%</string>
- 	<key>CFBundleLongVersionString</key>
- 	<string>%VERSION%, (c) 2001-2024 Python Software Foundation.</string>
- 	<key>CFBundleSignature</key>
- 	<string>????</string>
- 	<key>CFBundleVersion</key>
--	<string>1</string>
-+	<string>%VERSION%</string>
- 	<key>CFBundleSupportedPlatforms</key>
- 	<array>
- 		<string>iPhoneOS</string>
---- /dev/null
-+++ b/iOS/Resources/bin/arm64-apple-ios-simulator-strip
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} strip -arch arm64 "$@"
---- /dev/null
-+++ b/iOS/Resources/bin/arm64-apple-ios-strip
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+xcrun --sdk iphoneos${IOS_SDK_VERSION} strip -arch arm64 "$@"
---- /dev/null
-+++ b/iOS/Resources/bin/x86_64-apple-ios-simulator-strip
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} strip -arch x86_64 "$@"
-diff --git a/iOS/testbed/iOSTestbedTests/iOSTestbedTests.m b/iOS/testbed/iOSTestbedTests/iOSTestbedTests.m
-index d417b4cd63e..294a06f5305 100644
---- a/iOS/testbed/iOSTestbedTests/iOSTestbedTests.m
-+++ b/iOS/testbed/iOSTestbedTests/iOSTestbedTests.m
-@@ -15,6 +15,11 @@
-     PyStatus status;
-     PyPreConfig preconfig;
-     PyConfig config;
-+    PyObject *app_packages_path;
-+    PyObject *method_args;
-+    PyObject *result;
-+    PyObject *site_module;
-+    PyObject *site_addsitedir_attr;
-     PyObject *sys_module;
-     PyObject *sys_path_attr;
-     NSArray *test_args;
-@@ -109,29 +114,55 @@
-         return;
-     }
- 
--    sys_module = PyImport_ImportModule("sys");
--    if (sys_module == NULL) {
--        XCTFail(@"Could not import sys module");
-+    // Add app_packages as a site directory. This both adds to sys.path,
-+    // and ensures that any .pth files in that directory will be executed.
-+    site_module = PyImport_ImportModule("site");
-+    if (site_module == NULL) {
-+        XCTFail(@"Could not import site module");
-         return;
-     }
- 
--    sys_path_attr = PyObject_GetAttrString(sys_module, "path");
--    if (sys_path_attr == NULL) {
--        XCTFail(@"Could not access sys.path");
-+    site_addsitedir_attr = PyObject_GetAttrString(site_module, "addsitedir");
-+    if (site_addsitedir_attr == NULL || !PyCallable_Check(site_addsitedir_attr)) {
-+        XCTFail(@"Could not access site.addsitedir");
-         return;
-     }
- 
--    // Add the app packages path
-     path = [NSString stringWithFormat:@"%@/app_packages", resourcePath, nil];
-     NSLog(@"App packages path: %@", path);
-     wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
--    failed = PyList_Insert(sys_path_attr, 0, PyUnicode_FromString([path UTF8String]));
--    if (failed) {
--        XCTFail(@"Unable to add app packages to sys.path");
-+    app_packages_path = PyUnicode_FromWideChar(wtmp_str, wcslen(wtmp_str));
-+    if (app_packages_path == NULL) {
-+        XCTFail(@"Could not convert app_packages path to unicode");
-         return;
-     }
-     PyMem_RawFree(wtmp_str);
- 
-+    method_args = Py_BuildValue("(O)", app_packages_path);
-+    if (method_args == NULL) {
-+        XCTFail(@"Could not create arguments for site.addsitedir");
-+        return;
-+    }
++    out_path = target_path / basename(url)
++    if not Path(out_path).is_file():
++        run(
++            [
++                "curl",
++                "-Lf",
++                "--retry",
++                "5",
++                "--retry-all-errors",
++                "-o",
++                out_path,
++                url,
++            ]
++        )
++    else:
++        print(f"Using cached version of {basename(url)}")
++    return out_path
 +
-+    result = PyObject_CallObject(site_addsitedir_attr, method_args);
-+    if (result == NULL) {
-+        XCTFail(@"Could not add app_packages directory using site.addsitedir");
-+        return;
-+    }
 +
-+    // Add test code to sys.path
-+    sys_module = PyImport_ImportModule("sys");
-+    if (sys_module == NULL) {
-+        XCTFail(@"Could not import sys module");
-+        return;
-+    }
++def configure_host_python(
++    context: argparse.Namespace,
++    host: str | None = None,
++) -> None:
++    """The implementation of the "configure-host" command."""
++    if host is None:
++        host = context.host
 +
-+    sys_path_attr = PyObject_GetAttrString(sys_module, "path");
-+    if (sys_path_attr == NULL) {
-+        XCTFail(@"Could not access sys.path");
-+        return;
-+    }
++    if context.clean:
++        clean(context, host)
 +
-     path = [NSString stringWithFormat:@"%@/app", resourcePath, nil];
-     NSLog(@"App path: %@", path);
-     wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
---- /dev/null
-+++ b/tvOS/README.rst
-@@ -0,0 +1,108 @@
-+=====================
-+Python on tvOS README
-+=====================
++    host_dir = subdir(host, create=True)
++    prefix_dir = host_dir / "prefix"
 +
-+:Authors:
-+    Russell Keith-Magee (2023-11)
++    with group(f"Downloading dependencies ({host})"):
++        if not prefix_dir.exists():
++            prefix_dir.mkdir()
++            unpack_deps(context.platform, host, prefix_dir, context.cache_dir)
++        else:
++            print("Dependencies already installed")
 +
-+This document provides a quick overview of some tvOS specific features in the
-+Python distribution.
++    with (
++        group(f"Configuring host Python ({host})"),
++        cwd(host_dir),
++    ):
++        command = [
++            # Basic cross-compiling configuration
++            relpath(PYTHON_DIR / "configure"),
++            f"--host={host}",
++            f"--build={sysconfig.get_config_var('BUILD_GNU_TYPE')}",
++            f"--with-build-python={build_python_path()}",
++            "--with-system-libmpdec",
++            "--enable-ipv6",
++            "--enable-framework",
++            # Dependent libraries.
++            f"--with-openssl={prefix_dir}",
++            f"LIBLZMA_CFLAGS=-I{prefix_dir}/include",
++            f"LIBLZMA_LIBS=-L{prefix_dir}/lib -llzma",
++            f"LIBFFI_CFLAGS=-I{prefix_dir}/include",
++            f"LIBFFI_LIBS=-L{prefix_dir}/lib -lffi",
++            f"LIBMPDEC_CFLAGS=-I{prefix_dir}/include",
++            f"LIBMPDEC_LIBS=-L{prefix_dir}/lib -lmpdec",
++            f"LIBZSTD_CFLAGS=-I{prefix_dir}/include",
++            f"LIBZSTD_LIBS=-L{prefix_dir}/lib -lzstd",
++        ]
 +
-+Compilers for building on tvOS
-+==============================
++        if context.args:
++            command.extend(context.args)
++        run(command, host=host)
 +
-+Building for tvOS requires the use of Apple's Xcode tooling. It is strongly
-+recommended that you use the most recent stable release of Xcode, on the
-+most recently released macOS.
 +
-+tvOS specific arguments to configure
-+===================================
++def make_host_python(
++    context: argparse.Namespace,
++    host: str | None = None,
++) -> None:
++    """The implementation of the "make-host" command."""
++    if host is None:
++        host = context.host
 +
-+* ``--enable-framework[=DIR]``
++    with (
++        group(f"Compiling host Python ({host})"),
++        cwd(subdir(host)),
++    ):
++        run(["make", "-j", str(os.cpu_count())], host=host)
++        run(["make", "install"], host=host)
 +
-+  This argument specifies the location where the Python.framework will
-+  be installed.
 +
-+* ``--with-framework-name=NAME``
++def framework_path(host_triple: str, multiarch: str) -> Path:
++    """The path to a built single-architecture framework product.
 +
-+  Specify the name for the python framework, defaults to ``Python``.
++    :param host_triple: The host triple (e.g., arm64-apple-ios-simulator)
++    :param multiarch: The multiarch identifier (e.g., arm64-simulator)
++    """
++    return (
++        CROSS_BUILD_DIR
++        / f"{host_triple}/Apple/{platform_for_host(host_triple)}/Frameworks/{multiarch}"
++    )
 +
 +
-+Building and using Python on tvOS
-+=================================
++def package_version(prefix_path: Path) -> str:
++    """Extract the Python version being built from patchlevel.h."""
++    for path in prefix_path.glob("**/patchlevel.h"):
++        text = path.read_text(encoding="utf-8")
++        if match := re.search(r'\n\s*#define\s+PY_VERSION\s+"(.+)"\s*\n', text):
++            version = match[1]
++            # If not building against a tagged commit, add a timestamp to the
++            # version. Follow the PyPA version number rules, as this will make
++            # it easier to process with other tools. The version will have a
++            # `+` suffix once any official release has been made; a freshly
++            # forked main branch will have a version of 3.X.0a0.
++            if version.endswith("a0"):
++                version += "+"
++            if version.endswith("+"):
++                version += datetime.now(timezone.utc).strftime("%Y%m%d.%H%M%S")
 +
-+ABIs and Architectures
-+----------------------
++            return version
 +
-+tvOS apps can be deployed on physical devices, and on the tvOS simulator.
-+Although the API used on these devices is identical, the ABI is different - you
-+need to link against different libraries for an tvOS device build
-+(``appletvos``) or an tvOS simulator build (``appletvsimulator``). Apple uses
-+the XCframework format to allow specifying a single dependency that supports
-+multiple ABIs. An XCframework is a wrapper around multiple ABI-specific
-+frameworks.
++    sys.exit("Unable to determine Python version being packaged.")
 +
-+tvOS can also support different CPU architectures within each ABI. At present,
-+there is only a single support ed architecture on physical devices - ARM64.
++
++def lib_platform_files(dirname, names):
++    """A file filter that ignores platform-specific files in the lib directory."""
++    path = Path(dirname)
++    if (
++        path.parts[-3] == "lib"
++        and path.parts[-2].startswith("python")
++        and path.parts[-1] == "lib-dynload"
++    ):
++        return names
++    elif path.parts[-2] == "lib" and path.parts[-1].startswith("python"):
++        ignored_names = set(
++            name
++            for name in names
++            if (
++                name.startswith("_sysconfigdata_")
++                or name.startswith("_sysconfig_vars_")
++                or name == "build-details.json"
++            )
++        )
++    else:
++        ignored_names = set()
++
++    return ignored_names
++
++
++def lib_non_platform_files(dirname, names):
++    """A file filter that ignores anything *except* platform-specific files
++    in the lib directory.
++    """
++    path = Path(dirname)
++    if path.parts[-2] == "lib" and path.parts[-1].startswith("python"):
++        return set(names) - lib_platform_files(dirname, names) - {"lib-dynload"}
++    else:
++        return set()
++
++
++def create_xcframework(platform: str) -> str:
++    """Build an XCframework from the component parts for the platform.
++
++    :return: The version number of the Python verion that was packaged.
++    """
++    package_path = CROSS_BUILD_DIR / platform
++    try:
++        package_path.mkdir()
++    except FileExistsError:
++        raise RuntimeError(
++            f"{platform} XCframework already exists; do you need to run with --clean?"
++        ) from None
++
++    frameworks = []
++    # Merge Frameworks for each component SDK. If there's only one architecture
++    # for the SDK, we can use the compiled Python.framework as-is. However, if
++    # there's more than architecture, we need to merge the individual built
++    # frameworks into a merged "fat" framework.
++    for slice_name, slice_parts in HOSTS[platform].items():
++        # Some parts are the same across all slices, so we use can any of the
++        # host frameworks as the source for the merged version. Use the first
++        # one on the list, as it's as representative as any other.
++        first_host_triple, first_multiarch = next(iter(slice_parts.items()))
++        first_framework = (
++            framework_path(first_host_triple, first_multiarch) / "Python.framework"
++        )
++
++        if len(slice_parts) == 1:
++            # The first framework is the only framework, so copy it.
++            print(f"Copying framework for {slice_name}...")
++            frameworks.append(first_framework)
++        else:
++            print(f"Merging framework for {slice_name}...")
++            slice_path = CROSS_BUILD_DIR / slice_name
++            slice_framework = slice_path / "Python.framework"
++            slice_framework.mkdir(exist_ok=True, parents=True)
++
++            # Copy the Info.plist
++            shutil.copy(
++                first_framework / "Info.plist",
++                slice_framework / "Info.plist",
++            )
++
++            # Copy the headers
++            shutil.copytree(
++                first_framework / "Headers",
++                slice_framework / "Headers",
++            )
++
++            # Create the "fat" library binary for the slice
++            run(
++                ["lipo", "-create", "-output", slice_framework / "Python"]
++                + [
++                    (framework_path(host_triple, multiarch) / "Python.framework/Python")
++                    for host_triple, multiarch in slice_parts.items()
++                ]
++            )
++
++            # Add this merged slice to the list to be added to the XCframework
++            frameworks.append(slice_framework)
++
++    print()
++    print("Build XCframework...")
++    cmd = [
++        "xcodebuild",
++        "-create-xcframework",
++        "-output",
++        package_path / "Python.xcframework",
++    ]
++    for framework in frameworks:
++        cmd.extend(["-framework", framework])
++
++    run(cmd)
++
++    # Extract the package version from the merged framework
++    version = package_version(package_path / "Python.xcframework")
++    version_tag = ".".join(version.split(".")[:2])
++
++    # On non-macOS platforms, each framework in XCframework only contains the
++    # headers, libPython, plus an Info.plist. Other resources like the standard
++    # library and binary shims aren't allowed to live in framework; they need
++    # to be copied in separately.
++    print()
++    print("Copy additional resources...")
++    has_common_stdlib = False
++    for slice_name, slice_parts in HOSTS[platform].items():
++        # Some parts are the same across all slices, so we can any of the
++        # host frameworks as the source for the merged version.
++        first_host_triple, first_multiarch = next(iter(slice_parts.items()))
++        first_path = framework_path(first_host_triple, first_multiarch)
++        first_framework = first_path / "Python.framework"
++
++        slice_path = package_path / f"Python.xcframework/{slice_name}"
++        slice_framework = slice_path / "Python.framework"
++
++        # Copy the binary helpers
++        print(f" - {slice_name} binaries")
++        shutil.copytree(first_path / "bin", slice_path / "bin")
++
++        # Copy the include path (this will be a symlink to the framework headers)
++        print(f" - {slice_name} include files")
++        shutil.copytree(
++            first_path / "include",
++            slice_path / "include",
++            symlinks=True,
++        )
++
++        # Copy in the cross-architecture pyconfig.h
++        shutil.copy(
++            PYTHON_DIR / f"Apple/{platform}/Resources/pyconfig.h",
++            slice_framework / "Headers/pyconfig.h",
++        )
++
++        print(f" - {slice_name} architecture-specific files")
++        for host_triple, multiarch in slice_parts.items():
++            print(f"   - {multiarch} standard library")
++            arch, _ = multiarch.split("-", 1)
++
++            if not has_common_stdlib:
++                print("     - using this architecture as the common stdlib")
++                shutil.copytree(
++                    framework_path(host_triple, multiarch) / "lib",
++                    package_path / "Python.xcframework/lib",
++                    ignore=lib_platform_files,
++                )
++                has_common_stdlib = True
++
++            shutil.copytree(
++                framework_path(host_triple, multiarch) / "lib",
++                slice_path / f"lib-{arch}",
++                ignore=lib_non_platform_files,
++            )
++
++            # Copy the host's pyconfig.h to an architecture-specific name.
++            arch = multiarch.split("-")[0]
++            host_path = (
++                CROSS_BUILD_DIR
++                / host_triple
++                / f"Apple/{platform}/Frameworks"
++                / multiarch
++            )
++            host_framework = host_path / "Python.framework"
++            shutil.copy(
++                host_framework / "Headers/pyconfig.h",
++                slice_framework / f"Headers/pyconfig-{arch}.h",
++            )
++
++            # Apple identifies certain libraries as "security risks"; if you
++            # statically link those libraries into a Framework, you become
++            # responsible for providing a privacy manifest for that framework.
++            xcprivacy_file = {
++                "OpenSSL": subdir(host_triple) / "prefix/share/OpenSSL.xcprivacy"
++            }
++            print(f"   - {multiarch} xcprivacy files")
++            for module, lib in [
++                ("_hashlib", "OpenSSL"),
++                ("_ssl", "OpenSSL"),
++            ]:
++                shutil.copy(
++                    xcprivacy_file[lib],
++                    slice_path
++                    / f"lib-{arch}/python{version_tag}/lib-dynload/{module}.xcprivacy",
++                )
++
++    print(" - build tools")
++    shutil.copytree(
++        PYTHON_DIR / "Apple/testbed/Python.xcframework/build",
++        package_path / "Python.xcframework/build",
++    )
++
++    return version
++
++
++def package(context: argparse.Namespace) -> None:
++    """The implementation of the "package" command."""
++    if context.clean:
++        clean(context, "package")
++
++    with group("Building package"):
++        # Create an XCframework
++        version = create_xcframework(context.platform)
++
++        # watchOS doesn't have a testbed (yet!)
++        if context.platform != "watchOS":
++            # Clone testbed
++            print()
++            run(
++                [
++                    sys.executable,
++                    "Apple/testbed",
++                    "clone",
++                    "--platform",
++                    context.platform,
++                    "--framework",
++                    CROSS_BUILD_DIR / context.platform / "Python.xcframework",
++                    CROSS_BUILD_DIR / context.platform / "testbed",
++                ]
++            )
++
++        # Build the final archive
++        archive_name = (
++            CROSS_BUILD_DIR
++            / "dist"
++            / f"python-{version}-{context.platform}-XCframework"
++        )
++
++        print()
++        print("Create package archive...")
++        shutil.make_archive(
++            str(CROSS_BUILD_DIR / archive_name),
++            format="gztar",
++            root_dir=CROSS_BUILD_DIR / context.platform,
++            base_dir=".",
++        )
++        print()
++        print(f"{archive_name.relative_to(PYTHON_DIR)}.tar.gz created.")
++
++
++def build(context: argparse.Namespace, host: str | None = None) -> None:
++    """The implementation of the "build" command."""
++    if host is None:
++        host = context.host
++
++    if context.clean:
++        clean(context, host)
++
++    if host in {"all", "build"}:
++        for step in [
++            configure_build_python,
++            make_build_python,
++        ]:
++            step(context)
++
++    if host == "build":
++        hosts = []
++    elif host in {"all", "hosts"}:
++        hosts = all_host_triples(context.platform)
++    else:
++        hosts = [host]
++
++    for step_host in hosts:
++        for step in [
++            configure_host_python,
++            make_host_python,
++        ]:
++            step(context, host=step_host)
++
++    if host in {"all", "hosts"}:
++        package(context)
++
++
++def test(context: argparse.Namespace, host: str | None = None) -> None:
++    """The implementation of the "test" command."""
++    if host is None:
++        host = context.host
++
++    if context.clean:
++        clean(context, "test")
++
++    with group(f"Test {'XCframework' if host in {'all', 'hosts'} else host}"):
++        timestamp = str(time.time_ns())[:-6]
++        testbed_dir = CROSS_BUILD_DIR / f"{context.platform}-testbed.{timestamp}"
++        if host in {"all", "hosts"}:
++            framework_path = CROSS_BUILD_DIR / context.platform / "Python.xcframework"
++        else:
++            build_arch = platform.machine()
++            host_arch = host.split("-")[0]
++
++            if not host.endswith("-simulator"):
++                print("Skipping test suite non-simulator build.")
++                return
++            elif build_arch != host_arch:
++                print(
++                    f"Skipping test suite for an {host_arch} build "
++                    f"on an {build_arch} machine."
++                )
++                return
++            else:
++                framework_path = (
++                    CROSS_BUILD_DIR
++                    / host
++                    / f"Apple/{context.platform}"
++                    / f"Frameworks/{apple_multiarch(host)}"
++                )
++
++        run(
++            [
++                sys.executable,
++                "Apple/testbed",
++                "clone",
++                "--platform",
++                context.platform,
++                "--framework",
++                framework_path,
++                testbed_dir,
++            ]
++        )
++
++        run(
++            [
++                sys.executable,
++                testbed_dir,
++                "run",
++                "--verbose",
++            ]
++            + (["--simulator", str(context.simulator)] if context.simulator else [])
++            + [
++                "--",
++                "test",
++                # "--slow-ci" if context.slow else "--fast-ci",
++                # "--no-randomize",
++                "-uall",
++                "--rerun",
++                "-W",
++                "--single-process",
++                # Timeout handling requires subprocesses; explicitly setting
++                # the timeout to -1 disables the faulthandler.
++                "--timeout=-1",
++                # Adding Python options requires the use of a subprocess to
++                # start a new Python interpreter.
++                "--dont-add-python-opts",
++            ]
++        )
++
++
++def ci(context: argparse.Namespace) -> None:
++    """The implementation of the "ci" command."""
++    clean(context, "all")
++    build(context, host="all")
++    test(context, host="all")
++
++
++def parse_args() -> argparse.Namespace:
++    parser = argparse.ArgumentParser(
++        description=(
++            "A tool for managing the build, package and test process of "
++            "CPython on Apple platforms."
++        ),
++    )
++    parser.suggest_on_error = True
++    subcommands = parser.add_subparsers(dest="subcommand", required=True)
++
++    clean = subcommands.add_parser(
++        "clean",
++        help="Delete all build directories",
++    )
++
++    configure_build = subcommands.add_parser(
++        "configure-build", help="Run `configure` for the build Python"
++    )
++    subcommands.add_parser(
++        "make-build",
++        help="Run `make` for the build Python",
++    )
++    configure_host = subcommands.add_parser(
++        "configure-host",
++        help="Run `configure` for a specific platform and target",
++    )
++    make_host = subcommands.add_parser(
++        "make-host",
++        help="Run `make` for a specific platform and target",
++    )
++    package = subcommands.add_parser(
++        "package",
++        help="Create a release package for the platform",
++    )
++    build = subcommands.add_parser(
++        "build",
++        help="Build all platform targets and create the XCframework",
++    )
++    test = subcommands.add_parser(
++        "test",
++        help="Run the testbed for a specific platform",
++    )
++    ci = subcommands.add_parser(
++        "ci",
++        help="Run build, package, and test",
++    )
++
++    # platform argument
++    for cmd in [clean, configure_host, make_host, package, build, test, ci]:
++        cmd.add_argument(
++            "platform",
++            choices=HOSTS.keys(),
++            help="The target platform to build",
++        )
++
++    # host triple argument
++    for cmd in [configure_host, make_host]:
++        cmd.add_argument(
++            "host",
++            help="The host triple to build (e.g., arm64-apple-ios-simulator)",
++        )
++    # optional host triple argument
++    for cmd in [clean, build, test]:
++        cmd.add_argument(
++            "host",
++            nargs="?",
++            default="all",
++            help=(
++                "The host triple to build (e.g., arm64-apple-ios-simulator), "
++                "or 'build' for just the build platform, or 'hosts' for all "
++                "host platforms, or 'all' for the build platform and all "
++                "hosts. Defaults to 'all'"
++            ),
++        )
++
++    # --clean option
++    for cmd in [configure_build, configure_host, build, package, test, ci]:
++        cmd.add_argument(
++            "--clean",
++            action="store_true",
++            default=False,
++            dest="clean",
++            help="Delete the relevant build directories first",
++        )
++
++    # --cache-dir option
++    for cmd in [configure_host, build, ci]:
++        cmd.add_argument(
++            "--cache-dir",
++            default="./cross-build/downloads",
++            help="The directory to store cached downloads.",
++        )
++
++    # --simulator option
++    for cmd in [test, ci]:
++        cmd.add_argument(
++            "--simulator",
++            help=(
++                "The name of the simulator to use (eg: 'iPhone 16e'). Defaults to "
++                "the most recently released 'entry level' iPhone device. Device "
++                "architecture and OS version can also be specified; e.g., "
++                "`--simulator 'iPhone 16 Pro,arch=arm64,OS=26.0'` would run on "
++                "an ARM64 iPhone 16 Pro simulator running iOS 26.0."
++            ),
++        )
++        cmd.add_argument(
++            "--slow",
++            action="store_true",
++            help="Run tests with --slow-ci options.",
++        )
++
++    for subcommand in [configure_build, configure_host, build, ci]:
++        subcommand.add_argument(
++            "args", nargs="*", help="Extra arguments to pass to `configure`"
++        )
++
++    return parser.parse_args()
++
++
++def print_called_process_error(e: subprocess.CalledProcessError) -> None:
++    for stream_name in ["stdout", "stderr"]:
++        content = getattr(e, stream_name)
++        stream = getattr(sys, stream_name)
++        if content:
++            stream.write(content)
++            if not content.endswith("\n"):
++                stream.write("\n")
++
++    # shlex uses single quotes, so we surround the command with double quotes.
++    print(f'Command "{join_command(e.cmd)}" returned exit status {e.returncode}')
++
++
++def main() -> None:
++    # Handle SIGTERM the same way as SIGINT. This ensures that if we're
++    # terminated by the buildbot worker, we'll make an attempt to clean up our
++    # subprocesses.
++    def signal_handler(*args):
++        os.kill(os.getpid(), signal.SIGINT)
++
++    signal.signal(signal.SIGTERM, signal_handler)
++
++    # Process command line arguments
++    context = parse_args()
++    dispatch: dict[str, Callable] = {
++        "clean": clean,
++        "configure-build": configure_build_python,
++        "make-build": make_build_python,
++        "configure-host": configure_host_python,
++        "make-host": make_host_python,
++        "package": package,
++        "build": build,
++        "test": test,
++        "ci": ci,
++    }
++
++    try:
++        dispatch[context.subcommand](context)
++    except CalledProcessError as e:
++        print()
++        print_called_process_error(e)
++        sys.exit(1)
++    except RuntimeError as e:
++        print()
++        print(e)
++        sys.exit(2)
++
++
++if __name__ == "__main__":
++    main()
+--- /dev/null
++++ b/Apple/iOS/README.md
+@@ -0,0 +1,328 @@
++# Python on iOS README
++
++**iOS support is [tier 3](https://peps.python.org/pep-0011/#tier-3).**
++
++This document provides a quick overview of some iOS specific features in the
++Python distribution.
++
++These instructions are only needed if you're planning to compile Python for iOS
++yourself. Most users should *not* need to do this. If you're looking to
++experiment with writing an iOS app in Python, tools such as [BeeWare's
++Briefcase](https://briefcase.readthedocs.io) and [Kivy's
++Buildozer](https://buildozer.readthedocs.io) will provide a much more
++approachable user experience.
++
++## Compilers for building on iOS
++
++Building for iOS requires the use of Apple's Xcode tooling. It is strongly
++recommended that you use the most recent stable release of Xcode. This will
++require the use of the most (or second-most) recently released macOS version,
++as Apple does not maintain Xcode for older macOS versions. The Xcode Command
++Line Tools are not sufficient for iOS development; you need a *full* Xcode
++install.
++
++If you want to run your code on the iOS simulator, you'll also need to install
++an iOS Simulator Platform. You should be prompted to select an iOS Simulator
++Platform when you first run Xcode. Alternatively, you can add an iOS Simulator
++Platform by selecting an open the Platforms tab of the Xcode Settings panel.
++
++## Building Python on iOS
++
++### ABIs and Architectures
++
++iOS apps can be deployed on physical devices, and on the iOS simulator. Although
++the API used on these devices is identical, the ABI is different - you need to
++link against different libraries for an iOS device build (`iphoneos`) or an
++iOS simulator build (`iphonesimulator`).
++
++Apple uses the `XCframework` format to allow specifying a single dependency
++that supports multiple ABIs. An `XCframework` is a wrapper around multiple
++ABI-specific frameworks that share a common API.
++
++iOS can also support different CPU architectures within each ABI. At present,
++there is only a single supported architecture on physical devices - ARM64.
 +However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
-+Silicon machines), and x86_64 (for running on older Intel-based machines.)
++Silicon machines), and x86_64 (for running on older Intel-based machines).
 +
 +To support multiple CPU architectures on a single platform, Apple uses a "fat
 +binary" format - a single physical file that contains support for multiple
-+architectures.
++architectures. It is possible to compile and use a "thin" single architecture
++version of a binary for testing purposes; however, the "thin" binary will not be
++portable to machines using other architectures.
 +
-+How do I build Python for tvOS?
-+-------------------------------
++### Building a multi-architecture iOS XCframework
 +
-+The Python build system will build a ``Python.framework`` that supports a
-+*single* ABI with a *single* architecture. If you want to use Python in an tvOS
-+project, you need to:
++The `Apple` subfolder of the Python repository acts as a build script that
++can be used to coordinate the compilation of a complete iOS XCframework. To use
++it, run::
 +
-+1. Produce multiple ``Python.framework`` builds, one for each ABI and architecture;
-+2. Merge the binaries for each architecture on a given ABI into a single "fat" binary;
-+3. Merge the "fat" frameworks for each ABI into a single XCframework.
++  python Apple build iOS
 +
-+tvOS builds of Python *must* be constructed as framework builds. To support this,
-+you must provide the ``--enable-framework`` flag when configuring the build.
++This will:
 +
-+The build also requires the use of cross-compilation. The commands for building
-+Python for tvOS will look somethign like::
++* Configure and compile a version of Python to run on the build machine
++* Download pre-compiled binary dependencies for each platform
++* Configure and build a `Python.framework` for each required architecture and
++  iOS SDK
++* Merge the multiple `Python.framework` folders into a single `Python.xcframework`
++* Produce a `.tar.gz` archive in the `cross-build/dist` folder containing
++  the `Python.xcframework`, plus a copy of the Testbed app pre-configured to
++  use the XCframework.
 +
-+  $ ./configure \
-+        --enable-framework=/path/to/install \
-+        --host=aarch64-apple-tvos \
-+        --build=aarch64-apple-darwin \
-+        --with-build-python=/path/to/python.exe
-+  $ make
-+  $ make install
++The `Apple` build script has other entry points that will perform the
++individual parts of the overall `build` target, plus targets to test the
++build, clean the `cross-build` folder of iOS build products, and perform a
++complete "build and test" CI run. The `--clean` flag can also be used on
++individual commands to ensure that a stale build product are removed before
++building.
++
++### Building a single-architecture framework
++
++If you're using the `Apple` build script, you won't need to build
++individual frameworks. However, if you do need to manually configure an iOS
++Python build for a single framework, the following options are available.
++
++#### iOS specific arguments to configure
++
++* `--enable-framework[=DIR]`
++
++  This argument specifies the location where the Python.framework will be
++  installed. If `DIR` is not specified, the framework will be installed into
++  a subdirectory of the `iOS/Frameworks` folder.
++
++  This argument *must* be provided when configuring iOS builds. iOS does not
++  support non-framework builds.
++
++* `--with-framework-name=NAME`
++
++  Specify the name for the Python framework; defaults to `Python`.
++
++  > [!NOTE]
++  > Unless you know what you're doing, changing the name of the Python
++  > framework on iOS is not advised. If you use this option, you won't be able
++  > to run the `Apple` build script without making significant manual
++  > alterations, and you won't be able to use any binary packages unless you
++  > compile them yourself using your own framework name.
++
++#### Building Python for iOS
++
++The Python build system will create a `Python.framework` that supports a
++*single* ABI with a *single* architecture. Unlike macOS, iOS does not allow a
++framework to contain non-library content, so the iOS build will produce a
++`bin` and `lib` folder in the same output folder as `Python.framework`.
++The `lib` folder will be needed at runtime to support the Python library.
++
++If you want to use Python in a real iOS project, you need to produce multiple
++`Python.framework` builds, one for each ABI and architecture. iOS builds of
++Python *must* be constructed as framework builds. To support this, you must
++provide the `--enable-framework` flag when configuring the build. The build
++also requires the use of cross-compilation. The minimal commands for building
++Python for the ARM64 iOS simulator will look something like:
++```
++export PATH="$(pwd)/Apple/iOS/Resources/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin"
++./configure \
++    --enable-framework \
++    --host=arm64-apple-ios-simulator \
++    --build=arm64-apple-darwin \
++    --with-build-python=/path/to/python.exe
++make
++make install
++```
 +
 +In this invocation:
 +
-+* ``/path/to/install`` is the location where the final Python.framework will be
-+  output.
++* `Apple/iOS/Resources/bin` has been added to the path, providing some shims for the
++  compilers and linkers needed by the build. Xcode requires the use of `xcrun`
++  to invoke compiler tooling. However, if `xcrun` is pre-evaluated and the
++  result passed to `configure`, these results can embed user- and
++  version-specific paths into the sysconfig data, which limits the portability
++  of the compiled Python. Alternatively, if `xcrun` is used *as* the compiler,
++  it requires that compiler variables like `CC` include spaces, which can
++  cause significant problems with many C configuration systems which assume that
++  `CC` will be a single executable.
 +
-+* ``--host`` is the architecture and ABI that you want to build, in GNU compiler
++  To work around this problem, the `Apple/iOS/Resources/bin` folder contains some
++  wrapper scripts that present as simple compilers and linkers, but wrap
++  underlying calls to `xcrun`. This allows configure to use a `CC`
++  definition without spaces, and without user- or version-specific paths, while
++  retaining the ability to adapt to the local Xcode install. These scripts are
++  included in the `bin` directory of an iOS install.
++
++  These scripts will, by default, use the currently active Xcode installation.
++  If you want to use a different Xcode installation, you can use
++  `xcode-select` to set a new default Xcode globally, or you can use the
++  `DEVELOPER_DIR` environment variable to specify an Xcode install. The
++  scripts will use the default `iphoneos`/`iphonesimulator` SDK version for
++  the select Xcode install; if you want to use a different SDK, you can set the
++  `IOS_SDK_VERSION` environment variable. (e.g, setting
++  `IOS_SDK_VERSION=17.1` would cause the scripts to use the `iphoneos17.1`
++  and `iphonesimulator17.1` SDKs, regardless of the Xcode default.)
++
++  The path has also been cleared of any user customizations. A common source of
++  bugs is for tools like Homebrew to accidentally leak macOS binaries into an iOS
++  build. Resetting the path to a known "bare bones" value is the easiest way to
++  avoid these problems.
++
++* `--host` is the architecture and ABI that you want to build, in GNU compiler
 +  triple format. This will be one of:
 +
-+  - ``aarch64-apple-tvos`` for ARM64 tvOS devices.
-+  - ``aarch64-apple-tvos-simulator`` for the tvOS simulator running on Apple
++  - `arm64-apple-ios` for ARM64 iOS devices.
++  - `arm64-apple-ios-simulator` for the iOS simulator running on Apple
 +    Silicon devices.
-+  - ``x86_64-apple-tvos-simulator`` for the tvOS simulator running on Intel
++  - `x86_64-apple-ios-simulator` for the iOS simulator running on Intel
 +    devices.
 +
-+* ``--build`` is the GNU compiler triple for the machine that will be running
++* `--build` is the GNU compiler triple for the machine that will be running
 +  the compiler. This is one of:
 +
-+  - ``aarch64-apple-darwin`` for Apple Silicon devices.
-+  - ``x86_64-apple-darwin`` for Intel devices.
++  - `arm64-apple-darwin` for Apple Silicon devices.
++  - `x86_64-apple-darwin` for Intel devices.
 +
-+* ``/path/to/python.exe`` is the path to a Python binary on the machine that
++* `/path/to/python.exe` is the path to a Python binary on the machine that
 +  will be running the compiler. This is needed because the Python compilation
 +  process involves running some Python code. On a normal desktop build of
 +  Python, you can compile a python interpreter and then use that interpreter to
-+  run Python code. However, the binaries produced for tvOS won't run on macOS, so
++  run Python code. However, the binaries produced for iOS won't run on macOS, so
 +  you need to provide an external Python interpreter. This interpreter must be
-+  the version as the Python that is being compiled.
++  the same version as the Python that is being compiled. To be completely safe,
++  this should be the *exact* same commit hash. However, the longer a Python
++  release has been stable, the more likely it is that this constraint can be
++  relaxed - the same micro version will often be sufficient.
 +
-+Using a framework-based Python on tvOS
-+======================================
---- /dev/null
-+++ b/tvOS/Resources/Info.plist.in
-@@ -0,0 +1,34 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-+<plist version="0.9">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleExecutable</key>
-+	<string>Python</string>
-+	<key>CFBundleGetInfoString</key>
-+	<string>Python Runtime and Library</string>
-+	<key>CFBundleIdentifier</key>
-+	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundleName</key>
-+	<string>Python</string>
-+	<key>CFBundlePackageType</key>
-+	<string>FMWK</string>
-+	<key>CFBundleShortVersionString</key>
-+	<string>%VERSION%</string>
-+	<key>CFBundleLongVersionString</key>
-+	<string>%VERSION%, (c) 2001-2024 Python Software Foundation.</string>
-+	<key>CFBundleSignature</key>
-+	<string>????</string>
-+	<key>CFBundleVersion</key>
-+	<string>1</string>
-+	<key>CFBundleSupportedPlatforms</key>
-+	<array>
-+		<string>tvOS</string>
-+	</array>
-+	<key>MinimumOSVersion</key>
-+	<string>@TVOS_DEPLOYMENT_TARGET@</string>
-+</dict>
-+</plist>
---- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-ar
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvos${TVOS_SDK_VERSION} ar "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-clang
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-clang++
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvos${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-cpp
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos -E "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-ar
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} ar "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos-simulator "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang++
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos-simulator "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-cpp
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos-simulator -E "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-ar
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} ar "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos-simulator "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang++
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target x86_64-apple-tvos-simulator "$@"
---- /dev/null
-+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-cpp
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos-simulator -E "$@"
---- /dev/null
-+++ b/tvOS/Resources/dylib-Info-template.plist
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>en</string>
-+	<key>CFBundleExecutable</key>
-+	<string></string>
-+	<key>CFBundleIdentifier</key>
-+	<string></string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>6.0</string>
-+	<key>CFBundlePackageType</key>
-+	<string>APPL</string>
-+	<key>CFBundleShortVersionString</key>
-+	<string>1.0</string>
-+	<key>CFBundleSupportedPlatforms</key>
-+	<array>
-+		<string>tvOS</string>
-+	</array>
-+	<key>MinimumOSVersion</key>
-+	<string>9.0</string>
-+	<key>CFBundleVersion</key>
-+	<string>1</string>
-+</dict>
-+</plist>
---- /dev/null
-+++ b/tvOS/Resources/pyconfig.h
-@@ -0,0 +1,7 @@
-+#ifdef __arm64__
-+#include "pyconfig-arm64.h"
-+#endif
-+
-+#ifdef __x86_64__
-+#include "pyconfig-x86_64.h"
-+#endif
---- /dev/null
-+++ b/watchOS/README.rst
-@@ -0,0 +1,108 @@
-+========================
-+Python on watchOS README
-+========================
++* The `install` target for iOS builds is slightly different to other
++  platforms. On most platforms, `make install` will install the build into
++  the final runtime location. This won't be the case for iOS, as the final
++  runtime location will be on a physical device.
 +
-+:Authors:
-+    Russell Keith-Magee (2023-11)
++  However, you still need to run the `install` target for iOS builds, as it
++  performs some final framework assembly steps. The location specified with
++  `--enable-framework` will be the location where `make install` will
++  assemble the complete iOS framework. This completed framework can then
++  be copied and relocated as required.
 +
-+This document provides a quick overview of some watchOS specific features in the
-+Python distribution.
++For a full CPython build, you also need to specify the paths to iOS builds of
++the binary libraries that CPython depends on (such as XZ, LibFFI and OpenSSL).
++This can be done by defining library specific environment variables (such as
++`LIBLZMA_CFLAGS`, `LIBLZMA_LIBS`), and the `--with-openssl` configure
++option. Versions of these libraries pre-compiled for iOS can be found in [this
++repository](https://github.com/beeware/cpython-apple-source-deps/releases).
++LibFFI is especially important, as many parts of the standard library
++(including the `platform`, `sysconfig` and `webbrowser` modules) require
++the use of the `ctypes` module at runtime.
 +
-+Compilers for building on watchOS
-+=================================
++By default, Python will be compiled with an iOS deployment target (i.e., the
++minimum supported iOS version) of 13.0. To specify a different deployment
++target, provide the version number as part of the `--host` argument - for
++example, `--host=arm64-apple-ios15.4-simulator` would compile an ARM64
++simulator build with a deployment target of 15.4.
 +
-+Building for watchOS requires the use of Apple's Xcode tooling. It is strongly
-+recommended that you use the most recent stable release of Xcode, on the
-+most recently released macOS.
++## Testing Python on iOS
 +
-+watchOS specific arguments to configure
-+=======================================
++### Testing a multi-architecture framework
 +
-+* ``--enable-framework[=DIR]``
++Once you have a built an XCframework, you can test that framework by running:
 +
-+  This argument specifies the location where the Python.framework will
-+  be installed.
++  $ python Apple test iOS
 +
-+* ``--with-framework-name=NAME``
++### Testing a single-architecture framework
 +
-+  Specify the name for the python framework, defaults to ``Python``.
++The `Apple/testbed` folder that contains an Xcode project that is able to run
++the Python test suite on Apple platforms. This project converts the Python test
++suite into a single test case in Xcode's XCTest framework. The single XCTest
++passes if the test suite passes.
 +
++To run the test suite, configure a Python build for an iOS simulator (i.e.,
++`--host=arm64-apple-ios-simulator` or `--host=x86_64-apple-ios-simulator`
++), specifying a framework build (i.e. `--enable-framework`). Ensure that your
++`PATH` has been configured to include the `Apple/iOS/Resources/bin` folder and
++exclude any non-iOS tools, then run:
++```
++make all
++make install
++make testios
++```
 +
-+Building and using Python on watchOS
-+====================================
++This will:
 +
-+ABIs and Architectures
-+----------------------
++* Build an iOS framework for your chosen architecture;
++* Finalize the single-platform framework;
++* Make a clean copy of the testbed project;
++* Install the Python iOS framework into the copy of the testbed project; and
++* Run the test suite on an "entry-level device" simulator (i.e., an iPhone SE,
++  iPhone 16e, or a similar).
 +
-+watchOS apps can be deployed on physical devices, and on the watchOS simulator.
-+Although the API used on these devices is identical, the ABI is different - you
-+need to link against different libraries for an watchOS device build
-+(``watchos``) or an watchOS simulator build (``watchsimulator``). Apple uses the
-+XCframework format to allow specifying a single dependency that supports
-+multiple ABIs. An XCframework is a wrapper around multiple ABI-specific
-+frameworks.
++On success, the test suite will exit and report successful completion of the
++test suite. On a 2022 M1 MacBook Pro, the test suite takes approximately 15
++minutes to run; a couple of extra minutes is required to compile the testbed
++project, and then boot and prepare the iOS simulator.
 +
-+watchOS can also support different CPU architectures within each ABI. At present,
-+there is only a single support ed architecture on physical devices - ARM64.
-+However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
-+Silicon machines), and x86_64 (for running on older Intel-based machines.)
++### Debugging test failures
 +
-+To support multiple CPU architectures on a single platform, Apple uses a "fat
-+binary" format - a single physical file that contains support for multiple
-+architectures.
++Running `python Apple test iOS` generates a standalone version of the
++`Apple/testbed` project, and runs the full test suite. It does this using
++`Apple/testbed` itself - the folder is an executable module that can be used
++to create and run a clone of the testbed project. The standalone version of the
++testbed will be created in a directory named
++`cross-build/iOS-testbed.<timestamp>`.
 +
-+How do I build Python for watchOS?
-+-------------------------------
++You can generate your own standalone testbed instance by running:
++```
++python cross-build/iOS/testbed clone my-testbed
++```
 +
-+The Python build system will build a ``Python.framework`` that supports a
-+*single* ABI with a *single* architecture. If you want to use Python in an watchOS
-+project, you need to:
++In this invocation, `my-testbed` is the name of the folder for the new
++testbed clone.
 +
-+1. Produce multiple ``Python.framework`` builds, one for each ABI and architecture;
-+2. Merge the binaries for each architecture on a given ABI into a single "fat" binary;
-+3. Merge the "fat" frameworks for each ABI into a single XCframework.
++If you've built your own XCframework, or you only want to test a single architecture,
++you can construct a standalone testbed instance by running:
++```
++python Apple/testbed clone --platform iOS --framework <path/to/framework> my-testbed
++```
 +
-+watchOS builds of Python *must* be constructed as framework builds. To support this,
-+you must provide the ``--enable-framework`` flag when configuring the build.
++The framework path can be the path path to a `Python.xcframework`, or the
++path to a folder that contains a single-platform `Python.framework`.
 +
-+The build also requires the use of cross-compilation. The commands for building
-+Python for watchOS will look somethign like::
++You can then use the `my-testbed` folder to run the Python test suite,
++passing in any command line arguments you may require. For example, if you're
++trying to diagnose a failure in the `os` module, you might run:
++```
++python my-testbed run -- test -W test_os
++```
 +
-+  $ ./configure \
-+        --enable-framework=/path/to/install \
-+        --host=aarch64-apple-watchos \
-+        --build=aarch64-apple-darwin \
-+        --with-build-python=/path/to/python.exe
-+  $ make
-+  $ make install
++This is the equivalent of running `python -m test -W test_os` on a desktop
++Python build. Any arguments after the `--` will be passed to testbed as if
++they were arguments to `python -m` on a desktop machine.
 +
-+In this invocation:
++### Testing in Xcode
 +
-+* ``/path/to/install`` is the location where the final Python.framework will be
-+  output.
++You can also open the testbed project in Xcode by running:
++```
++open my-testbed/iOSTestbed.xcodeproj
++```
 +
-+* ``--host`` is the architecture and ABI that you want to build, in GNU compiler
-+  triple format. This will be one of:
++This will allow you to use the full Xcode suite of tools for debugging.
 +
-+  - ``arm64_32-apple-watchos`` for ARM64-32 watchOS devices.
-+  - ``aarch64-apple-watchos-simulator`` for the watchOS simulator running on Apple
-+    Silicon devices.
-+  - ``x86_64-apple-watchos-simulator`` for the watchOS simulator running on Intel
-+    devices.
++The arguments used to run the test suite are defined as part of the test plan.
++To modify the test plan, select the test plan node of the project tree (it
++should be the first child of the root node), and select the "Configurations"
++tab. Modify the "Arguments Passed On Launch" value to change the testing
++arguments.
 +
-+* ``--build`` is the GNU compiler triple for the machine that will be running
-+  the compiler. This is one of:
++The test plan also disables parallel testing, and specifies the use of the
++`Testbed.lldbinit` file for providing configuration of the debugger. The
++default debugger configuration disables automatic breakpoints on the
++`SIGINT`, `SIGUSR1`, `SIGUSR2`, and `SIGXFSZ` signals.
 +
-+  - ``aarch64-apple-darwin`` for Apple Silicon devices.
-+  - ``x86_64-apple-darwin`` for Intel devices.
++### Testing on an iOS device
 +
-+* ``/path/to/python.exe`` is the path to a Python binary on the machine that
-+  will be running the compiler. This is needed because the Python compilation
-+  process involves running some Python code. On a normal desktop build of
-+  Python, you can compile a python interpreter and then use that interpreter to
-+  run Python code. However, the binaries produced for watchOS won't run on macOS, so
-+  you need to provide an external Python interpreter. This interpreter must be
-+  the version as the Python that is being compiled.
++To test on an iOS device, the app needs to be signed with known developer
++credentials. To obtain these credentials, you must have an iOS Developer
++account, and your Xcode install will need to be logged into your account (see
++the Accounts tab of the Preferences dialog).
 +
-+Using a framework-based Python on watchOS
-+======================================
++Once the project is open, and you're signed into your Apple Developer account,
++select the root node of the project tree (labeled "iOSTestbed"), then the
++"Signing & Capabilities" tab in the details page. Select a development team
++(this will likely be your own name), and plug in a physical device to your
++macOS machine with a USB cable. You should then be able to select your physical
++device from the list of targets in the pulldown in the Xcode titlebar.
 --- /dev/null
-+++ b/watchOS/Resources/Info.plist.in
++++ b/Apple/iOS/Resources/Info.plist.in
 @@ -0,0 +1,34 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
@@ -1778,81 +1390,245 @@ index d417b4cd63e..294a06f5305 100644
 +	<key>CFBundleShortVersionString</key>
 +	<string>%VERSION%</string>
 +	<key>CFBundleLongVersionString</key>
-+	<string>%VERSION%, (c) 2001-2023 Python Software Foundation.</string>
++	<string>%VERSION%, (c) 2001-2024 Python Software Foundation.</string>
 +	<key>CFBundleSignature</key>
 +	<string>????</string>
 +	<key>CFBundleVersion</key>
 +	<string>%VERSION%</string>
 +	<key>CFBundleSupportedPlatforms</key>
 +	<array>
-+		<string>watchOS</string>
++		<string>iPhoneOS</string>
 +	</array>
 +	<key>MinimumOSVersion</key>
-+	<string>@WATCHOS_DEPLOYMENT_TARGET@</string>
++	<string>@IPHONEOS_DEPLOYMENT_TARGET@</string>
 +</dict>
 +</plist>
 --- /dev/null
-+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-ar
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-ar
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} ar "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} ar "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-clang
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target arm64-apple-watchos-simulator "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET} "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang++
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-clang++
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target arm64-apple-watchos-simulator "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} clang++ -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET} "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-cpp
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-cpp
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator clang -target arm64-apple-watchos-simulator -E "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET} -E "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-ar
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-ar
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchos${WATCHOS_SDK_VERSION} ar "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-clang
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-clang
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-clang++
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-clang++
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang++ -target arm64_32-apple-watchos "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang++ -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-cpp
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-cpp
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos -E "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target arm64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator -E "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-ar
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-simulator-strip
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} ar "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} strip -arch arm64 "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang
++++ b/Apple/iOS/Resources/bin/arm64-apple-ios-strip
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos-simulator "$@"
++#!/bin/sh
++xcrun --sdk iphoneos${IOS_SDK_VERSION} strip -arch arm64 "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang++
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-ar
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target x86_64-apple-watchos-simulator "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar "$@"
 --- /dev/null
-+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-cpp
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-clang
 @@ -0,0 +1,2 @@
-+#!/bin/bash
-+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos-simulator -E "$@"
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang++ -target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/iOS/Resources/bin/x86_64-apple-ios-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk iphonesimulator${IOS_SDK_VERSION} strip -arch x86_64 "$@"
+--- /dev/null
++++ b/Apple/iOS/Resources/pyconfig.h
+@@ -0,0 +1,7 @@
++#ifdef __arm64__
++#include "pyconfig-arm64.h"
++#endif
++
++#ifdef __x86_64__
++#include "pyconfig-x86_64.h"
++#endif
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/Info.plist
+@@ -0,0 +1,136 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>AvailableLibraries</key>
++	<array>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>ios-arm64</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>ios</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>ios-arm64_x86_64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++				<string>x86_64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>ios</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>tvos-arm64</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>tvos</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>tvos-arm64_x86_64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++				<string>x86_64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>tvos</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>xros-arm64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>xros</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>xros-arm64</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>xros</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>watchos-arm64_x86_64-simulator</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64</string>
++				<string>x86_64</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>watchos</string>
++			<key>SupportedPlatformVariant</key>
++			<string>simulator</string>
++		</dict>
++		<dict>
++			<key>BinaryPath</key>
++			<string>Python.framework/Python</string>
++			<key>LibraryIdentifier</key>
++			<string>watchos-arm64_32</string>
++			<key>LibraryPath</key>
++			<string>Python.framework</string>
++			<key>SupportedArchitectures</key>
++			<array>
++				<string>arm64_32</string>
++			</array>
++			<key>SupportedPlatform</key>
++			<string>watchos</string>
++		</dict>
++	</array>
++	<key>CFBundlePackageType</key>
++	<string>XFWK</string>
++	<key>XCFrameworkFormatVersion</key>
++	<string>1.0</string>
++</dict>
++</plist>
 --- /dev/null
-+++ b/watchOS/Resources/dylib-Info-template.plist
++++ b/Apple/testbed/Python.xcframework/build/iOS-dylib-Info-template.plist
 @@ -0,0 +1,26 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -1872,25 +1648,6204 @@ index d417b4cd63e..294a06f5305 100644
 +	<string>1.0</string>
 +	<key>CFBundleSupportedPlatforms</key>
 +	<array>
-+		<string>watchOS</string>
++		<string>iPhoneOS</string>
 +	</array>
 +	<key>MinimumOSVersion</key>
-+	<string>4.0</string>
++	<string>13.0</string>
 +	<key>CFBundleVersion</key>
 +	<string>1</string>
 +</dict>
 +</plist>
 --- /dev/null
-+++ b/watchOS/Resources/pyconfig.h
-@@ -0,0 +1,11 @@
-+#ifdef __arm64__
-+#  ifdef __LP64__
-+#include "pyconfig-arm64.h"
-+#  else
-+#include "pyconfig-arm64_32.h"
-+#  endif
-+#endif
-+
-+#ifdef __x86_64__
-+#include "pyconfig-x86_64.h"
-+#endif
++++ b/Apple/testbed/Python.xcframework/build/tvOS-dylib-Info-template.plist
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string></string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>tvOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>9.0</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/build/utils.sh
+@@ -0,0 +1,179 @@
++# Utility methods for use in an Xcode project.
++#
++# An iOS XCframework cannot include any content other than the library binary
++# and relevant metadata. However, Python requires a standard library at runtime.
++# Therefore, it is necessary to add a build step to an Xcode app target that
++# processes the standard library and puts the content into the final app.
++#
++# In general, these tools will be invoked after bundle resources have been
++# copied into the app, but before framework embedding (and signing).
++#
++# The following is an example script, assuming that:
++# * Python.xcframework is in the root of the project
++# * There is an `app` folder that contains the app code
++# * There is an `app_packages` folder that contains installed Python packages.
++# -----
++#   set -e
++#   source $PROJECT_DIR/Python.xcframework/build/build_utils.sh
++#   install_python Python.xcframework app app_packages
++# -----
++
++# Copy the standard library from the XCframework into the app bundle.
++#
++# Accepts one argument:
++# 1. The path, relative to the root of the Xcode project, where the Python
++#    XCframework can be found.
++install_stdlib() {
++    PYTHON_XCFRAMEWORK_PATH=$1
++
++    mkdir -p "$CODESIGNING_FOLDER_PATH/python/lib"
++    if [ "$EFFECTIVE_PLATFORM_NAME" = "-iphonesimulator" ]; then
++        echo "Installing Python modules for iOS Simulator"
++        if [ -d "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/ios-arm64-simulator" ]; then
++            SLICE_FOLDER="ios-arm64-simulator"
++        else
++            SLICE_FOLDER="ios-arm64_x86_64-simulator"
++        fi
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-iphoneos" ]; then
++        echo "Installing Python modules for iOS Device"
++        SLICE_FOLDER="ios-arm64"
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-appletvsimulator" ]; then
++        echo "Installing Python modules for tvOS Simulator"
++        if [ -d "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/tvos-arm64-simulator" ]; then
++            SLICE_FOLDER="tvos-arm64-simulator"
++        else
++            SLICE_FOLDER="tvos-arm64_x86_64-simulator"
++        fi
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-appletvos" ]; then
++        echo "Installing Python modules for tvOS Device"
++        SLICE_FOLDER="tvos-arm64"
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-watchsimulator" ]; then
++        echo "Installing Python modules for watchOS Simulator"
++        if [ -d "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/watchos-arm64-simulator" ]; then
++            SLICE_FOLDER="watchos-arm64-simulator"
++        else
++            SLICE_FOLDER="watchos-arm64_x86_64-simulator"
++        fi
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-watchos" ]; then
++        echo "Installing Python modules for watchOS Device"
++        SLICE_FOLDER="watchos-arm64"
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-xrsimulator" ]; then
++        echo "Installing Python modules for visionOS Simulator"
++        SLICE_FOLDER="xros-arm64-simulator"
++    elif [ "$EFFECTIVE_PLATFORM_NAME" = "-xros" ]; then
++        echo "Installing Python modules for visionOS Device"
++        SLICE_FOLDER="xros-arm64"
++    else
++        echo "Unsupported platform name $EFFECTIVE_PLATFORM_NAME"
++        exit 1
++    fi
++
++    # If the XCframework has a shared lib folder, then it's a full framework.
++    # Copy both the common and slice-specific part of the lib directory.
++    # Otherwise, it's a single-arch framework; use the "full" lib folder.
++    if [ -d "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/lib" ]; then
++        rsync -au --delete "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
++        rsync -au "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/$SLICE_FOLDER/lib-$ARCHS/" "$CODESIGNING_FOLDER_PATH/python/lib/"
++    else
++        rsync -au --delete "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/$SLICE_FOLDER/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
++    fi
++}
++
++# Convert a single .so library into a framework that iOS can load.
++#
++# Accepts three arguments:
++# 1. The path, relative to the root of the Xcode project, where the Python
++#    XCframework can be found.
++# 2. The base path, relative to the installed location in the app bundle, that
++#    needs to be processed. Any .so file found in this path (or a subdirectory
++#    of it) will be processed.
++# 2. The full path to a single .so file to process. This path should include
++#    the base path.
++install_dylib () {
++    PYTHON_XCFRAMEWORK_PATH=$1
++    INSTALL_BASE=$2
++    FULL_EXT=$3
++
++    # The name of the extension file
++    EXT=$(basename "$FULL_EXT")
++    # The name and location of the module
++    MODULE_PATH=$(dirname "$FULL_EXT")
++    MODULE_NAME=$(echo $EXT | cut -d "." -f 1)
++    # The location of the extension file, relative to the bundle
++    RELATIVE_EXT=${FULL_EXT#$CODESIGNING_FOLDER_PATH/}
++    # The path to the extension file, relative to the install base
++    PYTHON_EXT=${RELATIVE_EXT/$INSTALL_BASE/}
++    # The full dotted name of the extension module, constructed from the file path.
++    FULL_MODULE_NAME=$(echo $PYTHON_EXT | cut -d "." -f 1 | tr "/" ".");
++    # A bundle identifier; not actually used, but required by Xcode framework packaging
++    FRAMEWORK_BUNDLE_ID=$(echo $PRODUCT_BUNDLE_IDENTIFIER.$FULL_MODULE_NAME | tr "_" "-")
++    # The name of the framework folder.
++    FRAMEWORK_FOLDER="Frameworks/$FULL_MODULE_NAME.framework"
++
++    # If the framework folder doesn't exist, create it.
++    if [ ! -d "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER" ]; then
++        echo "Creating framework for $RELATIVE_EXT"
++        mkdir -p "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER"
++        cp "$PROJECT_DIR/$PYTHON_XCFRAMEWORK_PATH/build/$PLATFORM_FAMILY_NAME-dylib-Info-template.plist" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
++        plutil -replace CFBundleExecutable -string "$FULL_MODULE_NAME" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
++        plutil -replace CFBundleIdentifier -string "$FRAMEWORK_BUNDLE_ID" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
++    fi
++
++    echo "Installing binary for $FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
++    mv "$FULL_EXT" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
++    # Create a placeholder .fwork file where the .so was
++    echo "$FRAMEWORK_FOLDER/$FULL_MODULE_NAME" > ${FULL_EXT%.so}.fwork
++    # Create a back reference to the .so file location in the framework
++    echo "${RELATIVE_EXT%.so}.fwork" > "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME.origin"
++
++    # If the framework provides an xcprivacy file, install it.
++    if [ -e "$MODULE_PATH/$MODULE_NAME.xcprivacy" ]; then
++        echo "Installing XCPrivacy file for $FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
++        XCPRIVACY_FILE="$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/PrivacyInfo.xcprivacy"
++        if [ -e "$XCPRIVACY_FILE" ]; then
++          rm -rf "$XCPRIVACY_FILE"
++        fi
++        mv "$MODULE_PATH/$MODULE_NAME.xcprivacy" "$XCPRIVACY_FILE"
++    fi
++
++    echo "Signing framework as $EXPANDED_CODE_SIGN_IDENTITY_NAME ($EXPANDED_CODE_SIGN_IDENTITY)..."
++    /usr/bin/codesign --force --sign "$EXPANDED_CODE_SIGN_IDENTITY" ${OTHER_CODE_SIGN_FLAGS:-} -o runtime --timestamp=none --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER"
++}
++
++# Process all the dynamic libraries in a path into Framework format.
++#
++# Accepts two arguments:
++# 1. The path, relative to the root of the Xcode project, where the Python
++#    XCframework can be found.
++# 2. The base path, relative to the installed location in the app bundle, that
++#    needs to be processed. Any .so file found in this path (or a subdirectory
++#    of it) will be processed.
++process_dylibs () {
++    PYTHON_XCFRAMEWORK_PATH=$1
++    LIB_PATH=$2
++    find "$CODESIGNING_FOLDER_PATH/$LIB_PATH" -name "*.so" | while read FULL_EXT; do
++        install_dylib $PYTHON_XCFRAMEWORK_PATH "$LIB_PATH/" "$FULL_EXT"
++    done
++}
++
++# The entry point for post-processing a Python XCframework.
++#
++# Accepts 1 or more arguments:
++# 1. The path, relative to the root of the Xcode project, where the Python
++#    XCframework can be found. If the XCframework is in the root of the project,
++# 2+. The path of a package, relative to the root of the packaged app, that contains
++#     library content that should be processed for binary libraries.
++install_python() {
++    PYTHON_XCFRAMEWORK_PATH=$1
++    shift
++
++    install_stdlib $PYTHON_XCFRAMEWORK_PATH
++    PYTHON_VER=$(ls -1 "$CODESIGNING_FOLDER_PATH/python/lib")
++    echo "Install Python $PYTHON_VER standard library extension modules..."
++    process_dylibs $PYTHON_XCFRAMEWORK_PATH python/lib/$PYTHON_VER/lib-dynload
++
++    for package_path in $@; do
++        echo "Installing $package_path extension modules ..."
++        process_dylibs $PYTHON_XCFRAMEWORK_PATH $package_path
++    done
++}
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/build/watchOS-dylib-Info-template.plist
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string></string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>watchOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>4.0</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/build/xrOS-dylib-Info-template.plist
+@@ -0,0 +1,30 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleExecutable</key>
++	<string></string>
++	<key>CFBundleIdentifier</key>
++	<string></string>
++	<key>CFBundlePackageType</key>
++	<string>FMWK</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>XROS</string>
++	</array>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++	<key>MinimumOSVersion</key>
++	<string>2.0</string>
++	<key>UIDeviceFamily</key>
++	<array>
++		<integer>7</integer>
++	</array>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/ios-arm64/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling an iOS on-device
++build for testing purposes.
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/ios-arm64_x86_64-simulator/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling an iOS simulator
++build for testing purposes (either x86_64 or ARM64).
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/tvos-arm64/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling a tvOS
++on-device build for testing purposes.
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/tvos-arm64_x86_64-simulator/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling a tvOS
++simulator build for testing purposes (either x86_64 or ARM64).
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/watchos-arm64_32/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling a watchOS on-device
++build for testing purposes.
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/watchos-arm64_x86_64-simulator/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling a watchOS
++simulator build for testing purposes (either x86_64 or ARM64).
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/xros-arm64-simulator/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling an visionOS simulator
++build for testing purposes (either x86_64 or ARM64).
+--- /dev/null
++++ b/Apple/testbed/Python.xcframework/xros-arm64/README
+@@ -0,0 +1,4 @@
++This directory is intentionally empty.
++
++It should be used as a target for `--enable-framework` when compiling an visionOS on-device
++build for testing purposes.
+--- /dev/null
++++ b/Apple/testbed/Testbed.lldbinit
+@@ -0,0 +1,4 @@
++process handle SIGINT -n true -p true -s false
++process handle SIGUSR1 -n true -p true -s false
++process handle SIGUSR2 -n true -p true -s false
++process handle SIGXFSZ -n true -p true -s false
+--- /dev/null
++++ b/Apple/testbed/TestbedTests/TestbedTests.m
+@@ -0,0 +1,195 @@
++#import <XCTest/XCTest.h>
++#import <Python/Python.h>
++
++@interface TestbedTests : XCTestCase
++
++@end
++
++@implementation TestbedTests
++
++
++- (void)testPython {
++    const char **argv;
++    int exit_code;
++    int failed;
++    PyStatus status;
++    PyPreConfig preconfig;
++    PyConfig config;
++    PyObject *app_packages_path;
++    PyObject *method_args;
++    PyObject *result;
++    PyObject *site_module;
++    PyObject *site_addsitedir_attr;
++    PyObject *sys_module;
++    PyObject *sys_path_attr;
++    NSArray *test_args;
++    NSString *python_home;
++    NSString *path;
++    wchar_t *wtmp_str;
++
++    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
++
++    // Set some other common environment indicators to disable color, as the
++    // Xcode log can't display color. Stdout will report that it is *not* a
++    // TTY.
++    setenv("NO_COLOR", "1", true);
++    setenv("PYTHON_COLORS", "0", true);
++
++    // Arguments to pass into the test suite runner.
++    // argv[0] must identify the process; any subsequent arg
++    // will be handled as if it were an argument to `python -m test`
++    // The processInfo arguments contain the binary that is running,
++    // followed by the arguments defined in the test plan. This means:
++    //    run_module = test_args[1]
++    //    argv = ["Testbed"] + test_args[2:]
++    test_args = [[NSProcessInfo processInfo] arguments];
++    if (test_args == NULL) {
++        NSLog(@"Unable to identify test arguments.");
++    }
++    NSLog(@"Test arguments: %@", test_args);
++    argv = malloc(sizeof(char *) * ([test_args count] - 1));
++    argv[0] = "Testbed";
++    for (int i = 1; i < [test_args count] - 1; i++) {
++        argv[i] = [[test_args objectAtIndex:i+1] UTF8String];
++    }
++
++    // Generate an isolated Python configuration.
++    NSLog(@"Configuring isolated Python...");
++    PyPreConfig_InitIsolatedConfig(&preconfig);
++    PyConfig_InitIsolatedConfig(&config);
++
++    // Configure the Python interpreter:
++    // Enforce UTF-8 encoding for stderr, stdout, file-system encoding and locale.
++    // See https://docs.python.org/3/library/os.html#python-utf-8-mode.
++    preconfig.utf8_mode = 1;
++    // Don't buffer stdio. We want output to appears in the log immediately
++    config.buffered_stdio = 0;
++    // Don't write bytecode; we can't modify the app bundle
++    // after it has been signed.
++    config.write_bytecode = 0;
++    // Ensure that signal handlers are installed
++    config.install_signal_handlers = 1;
++    // Run the test module.
++    config.run_module = Py_DecodeLocale([[test_args objectAtIndex:1] UTF8String], NULL);
++    // For debugging - enable verbose mode.
++    // config.verbose = 1;
++
++    NSLog(@"Pre-initializing Python runtime...");
++    status = Py_PreInitialize(&preconfig);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to pre-initialize Python interpreter: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    // Set the home for the Python interpreter
++    python_home = [NSString stringWithFormat:@"%@/python", resourcePath, nil];
++    NSLog(@"PythonHome: %@", python_home);
++    wtmp_str = Py_DecodeLocale([python_home UTF8String], NULL);
++    status = PyConfig_SetString(&config, &config.home, wtmp_str);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to set PYTHONHOME: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
++
++    // Read the site config
++    status = PyConfig_Read(&config);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to read site config: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    NSLog(@"Configure argc/argv...");
++    status = PyConfig_SetBytesArgv(&config, [test_args count] - 1, (char**) argv);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to configure argc/argv: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    NSLog(@"Initializing Python runtime...");
++    status = Py_InitializeFromConfig(&config);
++    if (PyStatus_Exception(status)) {
++        XCTFail(@"Unable to initialize Python interpreter: %s", status.err_msg);
++        PyConfig_Clear(&config);
++        return;
++    }
++
++    // Add app_packages as a site directory. This both adds to sys.path,
++    // and ensures that any .pth files in that directory will be executed.
++    site_module = PyImport_ImportModule("site");
++    if (site_module == NULL) {
++        XCTFail(@"Could not import site module");
++        return;
++    }
++
++    site_addsitedir_attr = PyObject_GetAttrString(site_module, "addsitedir");
++    if (site_addsitedir_attr == NULL || !PyCallable_Check(site_addsitedir_attr)) {
++        XCTFail(@"Could not access site.addsitedir");
++        return;
++    }
++
++    path = [NSString stringWithFormat:@"%@/app_packages", resourcePath, nil];
++    NSLog(@"App packages path: %@", path);
++    wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
++    app_packages_path = PyUnicode_FromWideChar(wtmp_str, wcslen(wtmp_str));
++    if (app_packages_path == NULL) {
++        XCTFail(@"Could not convert app_packages path to unicode");
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
++
++    method_args = Py_BuildValue("(O)", app_packages_path);
++    if (method_args == NULL) {
++        XCTFail(@"Could not create arguments for site.addsitedir");
++        return;
++    }
++
++    result = PyObject_CallObject(site_addsitedir_attr, method_args);
++    if (result == NULL) {
++        XCTFail(@"Could not add app_packages directory using site.addsitedir");
++        return;
++    }
++
++    // Add test code to sys.path
++    sys_module = PyImport_ImportModule("sys");
++    if (sys_module == NULL) {
++        XCTFail(@"Could not import sys module");
++        return;
++    }
++
++    sys_path_attr = PyObject_GetAttrString(sys_module, "path");
++    if (sys_path_attr == NULL) {
++        XCTFail(@"Could not access sys.path");
++        return;
++    }
++
++    path = [NSString stringWithFormat:@"%@/app", resourcePath, nil];
++    NSLog(@"App path: %@", path);
++    wtmp_str = Py_DecodeLocale([path UTF8String], NULL);
++    failed = PyList_Insert(sys_path_attr, 0, PyUnicode_FromString([path UTF8String]));
++    if (failed) {
++        XCTFail(@"Unable to add app to sys.path");
++        return;
++    }
++    PyMem_RawFree(wtmp_str);
++
++    // Ensure the working directory is the app folder.
++    chdir([path UTF8String]);
++
++    // Start the test suite. Print a separator to differentiate Python startup logs from app logs
++    NSLog(@"---------------------------------------------------------------------------");
++
++    exit_code = Py_RunMain();
++    XCTAssertEqual(exit_code, 0, @"Test suite did not pass");
++
++    NSLog(@"---------------------------------------------------------------------------");
++
++    Py_Finalize();
++}
++
++
++@end
+--- /dev/null
++++ b/Apple/testbed/__main__.py
+@@ -0,0 +1,436 @@
++import argparse
++import json
++import re
++import shutil
++import subprocess
++import sys
++from pathlib import Path
++
++TEST_SLICES = {
++    "iOS": "ios-arm64_x86_64-simulator",
++    "tvOS": "tvos-arm64_x86_64-simulator",
++    "visionOS": "xros-arm64-simulator",
++    "watchOS": "watchos-arm64_x86_64-simulator",
++}
++
++DECODE_ARGS = ("UTF-8", "backslashreplace")
++
++# The system log prefixes each line:
++#   2025-01-17 16:14:29.093742+0800 iOSTestbed[23987:1fd393b4] ...
++#   2025-01-17 16:14:29.093742+0800 iOSTestbed[23987:1fd393b4] ...
++
++LOG_PREFIX_REGEX = re.compile(
++    r"^\d{4}-\d{2}-\d{2}"  # YYYY-MM-DD
++    r"\s+\d+:\d{2}:\d{2}\.\d+\+\d{4}"  # HH:MM:SS.ssssss+ZZZZ
++    r"\s+.*Testbed\[\d+:\w+\]"  # Process/thread ID
++)
++
++
++# Select a simulator device to use.
++def select_simulator_device(platform):
++    # List the testing simulators, in JSON format
++    raw_json = subprocess.check_output(["xcrun", "simctl", "list", "-j"])
++    json_data = json.loads(raw_json)
++
++    if platform == "iOS":
++        # Any iOS device will do; we'll look for "SE" devices - but the name isn't
++        # consistent over time. Older Xcode versions will use "iPhone SE (Nth
++        # generation)"; As of 2025, they've started using "iPhone 16e".
++        #
++        # When Xcode is updated after a new release, new devices will be available
++        # and old ones will be dropped from the set available on the latest iOS
++        # version. Select the one with the highest minimum runtime version - this
++        # is an indicator of the "newest" released device, which should always be
++        # supported on the "most recent" iOS version.
++        se_simulators = sorted(
++            (devicetype["minRuntimeVersion"], devicetype["name"])
++            for devicetype in json_data["devicetypes"]
++            if devicetype["productFamily"] == "iPhone"
++            and (
++                (
++                    "iPhone " in devicetype["name"]
++                    and devicetype["name"].endswith("e")
++                )
++                or "iPhone SE " in devicetype["name"]
++            )
++        )
++        simulator = se_simulators[-1][1]
++    elif platform == "tvOS":
++        # Find the most recent tvOS release.
++        simulators = sorted(
++            (devicetype["minRuntimeVersion"], devicetype["name"])
++            for devicetype in json_data["devicetypes"]
++            if devicetype["productFamily"] == "Apple TV"
++        )
++        simulator = simulators[-1][1]
++    elif platform == "visionOS":
++        # Find the most recent visionOS release.
++        simulators = sorted(
++            (devicetype["minRuntimeVersion"], devicetype["name"])
++            for devicetype in json_data["devicetypes"]
++            if devicetype["productFamily"] == "Apple Vision"
++        )
++        simulator = simulators[-1][1]
++    elif platform == "watchOS":
++        raise NotImplementedError(f"Don't know how to launch watchOS (yet)")
++    else:
++        raise ValueError(f"Unknown platform {platform}")
++
++    return simulator
++
++
++def xcode_test(location: Path, platform: str, simulator: str, verbose: bool):
++    # Build and run the test suite on the named simulator.
++    args = [
++        "-project",
++        str(location / f"{platform}Testbed.xcodeproj"),
++        "-scheme",
++        f"{platform}Testbed",
++        "-destination",
++        f"platform={platform} Simulator,name={simulator}",
++        "-derivedDataPath",
++        str(location / "DerivedData"),
++    ]
++    verbosity_args = [] if verbose else ["-quiet"]
++
++    print("Building test project...")
++    subprocess.run(
++        ["xcodebuild", "build-for-testing"] + args + verbosity_args,
++        check=True,
++    )
++
++    print("Running test project...")
++    # Test execution *can't* be run -quiet; verbose mode
++    # is how we see the output of the test output.
++    process = subprocess.Popen(
++        ["xcodebuild", "test-without-building"] + args,
++        stdout=subprocess.PIPE,
++        stderr=subprocess.STDOUT,
++    )
++    while line := (process.stdout.readline()).decode(*DECODE_ARGS):
++        # Strip the timestamp/process prefix from each log line
++        line = LOG_PREFIX_REGEX.sub("", line)
++        sys.stdout.write(line)
++        sys.stdout.flush()
++
++    status = process.wait(timeout=5)
++    exit(status)
++
++
++def copy(src, tgt):
++    """An all-purpose copy.
++
++    If src is a file, it is copied. If src is a symlink, it is copied *as a
++    symlink*. If src is a directory, the full tree is duplicated, with symlinks
++    being preserved.
++    """
++    if src.is_file() or src.is_symlink():
++        shutil.copyfile(src, tgt, follow_symlinks=False)
++    else:
++        shutil.copytree(src, tgt, symlinks=True)
++
++
++def clone_testbed(
++    source: Path,
++    target: Path,
++    framework: Path,
++    platform: str,
++    apps: list[Path],
++) -> None:
++    if target.exists():
++        print(f"{target} already exists; aborting without creating project.")
++        sys.exit(10)
++
++    if framework is None:
++        if not (
++            source / "Python.xcframework" / TEST_SLICES[platform] / "bin"
++        ).is_dir():
++            print(
++                f"The testbed being cloned ({source}) does not contain "
++                "a framework with slices. Re-run with --framework"
++            )
++            sys.exit(11)
++    else:
++        if not framework.is_dir():
++            print(f"{framework} does not exist.")
++            sys.exit(12)
++        elif not (
++            framework.suffix == ".xcframework"
++            or (framework / "Python.framework").is_dir()
++        ):
++            print(
++                f"{framework} is not an XCframework, "
++                f"or a simulator slice of a framework build."
++            )
++            sys.exit(13)
++
++    print("Cloning testbed project:")
++    print(f"  Cloning {source}...", end="")
++    # Only copy the files for the platform being cloned plus the files common
++    # to all platforms. The XCframework will be copied later, if needed.
++    target.mkdir(parents=True)
++
++    for name in [
++        "__main__.py",
++        "TestbedTests",
++        "Testbed.lldbinit",
++        f"{platform}Testbed",
++        f"{platform}Testbed.xcodeproj",
++        f"{platform}Testbed.xctestplan",
++    ]:
++        copy(source / name, target / name)
++
++    print(" done")
++
++    orig_xc_framework_path = source / "Python.xcframework"
++    xc_framework_path = target / "Python.xcframework"
++    test_framework_path = xc_framework_path / TEST_SLICES[platform]
++    if framework is not None:
++        if framework.suffix == ".xcframework":
++            print("  Installing XCFramework...", end="")
++            xc_framework_path.symlink_to(
++                framework.relative_to(xc_framework_path.parent, walk_up=True)
++            )
++            print(" done")
++        else:
++            print("  Installing simulator framework...", end="")
++            # We're only installing a slice of a framework; we need
++            # to do a full tree copy to make sure we don't damage
++            # symlinked content.
++            shutil.copytree(orig_xc_framework_path, xc_framework_path)
++            if test_framework_path.is_dir():
++                shutil.rmtree(test_framework_path)
++            else:
++                test_framework_path.unlink(missing_ok=True)
++            test_framework_path.symlink_to(
++                framework.relative_to(test_framework_path.parent, walk_up=True)
++            )
++            print(" done")
++    else:
++        copy(orig_xc_framework_path, xc_framework_path)
++
++        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="")
++            resolved_xc_framework_path = (
++                source / xc_framework_path.readlink()
++            ).resolve()
++            xc_framework_path.unlink()
++            xc_framework_path.symlink_to(
++                resolved_xc_framework_path.relative_to(
++                    xc_framework_path.parent, walk_up=True
++                )
++            )
++            print(" done")
++        elif (
++            test_framework_path.is_symlink()
++            and not test_framework_path.readlink().is_absolute()
++        ):
++            print("  Rewriting symlink to simulator framework...", end="")
++            # Simulator framework is a relative symlink. Rewrite the symlink
++            # relative to the new location.
++            orig_test_framework_path = (
++                source / "Python.XCframework" / test_framework_path.readlink()
++            ).resolve()
++            test_framework_path.unlink()
++            test_framework_path.symlink_to(
++                orig_test_framework_path.relative_to(
++                    test_framework_path.parent, walk_up=True
++                )
++            )
++            print(" done")
++        else:
++            print("  Using pre-existing Python framework.")
++
++    for app_src in apps:
++        print(f"  Installing app {app_src.name!r}...", end="")
++        app_target = target / f"Testbed/app/{app_src.name}"
++        if app_target.is_dir():
++            shutil.rmtree(app_target)
++        shutil.copytree(app_src, app_target)
++        print(" done")
++
++    print(f"Successfully cloned testbed: {target.resolve()}")
++
++
++def update_test_plan(testbed_path, platform, args):
++    # Modify the test plan to use the requested test arguments.
++    test_plan_path = testbed_path / f"{platform}Testbed.xctestplan"
++    with test_plan_path.open("r", encoding="utf-8") as f:
++        test_plan = json.load(f)
++
++    test_plan["defaultOptions"]["commandLineArgumentEntries"] = [
++        {"argument": arg} for arg in args
++    ]
++
++    with test_plan_path.open("w", encoding="utf-8") as f:
++        json.dump(test_plan, f, indent=2)
++
++
++def run_testbed(
++    platform: str,
++    simulator: str | None,
++    args: list[str],
++    verbose: bool = False,
++):
++    location = Path(__file__).parent
++    print("Updating test plan...", end="")
++    update_test_plan(location, platform, args)
++    print(" done.")
++
++    if simulator is None:
++        simulator = select_simulator_device(platform)
++    print(f"Running test on {simulator}")
++
++    xcode_test(
++        location,
++        platform=platform,
++        simulator=simulator,
++        verbose=verbose,
++    )
++
++
++def main():
++    # Look for directories like `iOSTestbed` as an indicator of the platforms
++    # that the testbed folder supports. The original source testbed can support
++    # many platforms, but when cloned, only one platform is preserved.
++    available_platforms = [
++        platform
++        for platform in ["iOS", "tvOS", "visionOS", "watchOS"]
++        if (Path(__file__).parent / f"{platform}Testbed").is_dir()
++    ]
++
++    parser = argparse.ArgumentParser(
++        description=(
++            "Manages the process of testing an Apple Python project through Xcode."
++        ),
++    )
++
++    subcommands = parser.add_subparsers(dest="subcommand")
++    clone = subcommands.add_parser(
++        "clone",
++        description=(
++            "Clone the testbed project, copying in a Python framework and"
++            "any specified application code."
++        ),
++        help="Clone a testbed project to a new location.",
++    )
++    clone.add_argument(
++        "--framework",
++        help=(
++            "The location of the XCFramework (or simulator-only slice of an "
++            "XCFramework) to use when running the testbed"
++        ),
++    )
++    clone.add_argument(
++        "--platform",
++        dest="platform",
++        choices=available_platforms,
++        default=available_platforms[0],
++        help=f"The platform to target (default: {available_platforms[0]})",
++    )
++    clone.add_argument(
++        "--app",
++        dest="apps",
++        action="append",
++        default=[],
++        help="The location of any code to include in the testbed project",
++    )
++    clone.add_argument(
++        "location",
++        help="The path where the testbed will be cloned.",
++    )
++
++    run = subcommands.add_parser(
++        "run",
++        usage="%(prog)s [-h] [--simulator SIMULATOR] -- <test arg> [<test arg> ...]",
++        description=(
++            "Run a testbed project. The arguments provided after `--` will be "
++            "passed to the running test process as if they were arguments to "
++            "`python -m`."
++        ),
++        help="Run a testbed project",
++    )
++    run.add_argument(
++        "--platform",
++        dest="platform",
++        choices=available_platforms,
++        default=available_platforms[0],
++        help=f"The platform to target (default: {available_platforms[0]})",
++    )
++    run.add_argument(
++        "--simulator",
++        help=(
++            "The name of the simulator to use (eg: 'iPhone 16e'). Defaults to "
++            "the most recently released 'entry level' iPhone device. Device "
++            "architecture and OS version can also be specified; e.g., "
++            "`--simulator 'iPhone 16 Pro,arch=arm64,OS=26.0'` would run on "
++            "an ARM64 iPhone 16 Pro simulator running iOS 26.0."
++        ),
++    )
++    run.add_argument(
++        "-v",
++        "--verbose",
++        action="store_true",
++        help="Enable verbose output",
++    )
++
++    try:
++        pos = sys.argv.index("--")
++        testbed_args = sys.argv[1:pos]
++        test_args = sys.argv[pos + 1 :]
++    except ValueError:
++        testbed_args = sys.argv[1:]
++        test_args = []
++
++    context = parser.parse_args(testbed_args)
++
++    if context.subcommand == "clone":
++        clone_testbed(
++            source=Path(__file__).parent.resolve(),
++            target=Path(context.location).resolve(),
++            framework=Path(context.framework).resolve()
++            if context.framework
++            else None,
++            platform=context.platform,
++            apps=[Path(app) for app in context.apps],
++        )
++    elif context.subcommand == "run":
++        if test_args:
++            if not (
++                Path(__file__).parent
++                / "Python.xcframework"
++                / TEST_SLICES[context.platform]
++                / "bin"
++            ).is_dir():
++                print(
++                    f"Testbed does not contain a compiled Python framework. Use "
++                    f"`python {sys.argv[0]} clone ...` to create a runnable "
++                    f"clone of this testbed."
++                )
++                sys.exit(20)
++
++            run_testbed(
++                platform=context.platform,
++                simulator=context.simulator,
++                verbose=context.verbose,
++                args=test_args,
++            )
++        else:
++            print(
++                f"Must specify test arguments (e.g., {sys.argv[0]} run -- test)"
++            )
++            print()
++            parser.print_help(sys.stderr)
++            sys.exit(21)
++    else:
++        parser.print_help(sys.stderr)
++        sys.exit(1)
++
++
++if __name__ == "__main__":
++    main()
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed.xcodeproj/project.pbxproj
+@@ -0,0 +1,557 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 56;
++	objects = {
++
++/* Begin PBXBuildFile section */
++		607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66162B0EFA380010BFC8 /* AppDelegate.m */; };
++		607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607A66212B0EFA390010BFC8 /* Assets.xcassets */; };
++		607A66252B0EFA390010BFC8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */; };
++		607A66282B0EFA390010BFC8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66272B0EFA390010BFC8 /* main.m */; };
++		607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66312B0EFA3A0010BFC8 /* TestbedTests.m */; };
++		607A664C2B0EFC080010BFC8 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; };
++		607A664D2B0EFC080010BFC8 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		607A66502B0EFFE00010BFC8 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; };
++		607A66512B0EFFE00010BFC8 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		608619542CB77BA900F46182 /* app_packages in Resources */ = {isa = PBXBuildFile; fileRef = 608619532CB77BA900F46182 /* app_packages */; };
++		608619562CB7819B00F46182 /* app in Resources */ = {isa = PBXBuildFile; fileRef = 608619552CB7819B00F46182 /* app */; };
++/* End PBXBuildFile section */
++
++/* Begin PBXContainerItemProxy section */
++		607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = 607A660A2B0EFA380010BFC8 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = 607A66112B0EFA380010BFC8;
++			remoteInfo = iOSTestbed;
++		};
++/* End PBXContainerItemProxy section */
++
++/* Begin PBXCopyFilesBuildPhase section */
++		607A664E2B0EFC080010BFC8 /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				607A664D2B0EFC080010BFC8 /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A66522B0EFFE00010BFC8 /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				607A66512B0EFFE00010BFC8 /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXCopyFilesBuildPhase section */
++
++/* Begin PBXFileReference section */
++		607A66122B0EFA380010BFC8 /* iOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66152B0EFA380010BFC8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
++		607A66162B0EFA380010BFC8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
++		607A66212B0EFA390010BFC8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
++		607A66242B0EFA390010BFC8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
++		607A66272B0EFA390010BFC8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
++		607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iOSTestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66312B0EFA3A0010BFC8 /* TestbedTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestbedTests.m; sourceTree = "<group>"; };
++		607A664A2B0EFB310010BFC8 /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
++		607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iOSTestbed-Info.plist"; sourceTree = "<group>"; };
++		608619532CB77BA900F46182 /* app_packages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app_packages; sourceTree = "<group>"; };
++		608619552CB7819B00F46182 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app; sourceTree = "<group>"; };
++		60FE0EFB2E56BB6D00524F87 /* iOSTestbed.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = iOSTestbed.xctestplan; sourceTree = "<group>"; };
++/* End PBXFileReference section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		607A660F2B0EFA380010BFC8 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A664C2B0EFC080010BFC8 /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A662A2B0EFA3A0010BFC8 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66502B0EFFE00010BFC8 /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		607A66092B0EFA380010BFC8 = {
++			isa = PBXGroup;
++			children = (
++				60FE0EFB2E56BB6D00524F87 /* iOSTestbed.xctestplan */,
++				607A664A2B0EFB310010BFC8 /* Python.xcframework */,
++				607A66142B0EFA380010BFC8 /* iOSTestbed */,
++				607A66302B0EFA3A0010BFC8 /* TestbedTests */,
++				607A66132B0EFA380010BFC8 /* Products */,
++				607A664F2B0EFFE00010BFC8 /* Frameworks */,
++			);
++			sourceTree = "<group>";
++		};
++		607A66132B0EFA380010BFC8 /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				607A66122B0EFA380010BFC8 /* iOSTestbed.app */,
++				607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		607A66142B0EFA380010BFC8 /* iOSTestbed */ = {
++			isa = PBXGroup;
++			children = (
++				608619552CB7819B00F46182 /* app */,
++				608619532CB77BA900F46182 /* app_packages */,
++				607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */,
++				607A66152B0EFA380010BFC8 /* AppDelegate.h */,
++				607A66162B0EFA380010BFC8 /* AppDelegate.m */,
++				607A66212B0EFA390010BFC8 /* Assets.xcassets */,
++				607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */,
++				607A66272B0EFA390010BFC8 /* main.m */,
++			);
++			path = iOSTestbed;
++			sourceTree = "<group>";
++		};
++		607A66302B0EFA3A0010BFC8 /* TestbedTests */ = {
++			isa = PBXGroup;
++			children = (
++				607A66312B0EFA3A0010BFC8 /* TestbedTests.m */,
++			);
++			path = TestbedTests;
++			sourceTree = "<group>";
++		};
++		607A664F2B0EFFE00010BFC8 /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		607A66112B0EFA380010BFC8 /* iOSTestbed */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "iOSTestbed" */;
++			buildPhases = (
++				607A660E2B0EFA380010BFC8 /* Sources */,
++				607A660F2B0EFA380010BFC8 /* Frameworks */,
++				607A66102B0EFA380010BFC8 /* Resources */,
++				607A66552B0F061D0010BFC8 /* Process Python libraries */,
++				607A664E2B0EFC080010BFC8 /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = iOSTestbed;
++			productName = iOSTestbed;
++			productReference = 607A66122B0EFA380010BFC8 /* iOSTestbed.app */;
++			productType = "com.apple.product-type.application";
++		};
++		607A662C2B0EFA3A0010BFC8 /* iOSTestbedTests */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "iOSTestbedTests" */;
++			buildPhases = (
++				607A66292B0EFA3A0010BFC8 /* Sources */,
++				607A662A2B0EFA3A0010BFC8 /* Frameworks */,
++				607A662B2B0EFA3A0010BFC8 /* Resources */,
++				607A66522B0EFFE00010BFC8 /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++				607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */,
++			);
++			name = iOSTestbedTests;
++			productName = iOSTestbedTests;
++			productReference = 607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */;
++			productType = "com.apple.product-type.bundle.unit-test";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		607A660A2B0EFA380010BFC8 /* Project object */ = {
++			isa = PBXProject;
++			attributes = {
++				BuildIndependentTargetsInParallel = 1;
++				LastUpgradeCheck = 1500;
++				TargetAttributes = {
++					607A66112B0EFA380010BFC8 = {
++						CreatedOnToolsVersion = 15.0.1;
++					};
++					607A662C2B0EFA3A0010BFC8 = {
++						CreatedOnToolsVersion = 15.0.1;
++						TestTargetID = 607A66112B0EFA380010BFC8;
++					};
++				};
++			};
++			buildConfigurationList = 607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "iOSTestbed" */;
++			compatibilityVersion = "Xcode 14.0";
++			developmentRegion = en;
++			hasScannedForEncodings = 0;
++			knownRegions = (
++				en,
++				Base,
++			);
++			mainGroup = 607A66092B0EFA380010BFC8;
++			productRefGroup = 607A66132B0EFA380010BFC8 /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				607A66112B0EFA380010BFC8 /* iOSTestbed */,
++				607A662C2B0EFA3A0010BFC8 /* iOSTestbedTests */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		607A66102B0EFA380010BFC8 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66252B0EFA390010BFC8 /* LaunchScreen.storyboard in Resources */,
++				608619562CB7819B00F46182 /* app in Resources */,
++				607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */,
++				608619542CB77BA900F46182 /* app_packages in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A662B2B0EFA3A0010BFC8 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXShellScriptBuildPhase section */
++		607A66552B0F061D0010BFC8 /* Process Python libraries */ = {
++			isa = PBXShellScriptBuildPhase;
++			alwaysOutOfDate = 1;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputFileListPaths = (
++			);
++			inputPaths = (
++			);
++			name = "Process Python libraries";
++			outputFileListPaths = (
++			);
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "set -e\nsource $PROJECT_DIR/Python.xcframework/build/utils.sh\ninstall_python Python.xcframework app app_packages\n";
++			showEnvVarsInLog = 0;
++		};
++/* End PBXShellScriptBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		607A660E2B0EFA380010BFC8 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */,
++				607A66282B0EFA390010BFC8 /* main.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A66292B0EFA3A0010BFC8 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin PBXTargetDependency section */
++		607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = 607A66112B0EFA380010BFC8 /* iOSTestbed */;
++			targetProxy = 607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */;
++		};
++/* End PBXTargetDependency section */
++
++/* Begin PBXVariantGroup section */
++		607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */ = {
++			isa = PBXVariantGroup;
++			children = (
++				607A66242B0EFA390010BFC8 /* Base */,
++			);
++			name = LaunchScreen.storyboard;
++			sourceTree = "<group>";
++		};
++/* End PBXVariantGroup section */
++
++/* Begin XCBuildConfiguration section */
++		607A663F2B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = dwarf;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = YES;
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = (
++					"DEBUG=1",
++					"$(inherited)",
++				);
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
++				MTL_FAST_MATH = YES;
++				ONLY_ACTIVE_ARCH = YES;
++				SDKROOT = iphoneos;
++			};
++			name = Debug;
++		};
++		607A66402B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				ENABLE_NS_ASSERTIONS = NO;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = YES;
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = NO;
++				MTL_FAST_MATH = YES;
++				SDKROOT = iphoneos;
++				VALIDATE_PRODUCT = YES;
++			};
++			name = Release;
++		};
++		607A66422B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = "";
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				INFOPLIST_FILE = "iOSTestbed/iOSTestbed-Info.plist";
++				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 3.13.0a1;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = "1,2";
++			};
++			name = Debug;
++		};
++		607A66432B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = "";
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				INFOPLIST_FILE = "iOSTestbed/iOSTestbed-Info.plist";
++				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 3.13.0a1;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = "1,2";
++			};
++			name = Release;
++		};
++		607A66452B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = 3HEZE76D99;
++				GENERATE_INFOPLIST_FILE = YES;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = "1,2";
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/iOSTestbed";
++			};
++			name = Debug;
++		};
++		607A66462B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = 3HEZE76D99;
++				GENERATE_INFOPLIST_FILE = YES;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.iOSTestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = "1,2";
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/iOSTestbed";
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "iOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A663F2B0EFA3A0010BFC8 /* Debug */,
++				607A66402B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "iOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A66422B0EFA3A0010BFC8 /* Debug */,
++				607A66432B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "iOSTestbedTests" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A66452B0EFA3A0010BFC8 /* Debug */,
++				607A66462B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = 607A660A2B0EFA380010BFC8 /* Project object */;
++}
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed.xcodeproj/xcshareddata/xcschemes/iOSTestbed.xcscheme
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   LastUpgradeVersion = "1640"
++   version = "1.7">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES"
++      buildArchitectures = "Automatic">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++               BuildableName = "iOSTestbed.app"
++               BlueprintName = "iOSTestbed"
++               ReferencedContainer = "container:iOSTestbed.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      customLLDBInitFile = "$(SOURCE_ROOT)/Testbed.lldbinit"
++      shouldUseLaunchSchemeArgsEnv = "YES">
++      <TestPlans>
++         <TestPlanReference
++            reference = "container:iOSTestbed.xctestplan"
++            default = "YES">
++         </TestPlanReference>
++      </TestPlans>
++      <Testables>
++         <TestableReference
++            skipped = "NO"
++            parallelizable = "NO">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "607A662C2B0EFA3A0010BFC8"
++               BuildableName = "iOSTestbedTests.xctest"
++               BlueprintName = "iOSTestbedTests"
++               ReferencedContainer = "container:iOSTestbed.xcodeproj">
++            </BuildableReference>
++         </TestableReference>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      debugServiceExtension = "internal"
++      allowLocationSimulation = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++            BuildableName = "iOSTestbed.app"
++            BlueprintName = "iOSTestbed"
++            ReferencedContainer = "container:iOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </LaunchAction>
++   <ProfileAction
++      buildConfiguration = "Release"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      debugDocumentVersioning = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++            BuildableName = "iOSTestbed.app"
++            BlueprintName = "iOSTestbed"
++            ReferencedContainer = "container:iOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed.xctestplan
+@@ -0,0 +1,46 @@
++{
++  "configurations" : [
++    {
++      "id" : "F5A95CE4-1ADE-4A6E-A0E1-CDBAE26DF0C5",
++      "name" : "Test Scheme Action",
++      "options" : {
++
++      }
++    }
++  ],
++  "defaultOptions" : {
++    "commandLineArgumentEntries" : [
++      {
++        "argument" : "test"
++      },
++      {
++        "argument" : "-uall"
++      },
++      {
++        "argument" : "--single-process"
++      },
++      {
++        "argument" : "--rerun"
++      },
++      {
++        "argument" : "-W"
++      }
++    ],
++    "targetForVariableExpansion" : {
++      "containerPath" : "container:iOSTestbed.xcodeproj",
++      "identifier" : "607A66112B0EFA380010BFC8",
++      "name" : "iOSTestbed"
++    }
++  },
++  "testTargets" : [
++    {
++      "parallelizable" : false,
++      "target" : {
++        "containerPath" : "container:iOSTestbed.xcodeproj",
++        "identifier" : "607A662C2B0EFA3A0010BFC8",
++        "name" : "iOSTestbedTests"
++      }
++    }
++  ],
++  "version" : 1
++}
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/AppDelegate.h
+@@ -0,0 +1,11 @@
++//
++//  AppDelegate.h
++//  iOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++
++@interface AppDelegate : UIResponder <UIApplicationDelegate>
++
++
++@end
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/AppDelegate.m
+@@ -0,0 +1,19 @@
++//
++//  AppDelegate.m
++//  iOSTestbed
++//
++
++#import "AppDelegate.h"
++
++@interface AppDelegate ()
++
++@end
++
++@implementation AppDelegate
++
++
++- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
++    return YES;
++}
++
++@end
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/Assets.xcassets/AccentColor.colorset/Contents.json
+@@ -0,0 +1,11 @@
++{
++  "colors" : [
++    {
++      "idiom" : "universal"
++    }
++  ],
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/Assets.xcassets/AppIcon.appiconset/Contents.json
+@@ -0,0 +1,13 @@
++{
++  "images" : [
++    {
++      "idiom" : "universal",
++      "platform" : "ios",
++      "size" : "1024x1024"
++    }
++  ],
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/Assets.xcassets/Contents.json
+@@ -0,0 +1,6 @@
++{
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/Base.lproj/LaunchScreen.storyboard
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
++    <device id="retina6_12" orientation="portrait" appearance="light"/>
++    <dependencies>
++        <deployment identifier="iOS"/>
++        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
++    </dependencies>
++    <scenes/>
++</document>
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/app/README
+@@ -0,0 +1,7 @@
++This folder can contain any Python application code.
++
++During the build, any binary modules found in this folder will be processed into
++Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH, and will be the
++working directory for the test suite.
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/app_packages/README
+@@ -0,0 +1,7 @@
++This folder can be a target for installing any Python dependencies needed by the
++test suite.
++
++During the build, any binary modules found in this folder will be processed into
++Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH.
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/iOSTestbed-Info.plist
+@@ -0,0 +1,52 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIdentifier</key>
++	<string>org.python.iOSTestbed</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
++	<key>UIRequiresFullScreen</key>
++	<true/>
++	<key>UILaunchStoryboardName</key>
++	<string>Launch Screen</string>
++	<key>UISupportedInterfaceOrientations</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++	<key>UISupportedInterfaceOrientations~ipad</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationPortraitUpsideDown</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++	<key>UIApplicationSceneManifest</key>
++	<dict>
++		<key>UIApplicationSupportsMultipleScenes</key>
++		<false/>
++		<key>UISceneConfigurations</key>
++		<dict/>
++	</dict>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/testbed/iOSTestbed/main.m
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  iOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++#import "AppDelegate.h"
++
++int main(int argc, char * argv[]) {
++    NSString * appDelegateClassName;
++    @autoreleasepool {
++        appDelegateClassName = NSStringFromClass([AppDelegate class]);
++
++        return UIApplicationMain(argc, argv, nil, appDelegateClassName);
++    }
++}
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed.xcodeproj/project.pbxproj
+@@ -0,0 +1,506 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 77;
++	objects = {
++
++/* Begin PBXBuildFile section */
++		EE7C8A1E2DCD6FF3003206DB /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */; };
++		EE7C8A1F2DCD70CD003206DB /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */; };
++		EE7C8A202DCD70CD003206DB /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++/* End PBXBuildFile section */
++
++/* Begin PBXContainerItemProxy section */
++		EE989E662DCD6E7A0036B268 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = EE989E462DCD6E780036B268 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = EE989E4D2DCD6E780036B268;
++			remoteInfo = tvOSTestbed;
++		};
++/* End PBXContainerItemProxy section */
++
++/* Begin PBXCopyFilesBuildPhase section */
++		EE7C8A212DCD70CD003206DB /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				EE7C8A202DCD70CD003206DB /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXCopyFilesBuildPhase section */
++
++/* Begin PBXFileReference section */
++		6077B3802E82A4BE00E3D6A3 /* tvOSTestbed.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = tvOSTestbed.xctestplan; sourceTree = "<group>"; };
++		EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
++		EE989E4E2DCD6E780036B268 /* tvOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = tvOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		EE989E652DCD6E7A0036B268 /* TestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
++/* End PBXFileReference section */
++
++/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
++		6077B37F2E81892A00E3D6A3 /* Exceptions for "tvOSTestbed" folder in "tvOSTestbed" target */ = {
++			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
++			membershipExceptions = (
++				"tvOSTestbed-Info.plist",
++			);
++			target = EE989E4D2DCD6E780036B268 /* tvOSTestbed */;
++		};
++/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
++
++/* Begin PBXFileSystemSynchronizedRootGroup section */
++		EE989E502DCD6E780036B268 /* tvOSTestbed */ = {
++			isa = PBXFileSystemSynchronizedRootGroup;
++			exceptions = (
++				6077B37F2E81892A00E3D6A3 /* Exceptions for "tvOSTestbed" folder in "tvOSTestbed" target */,
++			);
++			explicitFolders = (
++				app,
++				app_packages,
++			);
++			path = tvOSTestbed;
++			sourceTree = "<group>";
++		};
++		EE989E682DCD6E7A0036B268 /* TestbedTests */ = {
++			isa = PBXFileSystemSynchronizedRootGroup;
++			path = TestbedTests;
++			sourceTree = "<group>";
++		};
++/* End PBXFileSystemSynchronizedRootGroup section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		EE989E4B2DCD6E780036B268 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EE7C8A1F2DCD70CD003206DB /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		EE989E622DCD6E7A0036B268 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EE7C8A1E2DCD6FF3003206DB /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		EE989E452DCD6E780036B268 = {
++			isa = PBXGroup;
++			children = (
++				6077B3802E82A4BE00E3D6A3 /* tvOSTestbed.xctestplan */,
++				EE7C8A1C2DCD6FF3003206DB /* Python.xcframework */,
++				EE989E502DCD6E780036B268 /* tvOSTestbed */,
++				EE989E682DCD6E7A0036B268 /* TestbedTests */,
++				EE989E4F2DCD6E780036B268 /* Products */,
++			);
++			sourceTree = "<group>";
++		};
++		EE989E4F2DCD6E780036B268 /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				EE989E4E2DCD6E780036B268 /* tvOSTestbed.app */,
++				EE989E652DCD6E7A0036B268 /* TestbedTests.xctest */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		EE989E4D2DCD6E780036B268 /* tvOSTestbed */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = EE989E792DCD6E7A0036B268 /* Build configuration list for PBXNativeTarget "tvOSTestbed" */;
++			buildPhases = (
++				EE989E4A2DCD6E780036B268 /* Sources */,
++				EE989E4B2DCD6E780036B268 /* Frameworks */,
++				EE989E4C2DCD6E780036B268 /* Resources */,
++				EE7C8A222DCD70F4003206DB /* Process Python libraries */,
++				EE7C8A212DCD70CD003206DB /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			fileSystemSynchronizedGroups = (
++				EE989E502DCD6E780036B268 /* tvOSTestbed */,
++			);
++			name = tvOSTestbed;
++			packageProductDependencies = (
++			);
++			productName = tvOSTestbed;
++			productReference = EE989E4E2DCD6E780036B268 /* tvOSTestbed.app */;
++			productType = "com.apple.product-type.application";
++		};
++		EE989E642DCD6E7A0036B268 /* TestbedTests */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = EE989E7C2DCD6E7A0036B268 /* Build configuration list for PBXNativeTarget "TestbedTests" */;
++			buildPhases = (
++				EE989E612DCD6E7A0036B268 /* Sources */,
++				EE989E622DCD6E7A0036B268 /* Frameworks */,
++				EE989E632DCD6E7A0036B268 /* Resources */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++				EE989E672DCD6E7A0036B268 /* PBXTargetDependency */,
++			);
++			fileSystemSynchronizedGroups = (
++				EE989E682DCD6E7A0036B268 /* TestbedTests */,
++			);
++			name = TestbedTests;
++			packageProductDependencies = (
++			);
++			productName = TestbedTests;
++			productReference = EE989E652DCD6E7A0036B268 /* TestbedTests.xctest */;
++			productType = "com.apple.product-type.bundle.unit-test";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		EE989E462DCD6E780036B268 /* Project object */ = {
++			isa = PBXProject;
++			attributes = {
++				BuildIndependentTargetsInParallel = 1;
++				LastUpgradeCheck = 1620;
++				TargetAttributes = {
++					EE989E4D2DCD6E780036B268 = {
++						CreatedOnToolsVersion = 16.2;
++					};
++					EE989E642DCD6E7A0036B268 = {
++						CreatedOnToolsVersion = 16.2;
++						TestTargetID = EE989E4D2DCD6E780036B268;
++					};
++				};
++			};
++			buildConfigurationList = EE989E492DCD6E780036B268 /* Build configuration list for PBXProject "tvOSTestbed" */;
++			developmentRegion = en;
++			hasScannedForEncodings = 0;
++			knownRegions = (
++				en,
++				Base,
++			);
++			mainGroup = EE989E452DCD6E780036B268;
++			minimizedProjectReferenceProxies = 1;
++			preferredProjectObjectVersion = 77;
++			productRefGroup = EE989E4F2DCD6E780036B268 /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				EE989E4D2DCD6E780036B268 /* tvOSTestbed */,
++				EE989E642DCD6E7A0036B268 /* TestbedTests */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		EE989E4C2DCD6E780036B268 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		EE989E632DCD6E7A0036B268 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXShellScriptBuildPhase section */
++		EE7C8A222DCD70F4003206DB /* Process Python libraries */ = {
++			isa = PBXShellScriptBuildPhase;
++			alwaysOutOfDate = 1;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputFileListPaths = (
++			);
++			inputPaths = (
++			);
++			name = "Process Python libraries";
++			outputFileListPaths = (
++			);
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "set -e\n\nsource $PROJECT_DIR/Python.xcframework/build/utils.sh\n\ninstall_python Python.xcframework app app_packages\n";
++			showEnvVarsInLog = 0;
++		};
++/* End PBXShellScriptBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		EE989E4A2DCD6E780036B268 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		EE989E612DCD6E7A0036B268 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin PBXTargetDependency section */
++		EE989E672DCD6E7A0036B268 /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = EE989E4D2DCD6E780036B268 /* tvOSTestbed */;
++			targetProxy = EE989E662DCD6E7A0036B268 /* PBXContainerItemProxy */;
++		};
++/* End PBXTargetDependency section */
++
++/* Begin XCBuildConfiguration section */
++		EE989E772DCD6E7A0036B268 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = dwarf;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = (
++					"DEBUG=1",
++					"$(inherited)",
++				);
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/Python.framework/Headers";
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
++				MTL_FAST_MATH = YES;
++				ONLY_ACTIVE_ARCH = YES;
++				SDKROOT = appletvos;
++				TVOS_DEPLOYMENT_TARGET = 18.2;
++			};
++			name = Debug;
++		};
++		EE989E782DCD6E7A0036B268 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				ENABLE_NS_ASSERTIONS = NO;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/Python.framework/Headers";
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = NO;
++				MTL_FAST_MATH = YES;
++				SDKROOT = appletvos;
++				TVOS_DEPLOYMENT_TARGET = 18.2;
++				VALIDATE_PRODUCT = YES;
++			};
++			name = Release;
++		};
++		EE989E7A2DCD6E7A0036B268 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				GENERATE_INFOPLIST_FILE = NO;
++				INFOPLIST_FILE = "tvOSTestbed/tvOSTestbed-Info.plist";
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UIUserInterfaceStyle = Automatic;
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.tvOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 3;
++			};
++			name = Debug;
++		};
++		EE989E7B2DCD6E7A0036B268 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				GENERATE_INFOPLIST_FILE = NO;
++				INFOPLIST_FILE = "tvOSTestbed/tvOSTestbed-Info.plist";
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UIUserInterfaceStyle = Automatic;
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.tvOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 3;
++			};
++			name = Release;
++		};
++		EE989E7D2DCD6E7A0036B268 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				GENERATE_INFOPLIST_FILE = YES;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.TestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 3;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tvOSTestbed";
++				TVOS_DEPLOYMENT_TARGET = 18.2;
++			};
++			name = Debug;
++		};
++		EE989E7E2DCD6E7A0036B268 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				GENERATE_INFOPLIST_FILE = YES;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.TestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 3;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tvOSTestbed";
++				TVOS_DEPLOYMENT_TARGET = 18.2;
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		EE989E492DCD6E780036B268 /* Build configuration list for PBXProject "tvOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				EE989E772DCD6E7A0036B268 /* Debug */,
++				EE989E782DCD6E7A0036B268 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		EE989E792DCD6E7A0036B268 /* Build configuration list for PBXNativeTarget "tvOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				EE989E7A2DCD6E7A0036B268 /* Debug */,
++				EE989E7B2DCD6E7A0036B268 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		EE989E7C2DCD6E7A0036B268 /* Build configuration list for PBXNativeTarget "TestbedTests" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				EE989E7D2DCD6E7A0036B268 /* Debug */,
++				EE989E7E2DCD6E7A0036B268 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = EE989E462DCD6E780036B268 /* Project object */;
++}
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed.xcodeproj/xcshareddata/xcschemes/tvOSTestbed.xcscheme
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   LastUpgradeVersion = "1640"
++   version = "1.7">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES"
++      buildArchitectures = "Automatic">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "EE989E4D2DCD6E780036B268"
++               BuildableName = "tvOSTestbed.app"
++               BlueprintName = "tvOSTestbed"
++               ReferencedContainer = "container:tvOSTestbed.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      customLLDBInitFile = "$(SOURCE_ROOT)/Testbed.lldbinit"
++      shouldUseLaunchSchemeArgsEnv = "YES">
++      <TestPlans>
++         <TestPlanReference
++            reference = "container:tvOSTestbed.xctestplan"
++            default = "YES">
++         </TestPlanReference>
++      </TestPlans>
++      <Testables>
++         <TestableReference
++            skipped = "NO"
++            parallelizable = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "EE989E642DCD6E7A0036B268"
++               BuildableName = "TestbedTests.xctest"
++               BlueprintName = "TestbedTests"
++               ReferencedContainer = "container:tvOSTestbed.xcodeproj">
++            </BuildableReference>
++         </TestableReference>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      debugServiceExtension = "internal"
++      allowLocationSimulation = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "EE989E4D2DCD6E780036B268"
++            BuildableName = "tvOSTestbed.app"
++            BlueprintName = "tvOSTestbed"
++            ReferencedContainer = "container:tvOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </LaunchAction>
++   <ProfileAction
++      buildConfiguration = "Release"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      debugDocumentVersioning = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "EE989E4D2DCD6E780036B268"
++            BuildableName = "tvOSTestbed.app"
++            BlueprintName = "tvOSTestbed"
++            ReferencedContainer = "container:tvOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed.xctestplan
+@@ -0,0 +1,46 @@
++{
++  "configurations" : [
++    {
++      "id" : "F5A95CE4-1ADE-4A6E-A0E1-CDBAE26DF0C5",
++      "name" : "Test Scheme Action",
++      "options" : {
++
++      }
++    }
++  ],
++  "defaultOptions" : {
++    "commandLineArgumentEntries" : [
++      {
++        "argument" : "test"
++      },
++      {
++        "argument" : "-uall"
++      },
++      {
++        "argument" : "--single-process"
++      },
++      {
++        "argument" : "--rerun"
++      },
++      {
++        "argument" : "-W"
++      }
++    ],
++    "targetForVariableExpansion" : {
++      "containerPath" : "container:tvOSTestbed.xcodeproj",
++      "identifier" : "607A66112B0EFA380010BFC8",
++      "name" : "tvOSTestbed"
++    }
++  },
++  "testTargets" : [
++    {
++      "parallelizable" : false,
++      "target" : {
++        "containerPath" : "container:tvOSTestbed.xcodeproj",
++        "identifier" : "EE989E642DCD6E7A0036B268",
++        "name" : "TestbedTests"
++      }
++    }
++  ],
++  "version" : 1
++}
+\ No newline at end of file
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/AppDelegate.h
+@@ -0,0 +1,11 @@
++//
++//  AppDelegate.h
++//  tvOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++
++@interface AppDelegate : UIResponder <UIApplicationDelegate>
++
++
++@end
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/AppDelegate.m
+@@ -0,0 +1,19 @@
++//
++//  AppDelegate.m
++//  tvOSTestbed
++//
++
++#import "AppDelegate.h"
++
++@interface AppDelegate ()
++
++@end
++
++@implementation AppDelegate
++
++
++- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
++    return YES;
++}
++
++@end
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/Base.lproj/LaunchScreen.storyboard
+@@ -0,0 +1,24 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="13122.16" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
++    <dependencies>
++        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
++        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
++        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
++    </dependencies>
++    <scenes>
++        <!--View Controller-->
++        <scene sceneID="tne-QT-ifu">
++            <objects>
++                <viewController id="BYZ-38-t0r" sceneMemberID="viewController">
++                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
++                        <rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
++                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
++                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
++                        <viewLayoutGuide key="safeArea" id="wu6-TO-1qx"/>
++                    </view>
++                </viewController>
++                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
++            </objects>
++        </scene>
++    </scenes>
++</document>
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/app/README
+@@ -0,0 +1,7 @@
++This folder can contain any Python application code.
++
++During the build, any binary modules found in this folder will be processed into
++Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH, and will be the
++working directory for the test suite.
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/app_packages/README
+@@ -0,0 +1,7 @@
++This folder can be a target for installing any Python dependencies needed by the
++test suite.
++
++During the build, any binary modules found in this folder will be processed into
++Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH.
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/main.m
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  tvOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++#import "AppDelegate.h"
++
++int main(int argc, char * argv[]) {
++    NSString * appDelegateClassName;
++    @autoreleasepool {
++        appDelegateClassName = NSStringFromClass([AppDelegate class]);
++
++        return UIApplicationMain(argc, argv, nil, appDelegateClassName);
++    }
++}
+--- /dev/null
++++ b/Apple/testbed/tvOSTestbed/tvOSTestbed-Info.plist
+@@ -0,0 +1,52 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIdentifier</key>
++	<string>org.python.tvOSTestbed</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++	<key>LSRequiresIPhoneOS</key>
++	<true/>
++	<key>UIRequiresFullScreen</key>
++	<true/>
++	<key>UILaunchStoryboardName</key>
++	<string>Launch Screen</string>
++	<key>UISupportedInterfaceOrientations</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++	<key>UISupportedInterfaceOrientations~ipad</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationPortraitUpsideDown</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++	<key>UIApplicationSceneManifest</key>
++	<dict>
++		<key>UIApplicationSupportsMultipleScenes</key>
++		<false/>
++		<key>UISceneConfigurations</key>
++		<dict/>
++	</dict>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed.xcodeproj/project.pbxproj
+@@ -0,0 +1,558 @@
++// !$*UTF8*$!
++{
++	archiveVersion = 1;
++	classes = {
++	};
++	objectVersion = 56;
++	objects = {
++
++/* Begin PBXBuildFile section */
++		607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66162B0EFA380010BFC8 /* AppDelegate.m */; };
++		607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607A66212B0EFA390010BFC8 /* Assets.xcassets */; };
++		607A66282B0EFA390010BFC8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66272B0EFA390010BFC8 /* main.m */; };
++		607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66312B0EFA3A0010BFC8 /* TestbedTests.m */; };
++		608619542CB77BA900F46182 /* app_packages in Resources */ = {isa = PBXBuildFile; fileRef = 608619532CB77BA900F46182 /* app_packages */; };
++		608619562CB7819B00F46182 /* app in Resources */ = {isa = PBXBuildFile; fileRef = 608619552CB7819B00F46182 /* app */; };
++		EEB367CE2DADF5C900B9A1D7 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		EEB367CF2DADF5D300B9A1D7 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
++		EEE9C80D2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; };
++		EEE9C80E2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */; };
++/* End PBXBuildFile section */
++
++/* Begin PBXContainerItemProxy section */
++		607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = 607A660A2B0EFA380010BFC8 /* Project object */;
++			proxyType = 1;
++			remoteGlobalIDString = 607A66112B0EFA380010BFC8;
++			remoteInfo = iOSTestbed;
++		};
++/* End PBXContainerItemProxy section */
++
++/* Begin PBXCopyFilesBuildPhase section */
++		607A664E2B0EFC080010BFC8 /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				EEB367CF2DADF5D300B9A1D7 /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A66522B0EFFE00010BFC8 /* Embed Frameworks */ = {
++			isa = PBXCopyFilesBuildPhase;
++			buildActionMask = 2147483647;
++			dstPath = "";
++			dstSubfolderSpec = 10;
++			files = (
++				EEB367CE2DADF5C900B9A1D7 /* Python.xcframework in Embed Frameworks */,
++			);
++			name = "Embed Frameworks";
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXCopyFilesBuildPhase section */
++
++/* Begin PBXFileReference section */
++		6077B3D62E82E60C00E3D6A3 /* visionOSTestbed.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = visionOSTestbed.xctestplan; sourceTree = "<group>"; };
++		607A66122B0EFA380010BFC8 /* visionOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = visionOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66152B0EFA380010BFC8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
++		607A66162B0EFA380010BFC8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
++		607A66212B0EFA390010BFC8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
++		607A66272B0EFA390010BFC8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
++		607A662D2B0EFA3A0010BFC8 /* TestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
++		607A66312B0EFA3A0010BFC8 /* TestbedTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestbedTests.m; sourceTree = "<group>"; };
++		607A66592B0F08600010BFC8 /* visionOSTestbed-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "visionOSTestbed-Info.plist"; sourceTree = "<group>"; };
++		608619532CB77BA900F46182 /* app_packages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app_packages; sourceTree = "<group>"; };
++		608619552CB7819B00F46182 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app; sourceTree = "<group>"; };
++		EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
++/* End PBXFileReference section */
++
++/* Begin PBXFrameworksBuildPhase section */
++		607A660F2B0EFA380010BFC8 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EEE9C80D2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A662A2B0EFA3A0010BFC8 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				EEE9C80E2DAB5ECA0056F8C6 /* Python.xcframework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXFrameworksBuildPhase section */
++
++/* Begin PBXGroup section */
++		607A66092B0EFA380010BFC8 = {
++			isa = PBXGroup;
++			children = (
++				6077B3D62E82E60C00E3D6A3 /* visionOSTestbed.xctestplan */,
++				EEE9C80C2DAB5ECA0056F8C6 /* Python.xcframework */,
++				607A66142B0EFA380010BFC8 /* visionOSTestbed */,
++				607A66302B0EFA3A0010BFC8 /* TestbedTests */,
++				607A66132B0EFA380010BFC8 /* Products */,
++				607A664F2B0EFFE00010BFC8 /* Frameworks */,
++			);
++			sourceTree = "<group>";
++		};
++		607A66132B0EFA380010BFC8 /* Products */ = {
++			isa = PBXGroup;
++			children = (
++				607A66122B0EFA380010BFC8 /* visionOSTestbed.app */,
++				607A662D2B0EFA3A0010BFC8 /* TestbedTests.xctest */,
++			);
++			name = Products;
++			sourceTree = "<group>";
++		};
++		607A66142B0EFA380010BFC8 /* visionOSTestbed */ = {
++			isa = PBXGroup;
++			children = (
++				608619552CB7819B00F46182 /* app */,
++				608619532CB77BA900F46182 /* app_packages */,
++				607A66592B0F08600010BFC8 /* visionOSTestbed-Info.plist */,
++				607A66152B0EFA380010BFC8 /* AppDelegate.h */,
++				607A66162B0EFA380010BFC8 /* AppDelegate.m */,
++				607A66212B0EFA390010BFC8 /* Assets.xcassets */,
++				607A66272B0EFA390010BFC8 /* main.m */,
++			);
++			path = visionOSTestbed;
++			sourceTree = "<group>";
++		};
++		607A66302B0EFA3A0010BFC8 /* TestbedTests */ = {
++			isa = PBXGroup;
++			children = (
++				607A66312B0EFA3A0010BFC8 /* TestbedTests.m */,
++			);
++			path = TestbedTests;
++			sourceTree = "<group>";
++		};
++		607A664F2B0EFFE00010BFC8 /* Frameworks */ = {
++			isa = PBXGroup;
++			children = (
++			);
++			name = Frameworks;
++			sourceTree = "<group>";
++		};
++/* End PBXGroup section */
++
++/* Begin PBXNativeTarget section */
++		607A66112B0EFA380010BFC8 /* visionOSTestbed */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbed" */;
++			buildPhases = (
++				607A660E2B0EFA380010BFC8 /* Sources */,
++				607A660F2B0EFA380010BFC8 /* Frameworks */,
++				607A66102B0EFA380010BFC8 /* Resources */,
++				607A66552B0F061D0010BFC8 /* Process Python libraries */,
++				607A664E2B0EFC080010BFC8 /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = visionOSTestbed;
++			productName = iOSTestbed;
++			productReference = 607A66122B0EFA380010BFC8 /* visionOSTestbed.app */;
++			productType = "com.apple.product-type.application";
++		};
++		607A662C2B0EFA3A0010BFC8 /* TestbedTests */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "TestbedTests" */;
++			buildPhases = (
++				607A66292B0EFA3A0010BFC8 /* Sources */,
++				607A662A2B0EFA3A0010BFC8 /* Frameworks */,
++				607A662B2B0EFA3A0010BFC8 /* Resources */,
++				607A66522B0EFFE00010BFC8 /* Embed Frameworks */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++				607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */,
++			);
++			name = TestbedTests;
++			productName = iOSTestbedTests;
++			productReference = 607A662D2B0EFA3A0010BFC8 /* TestbedTests.xctest */;
++			productType = "com.apple.product-type.bundle.unit-test";
++		};
++/* End PBXNativeTarget section */
++
++/* Begin PBXProject section */
++		607A660A2B0EFA380010BFC8 /* Project object */ = {
++			isa = PBXProject;
++			attributes = {
++				BuildIndependentTargetsInParallel = 1;
++				LastUpgradeCheck = 1500;
++				TargetAttributes = {
++					607A66112B0EFA380010BFC8 = {
++						CreatedOnToolsVersion = 15.0.1;
++					};
++					607A662C2B0EFA3A0010BFC8 = {
++						CreatedOnToolsVersion = 15.0.1;
++						TestTargetID = 607A66112B0EFA380010BFC8;
++					};
++				};
++			};
++			buildConfigurationList = 607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "visionOSTestbed" */;
++			compatibilityVersion = "Xcode 14.0";
++			developmentRegion = en;
++			hasScannedForEncodings = 0;
++			knownRegions = (
++				en,
++				Base,
++			);
++			mainGroup = 607A66092B0EFA380010BFC8;
++			productRefGroup = 607A66132B0EFA380010BFC8 /* Products */;
++			projectDirPath = "";
++			projectRoot = "";
++			targets = (
++				607A66112B0EFA380010BFC8 /* visionOSTestbed */,
++				607A662C2B0EFA3A0010BFC8 /* TestbedTests */,
++			);
++		};
++/* End PBXProject section */
++
++/* Begin PBXResourcesBuildPhase section */
++		607A66102B0EFA380010BFC8 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				608619562CB7819B00F46182 /* app in Resources */,
++				607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */,
++				608619542CB77BA900F46182 /* app_packages in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A662B2B0EFA3A0010BFC8 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXResourcesBuildPhase section */
++
++/* Begin PBXShellScriptBuildPhase section */
++		607A66552B0F061D0010BFC8 /* Process Python libraries */ = {
++			isa = PBXShellScriptBuildPhase;
++			alwaysOutOfDate = 1;
++			buildActionMask = 2147483647;
++			files = (
++			);
++			inputFileListPaths = (
++			);
++			inputPaths = (
++			);
++			name = "Process Python libraries";
++			outputFileListPaths = (
++			);
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "set -e\n\nsource $PROJECT_DIR/Python.xcframework/build/utils.sh\n\ninstall_python Python.xcframework app app_packages\n";
++			showEnvVarsInLog = 0;
++		};
++/* End PBXShellScriptBuildPhase section */
++
++/* Begin PBXSourcesBuildPhase section */
++		607A660E2B0EFA380010BFC8 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */,
++				607A66282B0EFA390010BFC8 /* main.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++		607A66292B0EFA3A0010BFC8 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
++/* End PBXSourcesBuildPhase section */
++
++/* Begin PBXTargetDependency section */
++		607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */ = {
++			isa = PBXTargetDependency;
++			target = 607A66112B0EFA380010BFC8 /* visionOSTestbed */;
++			targetProxy = 607A662E2B0EFA3A0010BFC8 /* PBXContainerItemProxy */;
++		};
++/* End PBXTargetDependency section */
++
++/* Begin XCBuildConfiguration section */
++		607A663F2B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = dwarf;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = YES;
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PREPROCESSOR_DEFINITIONS = (
++					"DEBUG=1",
++					"$(inherited)",
++				);
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
++				MTL_FAST_MATH = YES;
++				ONLY_ACTIVE_ARCH = YES;
++				SDKROOT = xros;
++			};
++			name = Debug;
++		};
++		607A66402B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ALWAYS_SEARCH_USER_PATHS = NO;
++				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
++				CLANG_ANALYZER_NONNULL = YES;
++				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
++				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
++				CLANG_ENABLE_MODULES = YES;
++				CLANG_ENABLE_OBJC_ARC = YES;
++				CLANG_ENABLE_OBJC_WEAK = YES;
++				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
++				CLANG_WARN_BOOL_CONVERSION = YES;
++				CLANG_WARN_COMMA = YES;
++				CLANG_WARN_CONSTANT_CONVERSION = YES;
++				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
++				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
++				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
++				CLANG_WARN_EMPTY_BODY = YES;
++				CLANG_WARN_ENUM_CONVERSION = YES;
++				CLANG_WARN_INFINITE_RECURSION = YES;
++				CLANG_WARN_INT_CONVERSION = YES;
++				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
++				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
++				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
++				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
++				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
++				CLANG_WARN_STRICT_PROTOTYPES = YES;
++				CLANG_WARN_SUSPICIOUS_MOVE = YES;
++				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
++				CLANG_WARN_UNREACHABLE_CODE = YES;
++				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
++				COPY_PHASE_STRIP = NO;
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				ENABLE_NS_ASSERTIONS = NO;
++				ENABLE_STRICT_OBJC_MSGSEND = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = YES;
++				GCC_C_LANGUAGE_STANDARD = gnu17;
++				GCC_NO_COMMON_BLOCKS = YES;
++				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
++				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
++				GCC_WARN_UNDECLARED_SELECTOR = YES;
++				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
++				GCC_WARN_UNUSED_FUNCTION = YES;
++				GCC_WARN_UNUSED_VARIABLE = YES;
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
++				MTL_ENABLE_DEBUG_INFO = NO;
++				MTL_FAST_MATH = YES;
++				SDKROOT = xros;
++				VALIDATE_PRODUCT = YES;
++			};
++			name = Release;
++		};
++		607A66422B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = "";
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				INFOPLIST_FILE = "visionOSTestbed/visionOSTestbed-Info.plist";
++				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 3.13.0a1;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 7;
++				XROS_DEPLOYMENT_TARGET = 2.0;
++			};
++			name = Debug;
++		};
++		607A66432B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
++				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = "";
++				ENABLE_TESTABILITY = YES;
++				ENABLE_USER_SCRIPT_SANDBOXING = NO;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				INFOPLIST_FILE = "visionOSTestbed/visionOSTestbed-Info.plist";
++				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
++				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
++				INFOPLIST_KEY_UIMainStoryboardFile = Main;
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
++				LD_RUNPATH_SEARCH_PATHS = (
++					"$(inherited)",
++					"@executable_path/Frameworks",
++				);
++				MARKETING_VERSION = 3.13.0a1;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.visionOSTestbed;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = YES;
++				TARGETED_DEVICE_FAMILY = 7;
++				XROS_DEPLOYMENT_TARGET = 2.0;
++			};
++			name = Release;
++		};
++		607A66452B0EFA3A0010BFC8 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = 3HEZE76D99;
++				GENERATE_INFOPLIST_FILE = YES;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.TestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 7;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestbed";
++			};
++			name = Debug;
++		};
++		607A66462B0EFA3A0010BFC8 /* Release */ = {
++			isa = XCBuildConfiguration;
++			buildSettings = {
++				BUNDLE_LOADER = "$(TEST_HOST)";
++				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
++				CODE_SIGN_STYLE = Automatic;
++				CURRENT_PROJECT_VERSION = 1;
++				DEVELOPMENT_TEAM = 3HEZE76D99;
++				GENERATE_INFOPLIST_FILE = YES;
++				HEADER_SEARCH_PATHS = "\"$(BUILT_PRODUCTS_DIR)/Python.framework/Headers\"";
++				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
++				MARKETING_VERSION = 1.0;
++				PRODUCT_BUNDLE_IDENTIFIER = org.python.TestbedTests;
++				PRODUCT_NAME = "$(TARGET_NAME)";
++				SUPPORTED_PLATFORMS = "xros xrsimulator";
++				SUPPORTS_MACCATALYST = NO;
++				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
++				SWIFT_EMIT_LOC_STRINGS = NO;
++				TARGETED_DEVICE_FAMILY = 7;
++				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestbed.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestbed";
++			};
++			name = Release;
++		};
++/* End XCBuildConfiguration section */
++
++/* Begin XCConfigurationList section */
++		607A660D2B0EFA380010BFC8 /* Build configuration list for PBXProject "visionOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A663F2B0EFA3A0010BFC8 /* Debug */,
++				607A66402B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		607A66412B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "visionOSTestbed" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A66422B0EFA3A0010BFC8 /* Debug */,
++				607A66432B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++		607A66442B0EFA3A0010BFC8 /* Build configuration list for PBXNativeTarget "TestbedTests" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				607A66452B0EFA3A0010BFC8 /* Debug */,
++				607A66462B0EFA3A0010BFC8 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Release;
++		};
++/* End XCConfigurationList section */
++	};
++	rootObject = 607A660A2B0EFA380010BFC8 /* Project object */;
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed.xcodeproj/xcshareddata/xcschemes/visionOSTestbed.xcscheme
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<Scheme
++   LastUpgradeVersion = "1640"
++   version = "1.7">
++   <BuildAction
++      parallelizeBuildables = "YES"
++      buildImplicitDependencies = "YES"
++      buildArchitectures = "Automatic">
++      <BuildActionEntries>
++         <BuildActionEntry
++            buildForTesting = "YES"
++            buildForRunning = "YES"
++            buildForProfiling = "YES"
++            buildForArchiving = "YES"
++            buildForAnalyzing = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++               BuildableName = "visionOSTestbed.app"
++               BlueprintName = "visionOSTestbed"
++               ReferencedContainer = "container:visionOSTestbed.xcodeproj">
++            </BuildableReference>
++         </BuildActionEntry>
++      </BuildActionEntries>
++   </BuildAction>
++   <TestAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      customLLDBInitFile = "$(SOURCE_ROOT)/Testbed.lldbinit"
++      shouldUseLaunchSchemeArgsEnv = "YES">
++      <TestPlans>
++         <TestPlanReference
++            reference = "container:visionOSTestbed.xctestplan"
++            default = "YES">
++         </TestPlanReference>
++      </TestPlans>
++      <Testables>
++         <TestableReference
++            skipped = "NO"
++            parallelizable = "YES">
++            <BuildableReference
++               BuildableIdentifier = "primary"
++               BlueprintIdentifier = "607A662C2B0EFA3A0010BFC8"
++               BuildableName = "TestbedTests.xctest"
++               BlueprintName = "TestbedTests"
++               ReferencedContainer = "container:visionOSTestbed.xcodeproj">
++            </BuildableReference>
++         </TestableReference>
++      </Testables>
++   </TestAction>
++   <LaunchAction
++      buildConfiguration = "Debug"
++      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
++      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
++      launchStyle = "0"
++      useCustomWorkingDirectory = "NO"
++      ignoresPersistentStateOnLaunch = "NO"
++      debugDocumentVersioning = "YES"
++      debugServiceExtension = "internal"
++      allowLocationSimulation = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++            BuildableName = "visionOSTestbed.app"
++            BlueprintName = "visionOSTestbed"
++            ReferencedContainer = "container:visionOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </LaunchAction>
++   <ProfileAction
++      buildConfiguration = "Release"
++      shouldUseLaunchSchemeArgsEnv = "YES"
++      savedToolIdentifier = ""
++      useCustomWorkingDirectory = "NO"
++      debugDocumentVersioning = "YES">
++      <BuildableProductRunnable
++         runnableDebuggingMode = "0">
++         <BuildableReference
++            BuildableIdentifier = "primary"
++            BlueprintIdentifier = "607A66112B0EFA380010BFC8"
++            BuildableName = "visionOSTestbed.app"
++            BlueprintName = "visionOSTestbed"
++            ReferencedContainer = "container:visionOSTestbed.xcodeproj">
++         </BuildableReference>
++      </BuildableProductRunnable>
++   </ProfileAction>
++   <AnalyzeAction
++      buildConfiguration = "Debug">
++   </AnalyzeAction>
++   <ArchiveAction
++      buildConfiguration = "Release"
++      revealArchiveInOrganizer = "YES">
++   </ArchiveAction>
++</Scheme>
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed.xctestplan
+@@ -0,0 +1,46 @@
++{
++  "configurations" : [
++    {
++      "id" : "C17FA044-0B70-48CA-AFF8-BC252081002F",
++      "name" : "Test Scheme Action",
++      "options" : {
++
++      }
++    }
++  ],
++  "defaultOptions" : {
++    "commandLineArgumentEntries" : [
++      {
++        "argument" : "test"
++      },
++      {
++        "argument" : "-uall"
++      },
++      {
++        "argument" : "--single-process"
++      },
++      {
++        "argument" : "--rerun"
++      },
++      {
++        "argument" : "-W"
++      }
++    ],
++    "targetForVariableExpansion" : {
++      "containerPath" : "container:visionOSTestbed.xcodeproj",
++      "identifier" : "607A66112B0EFA380010BFC8",
++      "name" : "visionOSTestbed"
++    }
++  },
++  "testTargets" : [
++    {
++      "parallelizable" : false,
++      "target" : {
++        "containerPath" : "container:visionOSTestbed.xcodeproj",
++        "identifier" : "607A662C2B0EFA3A0010BFC8",
++        "name" : "TestbedTests"
++      }
++    }
++  ],
++  "version" : 1
++}
+\ No newline at end of file
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/AppDelegate.h
+@@ -0,0 +1,11 @@
++//
++//  AppDelegate.h
++//  visionOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++
++@interface AppDelegate : UIResponder <UIApplicationDelegate>
++
++
++@end
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/AppDelegate.m
+@@ -0,0 +1,19 @@
++//
++//  AppDelegate.m
++//  visionOSTestbed
++//
++
++#import "AppDelegate.h"
++
++@interface AppDelegate ()
++
++@end
++
++@implementation AppDelegate
++
++
++- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
++    return YES;
++}
++
++@end
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/Assets.xcassets/AccentColor.colorset/Contents.json
+@@ -0,0 +1,11 @@
++{
++  "colors" : [
++    {
++      "idiom" : "universal"
++    }
++  ],
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/Assets.xcassets/AppIcon.appiconset/Contents.json
+@@ -0,0 +1,13 @@
++{
++  "images" : [
++    {
++      "idiom" : "universal",
++      "platform" : "ios",
++      "size" : "1024x1024"
++    }
++  ],
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/Assets.xcassets/Contents.json
+@@ -0,0 +1,6 @@
++{
++  "info" : {
++    "author" : "xcode",
++    "version" : 1
++  }
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/app/README
+@@ -0,0 +1,7 @@
++This folder can contain any Python application code.
++
++During the build, any binary modules found in this folder will be processed into
++iOS Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH, and will be the
++working directory for the test suite.
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/app_packages/README
+@@ -0,0 +1,7 @@
++This folder can be a target for installing any Python dependencies needed by the
++test suite.
++
++During the build, any binary modules found in this folder will be processed into
++iOS Framework form.
++
++When the test suite runs, this folder will be on the PYTHONPATH.
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/main.m
+@@ -0,0 +1,16 @@
++//
++//  main.m
++//  visionOSTestbed
++//
++
++#import <UIKit/UIKit.h>
++#import "AppDelegate.h"
++
++int main(int argc, char * argv[]) {
++    NSString * appDelegateClassName;
++    @autoreleasepool {
++        appDelegateClassName = NSStringFromClass([AppDelegate class]);
++
++        return UIApplicationMain(argc, argv, nil, appDelegateClassName);
++    }
++}
+--- /dev/null
++++ b/Apple/testbed/visionOSTestbed/visionOSTestbed-Info.plist
+@@ -0,0 +1,56 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleDisplayName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundleExecutable</key>
++	<string>${EXECUTABLE_NAME}</string>
++	<key>CFBundleIdentifier</key>
++	<string>org.python.visionOSTestbed</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>${PRODUCT_NAME}</string>
++	<key>CFBundlePackageType</key>
++	<string>APPL</string>
++	<key>CFBundleShortVersionString</key>
++	<string>1.0</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++	<key>TestArgs</key>
++	<array>
++		<string>test</string>
++		<string>-uall</string>
++		<string>--single-process</string>
++		<string>--rerun</string>
++		<string>-W</string>
++	</array>
++	<key>UIApplicationSceneManifest</key>
++	<dict>
++		<key>UIApplicationSupportsMultipleScenes</key>
++		<false/>
++		<key>UISceneConfigurations</key>
++		<dict/>
++	</dict>
++	<key>UIRequiresFullScreen</key>
++	<true/>
++	<key>UISupportedInterfaceOrientations</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++	<key>UISupportedInterfaceOrientations~ipad</key>
++	<array>
++		<string>UIInterfaceOrientationPortrait</string>
++		<string>UIInterfaceOrientationPortraitUpsideDown</string>
++		<string>UIInterfaceOrientationLandscapeLeft</string>
++		<string>UIInterfaceOrientationLandscapeRight</string>
++	</array>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/tvOS/README.rst
+@@ -0,0 +1,108 @@
++=====================
++Python on tvOS README
++=====================
++
++:Authors:
++    Russell Keith-Magee (2023-11)
++
++This document provides a quick overview of some tvOS specific features in the
++Python distribution.
++
++Compilers for building on tvOS
++==============================
++
++Building for tvOS requires the use of Apple's Xcode tooling. It is strongly
++recommended that you use the most recent stable release of Xcode, on the
++most recently released macOS.
++
++tvOS specific arguments to configure
++===================================
++
++* ``--enable-framework[=DIR]``
++
++  This argument specifies the location where the Python.framework will
++  be installed.
++
++* ``--with-framework-name=NAME``
++
++  Specify the name for the python framework, defaults to ``Python``.
++
++
++Building and using Python on tvOS
++=================================
++
++ABIs and Architectures
++----------------------
++
++tvOS apps can be deployed on physical devices, and on the tvOS simulator.
++Although the API used on these devices is identical, the ABI is different - you
++need to link against different libraries for an tvOS device build
++(``appletvos``) or an tvOS simulator build (``appletvsimulator``). Apple uses
++the XCframework format to allow specifying a single dependency that supports
++multiple ABIs. An XCframework is a wrapper around multiple ABI-specific
++frameworks.
++
++tvOS can also support different CPU architectures within each ABI. At present,
++there is only a single support ed architecture on physical devices - ARM64.
++However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
++Silicon machines), and x86_64 (for running on older Intel-based machines.)
++
++To support multiple CPU architectures on a single platform, Apple uses a "fat
++binary" format - a single physical file that contains support for multiple
++architectures.
++
++How do I build Python for tvOS?
++-------------------------------
++
++The Python build system will build a ``Python.framework`` that supports a
++*single* ABI with a *single* architecture. If you want to use Python in an tvOS
++project, you need to:
++
++1. Produce multiple ``Python.framework`` builds, one for each ABI and architecture;
++2. Merge the binaries for each architecture on a given ABI into a single "fat" binary;
++3. Merge the "fat" frameworks for each ABI into a single XCframework.
++
++tvOS builds of Python *must* be constructed as framework builds. To support this,
++you must provide the ``--enable-framework`` flag when configuring the build.
++
++The build also requires the use of cross-compilation. The commands for building
++Python for tvOS will look somethign like::
++
++  $ ./configure \
++        --enable-framework=/path/to/install \
++        --host=aarch64-apple-tvos \
++        --build=aarch64-apple-darwin \
++        --with-build-python=/path/to/python.exe
++  $ make
++  $ make install
++
++In this invocation:
++
++* ``/path/to/install`` is the location where the final Python.framework will be
++  output.
++
++* ``--host`` is the architecture and ABI that you want to build, in GNU compiler
++  triple format. This will be one of:
++
++  - ``aarch64-apple-tvos`` for ARM64 tvOS devices.
++  - ``aarch64-apple-tvos-simulator`` for the tvOS simulator running on Apple
++    Silicon devices.
++  - ``x86_64-apple-tvos-simulator`` for the tvOS simulator running on Intel
++    devices.
++
++* ``--build`` is the GNU compiler triple for the machine that will be running
++  the compiler. This is one of:
++
++  - ``aarch64-apple-darwin`` for Apple Silicon devices.
++  - ``x86_64-apple-darwin`` for Intel devices.
++
++* ``/path/to/python.exe`` is the path to a Python binary on the machine that
++  will be running the compiler. This is needed because the Python compilation
++  process involves running some Python code. On a normal desktop build of
++  Python, you can compile a python interpreter and then use that interpreter to
++  run Python code. However, the binaries produced for tvOS won't run on macOS, so
++  you need to provide an external Python interpreter. This interpreter must be
++  the version as the Python that is being compiled.
++
++Using a framework-based Python on tvOS
++======================================
+--- /dev/null
++++ b/Apple/tvOS/Resources/Info.plist.in
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
++<plist version="0.9">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string>Python</string>
++	<key>CFBundleGetInfoString</key>
++	<string>Python Runtime and Library</string>
++	<key>CFBundleIdentifier</key>
++	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>Python</string>
++	<key>CFBundlePackageType</key>
++	<string>FMWK</string>
++	<key>CFBundleShortVersionString</key>
++	<string>%VERSION%</string>
++	<key>CFBundleLongVersionString</key>
++	<string>%VERSION%, (c) 2001-2024 Python Software Foundation.</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>1</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>tvOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>@TVOS_DEPLOYMENT_TARGET@</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET} -E "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/arm64-apple-tvos-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk iphoneos${TVOS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target x86_64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos${TVOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/bin/x86_64-apple-tvos-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} strip -arch x86_64 "$@"
+--- /dev/null
++++ b/Apple/tvOS/Resources/pyconfig.h
+@@ -0,0 +1,7 @@
++#ifdef __arm64__
++#include "pyconfig-arm64.h"
++#endif
++
++#ifdef __x86_64__
++#include "pyconfig-x86_64.h"
++#endif
+--- /dev/null
++++ b/Apple/visionOS/Resources/Info.plist.in
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
++<plist version="0.9">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string>Python</string>
++	<key>CFBundleGetInfoString</key>
++	<string>Python Runtime and Library</string>
++	<key>CFBundleIdentifier</key>
++	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>Python</string>
++	<key>CFBundlePackageType</key>
++	<string>FMWK</string>
++	<key>CFBundleShortVersionString</key>
++	<string>%VERSION%</string>
++	<key>CFBundleLongVersionString</key>
++	<string>%VERSION%, (c) 2001-2023 Python Software Foundation.</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>%VERSION%</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>XROS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>@XROS_DEPLOYMENT_TARGET@</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang++ -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xros${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET} -E "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang++ -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} clang -target arm64-apple-xros${XROS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk xrsimulator${XROS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/bin/arm64-apple-xros-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk xros${XROS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/visionOS/Resources/pyconfig.h
+@@ -0,0 +1,3 @@
++#ifdef __arm64__
++#include "pyconfig-arm64.h"
++#endif
+--- /dev/null
++++ b/Apple/watchOS/README.rst
+@@ -0,0 +1,108 @@
++========================
++Python on watchOS README
++========================
++
++:Authors:
++    Russell Keith-Magee (2023-11)
++
++This document provides a quick overview of some watchOS specific features in the
++Python distribution.
++
++Compilers for building on watchOS
++=================================
++
++Building for watchOS requires the use of Apple's Xcode tooling. It is strongly
++recommended that you use the most recent stable release of Xcode, on the
++most recently released macOS.
++
++watchOS specific arguments to configure
++=======================================
++
++* ``--enable-framework[=DIR]``
++
++  This argument specifies the location where the Python.framework will
++  be installed.
++
++* ``--with-framework-name=NAME``
++
++  Specify the name for the python framework, defaults to ``Python``.
++
++
++Building and using Python on watchOS
++====================================
++
++ABIs and Architectures
++----------------------
++
++watchOS apps can be deployed on physical devices, and on the watchOS simulator.
++Although the API used on these devices is identical, the ABI is different - you
++need to link against different libraries for an watchOS device build
++(``watchos``) or an watchOS simulator build (``watchsimulator``). Apple uses the
++XCframework format to allow specifying a single dependency that supports
++multiple ABIs. An XCframework is a wrapper around multiple ABI-specific
++frameworks.
++
++watchOS can also support different CPU architectures within each ABI. At present,
++there is only a single support ed architecture on physical devices - ARM64.
++However, the *simulator* supports 2 architectures - ARM64 (for running on Apple
++Silicon machines), and x86_64 (for running on older Intel-based machines.)
++
++To support multiple CPU architectures on a single platform, Apple uses a "fat
++binary" format - a single physical file that contains support for multiple
++architectures.
++
++How do I build Python for watchOS?
++-------------------------------
++
++The Python build system will build a ``Python.framework`` that supports a
++*single* ABI with a *single* architecture. If you want to use Python in an watchOS
++project, you need to:
++
++1. Produce multiple ``Python.framework`` builds, one for each ABI and architecture;
++2. Merge the binaries for each architecture on a given ABI into a single "fat" binary;
++3. Merge the "fat" frameworks for each ABI into a single XCframework.
++
++watchOS builds of Python *must* be constructed as framework builds. To support this,
++you must provide the ``--enable-framework`` flag when configuring the build.
++
++The build also requires the use of cross-compilation. The commands for building
++Python for watchOS will look somethign like::
++
++  $ ./configure \
++        --enable-framework=/path/to/install \
++        --host=aarch64-apple-watchos \
++        --build=aarch64-apple-darwin \
++        --with-build-python=/path/to/python.exe
++  $ make
++  $ make install
++
++In this invocation:
++
++* ``/path/to/install`` is the location where the final Python.framework will be
++  output.
++
++* ``--host`` is the architecture and ABI that you want to build, in GNU compiler
++  triple format. This will be one of:
++
++  - ``arm64_32-apple-watchos`` for ARM64-32 watchOS devices.
++  - ``aarch64-apple-watchos-simulator`` for the watchOS simulator running on Apple
++    Silicon devices.
++  - ``x86_64-apple-watchos-simulator`` for the watchOS simulator running on Intel
++    devices.
++
++* ``--build`` is the GNU compiler triple for the machine that will be running
++  the compiler. This is one of:
++
++  - ``aarch64-apple-darwin`` for Apple Silicon devices.
++  - ``x86_64-apple-darwin`` for Intel devices.
++
++* ``/path/to/python.exe`` is the path to a Python binary on the machine that
++  will be running the compiler. This is needed because the Python compilation
++  process involves running some Python code. On a normal desktop build of
++  Python, you can compile a python interpreter and then use that interpreter to
++  run Python code. However, the binaries produced for watchOS won't run on macOS, so
++  you need to provide an external Python interpreter. This interpreter must be
++  the version as the Python that is being compiled.
++
++Using a framework-based Python on watchOS
++======================================
+--- /dev/null
++++ b/Apple/watchOS/Resources/Info.plist.in
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
++<plist version="0.9">
++<dict>
++	<key>CFBundleDevelopmentRegion</key>
++	<string>en</string>
++	<key>CFBundleExecutable</key>
++	<string>Python</string>
++	<key>CFBundleGetInfoString</key>
++	<string>Python Runtime and Library</string>
++	<key>CFBundleIdentifier</key>
++	<string>@PYTHONFRAMEWORKIDENTIFIER@</string>
++	<key>CFBundleInfoDictionaryVersion</key>
++	<string>6.0</string>
++	<key>CFBundleName</key>
++	<string>Python</string>
++	<key>CFBundlePackageType</key>
++	<string>FMWK</string>
++	<key>CFBundleShortVersionString</key>
++	<string>%VERSION%</string>
++	<key>CFBundleLongVersionString</key>
++	<string>%VERSION%, (c) 2001-2023 Python Software Foundation.</string>
++	<key>CFBundleSignature</key>
++	<string>????</string>
++	<key>CFBundleVersion</key>
++	<string>%VERSION%</string>
++	<key>CFBundleSupportedPlatforms</key>
++	<array>
++		<string>watchOS</string>
++	</array>
++	<key>MinimumOSVersion</key>
++	<string>@WATCHOS_DEPLOYMENT_TARGET@</string>
++</dict>
++</plist>
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target arm64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target arm64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator clang -target arm64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64-apple-watchos-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} strip -arch arm64 "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64_32-apple-watchos-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64_32-apple-watchos-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos${WATCHOS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64_32-apple-watchos-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang++ -target arm64_32-apple-watchos${WATCHOS_DEPLOYMENT_TARGET} "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/arm64_32-apple-watchos-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos${WATCHOS_DEPLOYMENT_TARGET} -E "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-ar
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} ar "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target x86_64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-cpp
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos${WATCHOS_DEPLOYMENT_TARGET}-simulator -E "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/bin/x86_64-apple-watchos-simulator-strip
+@@ -0,0 +1,2 @@
++#!/bin/sh
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} strip -arch x86_64 "$@"
+--- /dev/null
++++ b/Apple/watchOS/Resources/pyconfig.h
+@@ -0,0 +1,11 @@
++#ifdef __arm64__
++#  ifdef __LP64__
++#include "pyconfig-arm64.h"
++#  else
++#include "pyconfig-arm64_32.h"
++#  endif
++#endif
++
++#ifdef __x86_64__
++#include "pyconfig-x86_64.h"
++#endif
+diff --git a/Doc/using/ios.rst b/Doc/using/ios.rst
+index 685d8e81add..4ed18f4938c 100644
+--- a/Doc/using/ios.rst
++++ b/Doc/using/ios.rst
+@@ -170,7 +170,7 @@
+ To add Python to an iOS Xcode project:
+ 
+ 1. Build or obtain a Python ``XCFramework``. See the instructions in
+-   :source:`iOS/README.rst` (in the CPython source distribution) for details on
++   :source:`Apple/iOS/README.md` (in the CPython source distribution) for details on
+    how to build a Python ``XCFramework``. At a minimum, you will need a build
+    that supports ``arm64-apple-ios``, plus one of either
+    ``arm64-apple-ios-simulator`` or ``x86_64-apple-ios-simulator``.
+@@ -180,22 +180,19 @@
+    of your project; however, you can use any other location that you want by
+    adjusting paths as needed.
+ 
+-3. Drag the ``iOS/Resources/dylib-Info-template.plist`` file into your project,
+-   and ensure it is associated with the app target.
+-
+-4. Add your application code as a folder in your Xcode project. In the
++3. Add your application code as a folder in your Xcode project. In the
+    following instructions, we'll assume that your user code is in a folder
+    named ``app`` in the root of your project; you can use any other location by
+    adjusting paths as needed. Ensure that this folder is associated with your
+    app target.
+ 
+-5. Select the app target by selecting the root node of your Xcode project, then
++4. Select the app target by selecting the root node of your Xcode project, then
+    the target name in the sidebar that appears.
+ 
+-6. In the "General" settings, under "Frameworks, Libraries and Embedded
++5. In the "General" settings, under "Frameworks, Libraries and Embedded
+    Content", add ``Python.xcframework``, with "Embed & Sign" selected.
+ 
+-7. In the "Build Settings" tab, modify the following:
++6. In the "Build Settings" tab, modify the following:
+ 
+    - Build Options
+ 
+@@ -211,86 +208,24 @@
+ 
+      * Quoted Include In Framework Header: No
+ 
+-8. Add a build step that copies the Python standard library into your app. In
+-   the "Build Phases" tab, add a new "Run Script" build step *before* the
+-   "Embed Frameworks" step, but *after* the "Copy Bundle Resources" step. Name
+-   the step "Install Target Specific Python Standard Library", disable the
+-   "Based on dependency analysis" checkbox, and set the script content to:
++7. Add a build step that processes the Python standard library, and your own
++   Python binary dependencies. In the "Build Phases" tab, add a new "Run
++   Script" build step *before* the "Embed Frameworks" step, but *after* the
++   "Copy Bundle Resources" step. Name the step "Process Python libraries",
++   disable the "Based on dependency analysis" checkbox, and set the script
++   content to:
+ 
+    .. code-block:: bash
+ 
+-       set -e
+-
+-       mkdir -p "$CODESIGNING_FOLDER_PATH/python/lib"
+-       if [ "$EFFECTIVE_PLATFORM_NAME" = "-iphonesimulator" ]; then
+-           echo "Installing Python modules for iOS Simulator"
+-           rsync -au --delete "$PROJECT_DIR/Python.xcframework/ios-arm64_x86_64-simulator/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
+-       else
+-           echo "Installing Python modules for iOS Device"
+-           rsync -au --delete "$PROJECT_DIR/Python.xcframework/ios-arm64/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
+-       fi
+-
+-   Note that the name of the simulator "slice" in the XCframework may be
+-   different, depending the CPU architectures your ``XCFramework`` supports.
+-
+-9. Add a second build step that processes the binary extension modules in the
+-   standard library into "Framework" format. Add a "Run Script" build step
+-   *directly after* the one you added in step 8, named "Prepare Python Binary
+-   Modules". It should also have "Based on dependency analysis" unchecked, with
+-   the following script content:
++      set -e
++      source $PROJECT_DIR/Python.xcframework/build/build_utils.sh
++      install_python Python.xcframework app
+ 
+-   .. code-block:: bash
++   If you have placed your XCframework somewhere other than the root of your
++   project, modify the path to the first argument.
+ 
+-       set -e
+-
+-       install_dylib () {
+-           INSTALL_BASE=$1
+-           FULL_EXT=$2
+-
+-           # The name of the extension file
+-           EXT=$(basename "$FULL_EXT")
+-           # The location of the extension file, relative to the bundle
+-           RELATIVE_EXT=${FULL_EXT#$CODESIGNING_FOLDER_PATH/}
+-           # The path to the extension file, relative to the install base
+-           PYTHON_EXT=${RELATIVE_EXT/$INSTALL_BASE/}
+-           # The full dotted name of the extension module, constructed from the file path.
+-           FULL_MODULE_NAME=$(echo $PYTHON_EXT | cut -d "." -f 1 | tr "/" ".");
+-           # A bundle identifier; not actually used, but required by Xcode framework packaging
+-           FRAMEWORK_BUNDLE_ID=$(echo $PRODUCT_BUNDLE_IDENTIFIER.$FULL_MODULE_NAME | tr "_" "-")
+-           # The name of the framework folder.
+-           FRAMEWORK_FOLDER="Frameworks/$FULL_MODULE_NAME.framework"
+-
+-           # If the framework folder doesn't exist, create it.
+-           if [ ! -d "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER" ]; then
+-               echo "Creating framework for $RELATIVE_EXT"
+-               mkdir -p "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER"
+-               cp "$CODESIGNING_FOLDER_PATH/dylib-Info-template.plist" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
+-               plutil -replace CFBundleExecutable -string "$FULL_MODULE_NAME" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
+-               plutil -replace CFBundleIdentifier -string "$FRAMEWORK_BUNDLE_ID" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/Info.plist"
+-           fi
+-
+-           echo "Installing binary for $FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
+-           mv "$FULL_EXT" "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME"
+-           # Create a placeholder .fwork file where the .so was
+-           echo "$FRAMEWORK_FOLDER/$FULL_MODULE_NAME" > ${FULL_EXT%.so}.fwork
+-           # Create a back reference to the .so file location in the framework
+-           echo "${RELATIVE_EXT%.so}.fwork" > "$CODESIGNING_FOLDER_PATH/$FRAMEWORK_FOLDER/$FULL_MODULE_NAME.origin"
+-        }
+-
+-        PYTHON_VER=$(ls -1 "$CODESIGNING_FOLDER_PATH/python/lib")
+-        echo "Install Python $PYTHON_VER standard library extension modules..."
+-        find "$CODESIGNING_FOLDER_PATH/python/lib/$PYTHON_VER/lib-dynload" -name "*.so" | while read FULL_EXT; do
+-           install_dylib python/lib/$PYTHON_VER/lib-dynload/ "$FULL_EXT"
+-        done
+-
+-        # Clean up dylib template
+-        rm -f "$CODESIGNING_FOLDER_PATH/dylib-Info-template.plist"
+-
+-        echo "Signing frameworks as $EXPANDED_CODE_SIGN_IDENTITY_NAME ($EXPANDED_CODE_SIGN_IDENTITY)..."
+-        find "$CODESIGNING_FOLDER_PATH/Frameworks" -name "*.framework" -exec /usr/bin/codesign --force --sign "$EXPANDED_CODE_SIGN_IDENTITY" ${OTHER_CODE_SIGN_FLAGS:-} -o runtime --timestamp=none --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der "{}" \;
+-
+-10. Add Objective C code to initialize and use a Python interpreter in embedded
+-    mode. You should ensure that:
++8. Add Objective C code to initialize and use a Python interpreter in embedded
++   mode. You should ensure that:
+ 
+    * UTF-8 mode (:c:member:`PyPreConfig.utf8_mode`) is *enabled*;
+    * Buffered stdio (:c:member:`PyConfig.buffered_stdio`) is *disabled*;
+@@ -307,22 +242,19 @@
+    Your app's bundle location can be determined using ``[[NSBundle mainBundle]
+    resourcePath]``.
+ 
+-Steps 8, 9 and 10 of these instructions assume that you have a single folder of
++Steps 7 and 8 of these instructions assume that you have a single folder of
+ pure Python application code, named ``app``. If you have third-party binary
+ modules in your app, some additional steps will be required:
+ 
+ * You need to ensure that any folders containing third-party binaries are
+-  either associated with the app target, or copied in as part of step 8. Step 8
+-  should also purge any binaries that are not appropriate for the platform a
+-  specific build is targeting (i.e., delete any device binaries if you're
+-  building an app targeting the simulator).
+-
+-* Any folders that contain third-party binaries must be processed into
+-  framework form by step 9. The invocation of ``install_dylib`` that processes
+-  the ``lib-dynload`` folder can be copied and adapted for this purpose.
++  either associated with the app target, or are explicitly copied as part of
++  step 7. Step 7 should also purge any binaries that are not appropriate for
++  the platform a specific build is targeting (i.e., delete any device binaries
++  if you're building an app targeting the simulator).
+ 
+-* If you're using a separate folder for third-party packages, ensure that folder
+-  is included as part of the :envvar:`PYTHONPATH` configuration in step 10.
++* If you're using a separate folder for third-party packages, ensure that
++  folder is added to the end of the call to ``install_python`` in step 7, and
++  as part of the :envvar:`PYTHONPATH` configuration in step 8.
+ 
+ * If any of the folders that contain third-party packages will contain ``.pth``
+   files, you should add that folder as a *site directory* (using
+@@ -332,25 +264,30 @@
+ Testing a Python package
+ ------------------------
+ 
+-The CPython source tree contains :source:`a testbed project <iOS/testbed>` that
++The CPython source tree contains :source:`a testbed project <Apple/iOS/testbed>` that
+ is used to run the CPython test suite on the iOS simulator. This testbed can also
+ be used as a testbed project for running your Python library's test suite on iOS.
+ 
+-After building or obtaining an iOS XCFramework (See :source:`iOS/README.rst`
+-for details), create a clone of the Python iOS testbed project by running:
++After building or obtaining an iOS XCFramework (see :source:`Apple/iOS/README.md`
++for details), create a clone of the Python iOS testbed project. If you used the
++``Apple`` build script to build the XCframework, you can run:
++
++.. code-block:: bash
++
++    $ python cross-build/iOS/testbed clone --app <path/to/module1> --app <path/to/module2> app-testbed
++
++Or, if you've sourced your own XCframework, by running:
+ 
+ .. code-block:: bash
+ 
+-    $ python iOS/testbed clone --framework <path/to/Python.xcframework> --app <path/to/module1> --app <path/to/module2> app-testbed
++    $ python Apple/testbed clone --platform iOS --framework <path/to/Python.xcframework> --app <path/to/module1> --app <path/to/module2> app-testbed
+ 
+-You will need to modify the ``iOS/testbed`` reference to point to that
+-directory in the CPython source tree; any folders specified with the ``--app``
+-flag will be copied into the cloned testbed project. The resulting testbed will
+-be created in the ``app-testbed`` folder. In this example, the ``module1`` and
+-``module2`` would be importable modules at runtime. If your project has
+-additional dependencies, they can be installed into the
+-``app-testbed/iOSTestbed/app_packages`` folder (using ``pip install --target
+-app-testbed/iOSTestbed/app_packages`` or similar).
++Any folders specified with the ``--app`` flag will be copied into the cloned
++testbed project. The resulting testbed will be created in the ``app-testbed``
++folder. In this example, the ``module1`` and ``module2`` would be importable
++modules at runtime. If your project has additional dependencies, they can be
++installed into the ``app-testbed/Testbed/app_packages`` folder (using ``pip
++install --target app-testbed/Testbed/app_packages`` or similar).
+ 
+ You can then use the ``app-testbed`` folder to run the test suite for your app,
+ For example, if ``module1.tests`` was the entry point to your test suite, you
+@@ -372,13 +309,29 @@
+ 
+ This will allow you to use the full Xcode suite of tools for debugging.
+ 
++The arguments used to run the test suite are defined as part of the test plan.
++To modify the test plan, select the test plan node of the project tree (it
++should be the first child of the root node), and select the "Configurations"
++tab. Modify the "Arguments Passed On Launch" value to change the testing
++arguments.
++
++The test plan also disables parallel testing, and specifies the use of the
++``Testbed.lldbinit`` file for providing configuration of the debugger. The
++default debugger configuration disables automatic breakpoints on the
++``SIGINT``, ``SIGUSR1``, ``SIGUSR2``, and ``SIGXFSZ`` signals.
++
+ App Store Compliance
+ ====================
+ 
+ The only mechanism for distributing apps to third-party iOS devices is to
+ submit the app to the iOS App Store; apps submitted for distribution must pass
+ Apple's app review process. This process includes a set of automated validation
+-rules that inspect the submitted application bundle for problematic code.
++rules that inspect the submitted application bundle for problematic code. There
++are some steps that must be taken to ensure that your app will be able to pass
++these validation steps.
++
++Incompatible code in the standard library
++-----------------------------------------
+ 
+ The Python standard library contains some code that is known to violate these
+ automated rules. While these violations appear to be false positives, Apple's
+@@ -389,3 +342,18 @@
+ :source:`a patch file <Mac/Resources/app-store-compliance.patch>` that will remove
+ all code that is known to cause issues with the App Store review process. This
+ patch is applied automatically when building for iOS.
++
++Privacy manifests
++-----------------
++
++In April 2025, Apple introduced a requirement for `certain third-party
++libraries to provide a Privacy Manifest
++<https://developer.apple.com/support/third-party-SDK-requirements>`__.
++As a result, if you have a binary module that uses one of the affected
++libraries, you must provide an ``.xcprivacy`` file for that library.
++OpenSSL is one library affected by this requirement, but there are others.
++
++If you produce a binary module named ``mymodule.so``, and use you the Xcode
++build script described in step 7 above, you can place a ``mymodule.xcprivacy``
++file next to ``mymodule.so``, and the privacy manifest will be installed into
++the required location when the binary module is converted into a framework.
+diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
+index 8261773cef9..6612230265f 100644
+--- a/Lib/ctypes/__init__.py
++++ b/Lib/ctypes/__init__.py
+@@ -347,9 +347,9 @@
+         if name:
+             name = _os.fspath(name)
+ 
+-            # If the filename that has been provided is an iOS/tvOS/watchOS
+-            # .fwork file, dereference the location to the true origin of the
+-            # binary.
++            # If the filename that has been provided is an iOS, tvOS, visionOS
++            # or watchOS .fwork file, dereference the location to the true
++            # origin of the binary.
+             if name.endswith(".fwork"):
+                 with open(name) as f:
+                     name = _os.path.join(
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 117bf06cb01..87611a6d03f 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -67,7 +67,7 @@
+                 return fname
+         return None
+ 
+-elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
++elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "visionos", "watchos"}:
+     from ctypes.macholib.dyld import dyld_find as _dyld_find
+     def find_library(name):
+         possible = ['lib%s.dylib' % name,
+diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
+index eb8fea1aad0..9e1d8bf2995 100644
+--- a/Lib/importlib/_bootstrap_external.py
++++ b/Lib/importlib/_bootstrap_external.py
+@@ -52,7 +52,7 @@
+ 
+ # Bootstrap-related code ######################################################
+ _CASE_INSENSITIVE_PLATFORMS_STR_KEY = 'win',
+-_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'watchos'
++_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'visionos', 'watchos'
+ _CASE_INSENSITIVE_PLATFORMS =  (_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY
+                                 + _CASE_INSENSITIVE_PLATFORMS_STR_KEY)
+ 
+@@ -1799,7 +1799,7 @@
+     """
+     extension_loaders = []
+     if hasattr(_imp, 'create_dynamic'):
+-        if sys.platform in {"ios", "tvos", "watchos"}:
++        if sys.platform in {"ios", "tvos", "visionos", "watchos"}:
+             extension_loaders = [(AppleFrameworkLoader, [
+                 suffix.replace(".so", ".fwork")
+                 for suffix in _imp.extension_suffixes()
+diff --git a/Lib/platform.py b/Lib/platform.py
+index 8895177e326..9e1e0628671 100755
+--- a/Lib/platform.py
++++ b/Lib/platform.py
+@@ -522,6 +522,78 @@
+     return IOSVersionInfo(system, release, model, is_simulator)
+ 
+ 
++# A namedtuple for tvOS version information.
++TVOSVersionInfo = collections.namedtuple(
++    "TVOSVersionInfo",
++    ["system", "release", "model", "is_simulator"]
++)
++
++
++def tvos_ver(system="", release="", model="", is_simulator=False):
++    """Get tvOS version information, and return it as a namedtuple:
++        (system, release, model, is_simulator).
++
++    If values can't be determined, they are set to values provided as
++    parameters.
++    """
++    if sys.platform == "tvos":
++        # TODO: Can the iOS implementation be used here?
++        import _ios_support
++        result = _ios_support.get_platform_ios()
++        if result is not None:
++            return TVOSVersionInfo(*result)
++
++    return TVOSVersionInfo(system, release, model, is_simulator)
++
++
++# A namedtuple for watchOS version information.
++WatchOSVersionInfo = collections.namedtuple(
++    "WatchOSVersionInfo",
++    ["system", "release", "model", "is_simulator"]
++)
++
++
++def watchos_ver(system="", release="", model="", is_simulator=False):
++    """Get watchOS version information, and return it as a namedtuple:
++        (system, release, model, is_simulator).
++
++    If values can't be determined, they are set to values provided as
++    parameters.
++    """
++    if sys.platform == "watchos":
++        # TODO: Can the iOS implementation be used here?
++        import _ios_support
++        result = _ios_support.get_platform_ios()
++        if result is not None:
++            return WatchOSVersionInfo(*result)
++
++    return WatchOSVersionInfo(system, release, model, is_simulator)
++
++
++# A namedtuple for visionOS version information.
++VisionOSVersionInfo = collections.namedtuple(
++    "VisionOSVersionInfo",
++    ["system", "release", "model", "is_simulator"]
++)
++
++
++def visionos_ver(system="", release="", model="", is_simulator=False):
++    """Get visionOS version information, and return it as a namedtuple:
++        (system, release, model, is_simulator).
++
++    If values can't be determined, they are set to values provided as
++    parameters.
++    """
++    if sys.platform == "visionos":
++        # TODO: Can the iOS implementation be used here?
++        import _ios_support
++        result = _ios_support.get_platform_ios()
++        if result is not None:
++            return VisionOSVersionInfo(*result)
++
++    return VisionOSVersionInfo(system, release, model, is_simulator)
++
++
+ def _java_getprop(name, default):
+     """This private helper is deprecated in 3.13 and will be removed in 3.15"""
+     from java.lang import System
+@@ -721,7 +793,7 @@
+         default in case the command should fail.
+ 
+     """
+-    if sys.platform in {'dos', 'win32', 'win16', 'ios', 'tvos', 'watchos'}:
++    if sys.platform in {'dos', 'win32', 'win16', 'ios', 'tvos', 'visionos', 'watchos'}:
+         # XXX Others too ?
+         return default
+ 
+@@ -885,14 +957,30 @@
+             csid, cpu_number = vms_lib.getsyi('SYI$_CPU', 0)
+             return 'Alpha' if cpu_number >= 128 else 'VAX'
+ 
+-    # On the iOS simulator, os.uname returns the architecture as uname.machine.
+-    # On device it returns the model name for some reason; but there's only one
+-    # CPU architecture for iOS devices, so we know the right answer.
++    # On the iOS/tvOS/visionOS/watchOS simulator, os.uname returns the
++    # architecture as uname.machine. On device it returns the model name for
++    # some reason; but there's only one CPU architecture for devices, so we know
++    # the right answer.
+     def get_ios():
+         if sys.implementation._multiarch.endswith("simulator"):
+             return os.uname().machine
+         return 'arm64'
+ 
++    def get_tvos():
++        if sys.implementation._multiarch.endswith("simulator"):
++            return os.uname().machine
++        return 'arm64'
++
++    def get_visionos():
++        if sys.implementation._multiarch.endswith("simulator"):
++            return os.uname().machine
++        return 'arm64'
++
++    def get_watchos():
++        if sys.implementation._multiarch.endswith("simulator"):
++            return os.uname().machine
++        return 'arm64_32'
++
+     def from_subprocess():
+         """
+         Fall back to `uname -p`
+@@ -1052,9 +1140,15 @@
+         system = 'Android'
+         release = android_ver().release
+ 
+-    # Normalize responses on iOS
++    # Normalize responses on Apple mobile platforms
+     if sys.platform == 'ios':
+         system, release, _, _ = ios_ver()
++    if sys.platform == 'tvos':
++        system, release, _, _ = tvos_ver()
++    if sys.platform == 'visionos':
++        system, release, _, _ = visionos_ver()
++    if sys.platform == 'watchos':
++        system, release, _, _ = watchos_ver()
+ 
+     vals = system, node, release, version, machine
+     # Replace 'unknown' values with the more portable ''
+@@ -1344,6 +1438,12 @@
+         # macOS and iOS both report as a "Darwin" kernel
+         if sys.platform == "ios":
+             system, release, _, _ = ios_ver()
++        elif sys.platform == "tvos":
++            system, release, _, _ = tvos_ver()
++        elif sys.platform == "visionos":
++            system, release, _, _ = visionos_ver()
++        elif sys.platform == "watchos":
++            system, release, _, _ = watchos_ver()
+         else:
+             macos_release = mac_ver()[0]
+             if macos_release:
+diff --git a/Lib/site.py b/Lib/site.py
+index aedf36399c3..72383a0957c 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -292,8 +292,8 @@
+     if env_base:
+         return env_base
+ 
+-    # Emscripten, iOS, tvOS, VxWorks, WASI, and watchOS have no home directories
+-    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "wasi", "watchos"}:
++    # Emscripten, iOS, tvOS, visionOS, VxWorks, WASI, and watchOS have no home directories
++    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "visionos", "wasi", "watchos"}:
+         return None
+ 
+     def joinuser(*args):
+diff --git a/Lib/subprocess.py b/Lib/subprocess.py
+index ffc3fdf6afb..7df38b4f3d8 100644
+--- a/Lib/subprocess.py
++++ b/Lib/subprocess.py
+@@ -75,7 +75,7 @@
+     _mswindows = True
+ 
+ # some platforms do not support subprocesses
+-_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos"}
++_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "visionos", "watchos"}
+ 
+ if _mswindows:
+     import _winapi
+diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
+index 510c7b9568a..91ecd8a28d8 100644
+--- a/Lib/sysconfig/__init__.py
++++ b/Lib/sysconfig/__init__.py
+@@ -23,6 +23,9 @@
+ _ALWAYS_STR = {
+     'IPHONEOS_DEPLOYMENT_TARGET',
+     'MACOSX_DEPLOYMENT_TARGET',
++    'TVOS_DEPLOYMENT_TARGET',
++    'WATCHOS_DEPLOYMENT_TARGET',
++    'XROS_DEPLOYMENT_TARGET',
+ }
+ 
+ _INSTALL_SCHEMES = {
+@@ -117,7 +120,7 @@
+         return env_base
+ 
+     # Emscripten, iOS, tvOS, VxWorks, WASI, and watchOS have no home directories
+-    if sys.platform in {"emscripten", "ios", "tvos", "vxworks", "wasi", "watchos"}:
++    if sys.platform in {"emscripten", "ios", "tvos", "visionos", "vxworks", "wasi", "watchos"}:
+         return None
+ 
+     def joinuser(*args):
+@@ -676,6 +679,18 @@
+             release = get_config_vars().get("IPHONEOS_DEPLOYMENT_TARGET", "13.0")
+             osname = sys.platform
+             machine = sys.implementation._multiarch
++        elif sys.platform == "tvos":
++            release = get_config_vars().get("TVOS_DEPLOYMENT_TARGET", "12.0")
++            osname = sys.platform
++            machine = sys.implementation._multiarch
++        elif sys.platform == "watchos":
++            release = get_config_vars().get("WATCHOS_DEPLOYMENT_TARGET", "4.0")
++            osname = sys.platform
++            machine = sys.implementation._multiarch
++        elif sys.platform == "visionos":
++            release = get_config_vars().get("XROS_DEPLOYMENT_TARGET", "2.0")
++            osname = sys.platform
++            machine = sys.implementation._multiarch
+         else:
+             import _osx_support
+             osname, release, machine = _osx_support.get_platform_osx(
+diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
+index 44c5b28f455..0b4f874ec15 100644
+--- a/Lib/test/datetimetester.py
++++ b/Lib/test/datetimetester.py
+@@ -6840,9 +6840,9 @@
+                     self.assertEqual(dt_orig, dt_rt)
+ 
+     def test_type_check_in_subinterp(self):
+-        # iOS requires the use of the custom framework loader,
++        # Apple mobile platforms require the use of the custom framework loader,
+         # not the ExtensionFileLoader.
+-        if sys.platform == "ios":
++        if support.is_apple_mobile:
+             extension_loader = "AppleFrameworkLoader"
+         else:
+             extension_loader = "ExtensionFileLoader"
+diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
+index c60fc03064f..0b71e6d9511 100644
+--- a/Lib/test/support/__init__.py
++++ b/Lib/test/support/__init__.py
+@@ -554,7 +554,7 @@
+ 
+ is_android = sys.platform == "android"
+ 
+-if sys.platform not in {"win32", "vxworks", "ios", "tvos", "watchos"}:
++if sys.platform not in {"win32", "vxworks", "ios", "tvos", "visionos", "watchos"}:
+     unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
+ else:
+     unix_shell = None
+@@ -564,7 +564,7 @@
+ is_emscripten = sys.platform == "emscripten"
+ is_wasi = sys.platform == "wasi"
+ 
+-is_apple_mobile = sys.platform in {"ios", "tvos", "watchos"}
++is_apple_mobile = sys.platform in {"ios", "tvos", "visionos", "watchos"}
+ is_apple = is_apple_mobile or sys.platform == "darwin"
+ 
+ has_fork_support = hasattr(os, "fork") and not (
+diff --git a/Lib/test/test__interpreters.py b/Lib/test/test__interpreters.py
+index 6fb2bc24fa3..88cb6691cd8 100644
+--- a/Lib/test/test__interpreters.py
++++ b/Lib/test/test__interpreters.py
+@@ -695,6 +695,7 @@
+                     f'assert(obj == {obj!r})',
+                 )
+ 
++    @support.requires_subprocess()
+     def test_os_exec(self):
+         expected = 'spam spam spam spam spam'
+         subinterp = _interpreters.create()
+diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
+index ed277276b51..c846a9bc5d7 100644
+--- a/Lib/test/test_platform.py
++++ b/Lib/test/test_platform.py
+@@ -236,13 +236,21 @@
+             if sys.platform == "android":
+                 self.assertEqual(res.system, "Android")
+                 self.assertEqual(res.release, platform.android_ver().release)
+-            elif sys.platform == "ios":
++            elif support.is_apple_mobile:
+                 # Platform module needs ctypes for full operation. If ctypes
+                 # isn't available, there's no ObjC module, and dummy values are
+                 # returned.
+                 if _ctypes:
+-                    self.assertIn(res.system, {"iOS", "iPadOS"})
+-                    self.assertEqual(res.release, platform.ios_ver().release)
++                    if sys.platform == "ios":
++                        # iPads also identify as iOS
++                        self.assertIn(res.system, {"iOS", "iPadOS"})
++                    else:
++                        # All other platforms - sys.platform is the lower case
++                        # form of system (e.g., visionOS->visionos)
++                        self.assertEqual(res.system.lower(), sys.platform)
++                    # Use the platform-specific version method
++                    platform_ver = getattr(platform, f"{sys.platform}_ver")
++                    self.assertEqual(res.release, platform_ver().release)
+                 else:
+                     self.assertEqual(res.system, "")
+                     self.assertEqual(res.release, "")
+diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
+index 4fcbc5c2e59..851bd6e8f3c 100644
+--- a/Lib/test/test_webbrowser.py
++++ b/Lib/test/test_webbrowser.py
+@@ -234,7 +234,8 @@
+                    arguments=[f'openURL({URL},new-tab)'])
+ 
+ 
+-@unittest.skipUnless(sys.platform == "ios", "Test only applicable to iOS")
++@unittest.skipUnless(sys.platform in {"ios", "visionOS"},
++                     "Test only applicable to iOS and visionOS")
+ class IOSBrowserTest(unittest.TestCase):
+     def _obj_ref(self, *args):
+         # Construct a string representation of the arguments that can be used
+diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
+index 2f9555ad60d..249756ba4de 100755
+--- a/Lib/webbrowser.py
++++ b/Lib/webbrowser.py
+@@ -489,7 +489,8 @@
+         # OS X can use below Unix support (but we prefer using the OS X
+         # specific stuff)
+ 
+-    if sys.platform == "ios":
++    if sys.platform in {"ios", "visionos"}:
++        # iOS and visionOS provide a browser; tvOS and watchOS don't.
+         register("iosbrowser", None, IOSBrowser(), preferred=True)
+ 
+     if sys.platform == "serenityos":
+@@ -616,9 +617,10 @@
+             return not rc
+ 
+ #
+-# Platform support for iOS
++# Platform support for Apple Mobile platforms that provide a browser
++# (i.e., iOS and visionOS)
+ #
+-if sys.platform == "ios":
++if sys.platform in {"ios", "visionos"}:
+     from _ios_support import objc
+     if objc:
+         # If objc exists, we know ctypes is also importable.
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index a7dc9709d62..a1c3b6f625a 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -202,6 +202,12 @@
+ # the build, and is only listed here so it will be included in sysconfigdata.
+ IPHONEOS_DEPLOYMENT_TARGET=@IPHONEOS_DEPLOYMENT_TARGET@
+ 
++# visionOS Deployment target is *actually* used during the build, by the
++# compiler shims; export.
++XROS_DEPLOYMENT_TARGET=@XROS_DEPLOYMENT_TARGET@
++@EXPORT_XROS_DEPLOYMENT_TARGET@export XROS_DEPLOYMENT_TARGET
++
++
+ # Option to install to strip binaries
+ STRIPFLAG=-s
+ 
+@@ -2087,7 +2093,7 @@
+ 	fi
+ 
+ 	# Clone the testbed project into the XCFOLDER
+-	$(PYTHON_FOR_BUILD) $(srcdir)/iOS/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
++	$(PYTHON_FOR_BUILD) $(srcdir)/Apple/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
+ 
+ 	# Run the testbed project
+ 	$(PYTHON_FOR_BUILD) "$(XCFOLDER)" run --verbose -- test -uall --single-process --rerun -W
+@@ -2976,10 +2982,10 @@
+ 	-find build -type f -a ! -name '*.gc??' -exec rm -f {} ';'
+ 	-rm -f Include/pydtrace_probes.h
+ 	-rm -f profile-gen-stamp
+-	-rm -rf iOS/testbed/Python.xcframework/ios-*/bin
+-	-rm -rf iOS/testbed/Python.xcframework/ios-*/lib
+-	-rm -rf iOS/testbed/Python.xcframework/ios-*/include
+-	-rm -rf iOS/testbed/Python.xcframework/ios-*/Python.framework
++	-rm -rf Apple/iOS/testbed/Python.xcframework/ios-*/bin
++	-rm -rf Apple/iOS/testbed/Python.xcframework/ios-*/lib
++	-rm -rf Apple/iOS/testbed/Python.xcframework/ios-*/include
++	-rm -rf Apple/iOS/testbed/Python.xcframework/ios-*/Python.framework
+ 
+ .PHONY: profile-removal
+ profile-removal:
+@@ -3005,7 +3011,7 @@
+ 		config.cache config.log pyconfig.h Modules/config.c
+ 	-rm -rf build platform
+ 	-rm -rf $(PYTHONFRAMEWORKDIR)
+-	-rm -rf iOS/Frameworks
++	-rm -rf Apple/iOS/Frameworks
+ 	-rm -rf iOSTestbed.*
+ 	-rm -f python-config.py python-config
+ 	-rm -rf cross-build
+diff --git a/Misc/platform_triplet.c b/Misc/platform_triplet.c
+index f5cd73bdea8..6c1863c943b 100644
+--- a/Misc/platform_triplet.c
++++ b/Misc/platform_triplet.c
+@@ -257,6 +257,32 @@
+ #    else
+ PLATFORM_TRIPLET=arm64-iphoneos
+ #    endif
++#  elif defined(TARGET_OS_TV) && TARGET_OS_TV
++#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
++#      if __x86_64__
++PLATFORM_TRIPLET=x86_64-appletvsimulator
++#      else
++PLATFORM_TRIPLET=arm64-appletvsimulator
++#      endif
++#    else
++PLATFORM_TRIPLET=arm64-appletvos
++#    endif
++#  elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH
++#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
++#      if __x86_64__
++PLATFORM_TRIPLET=x86_64-watchsimulator
++#      else
++PLATFORM_TRIPLET=arm64-watchsimulator
++#      endif
++#    else
++PLATFORM_TRIPLET=arm64_32-watchos
++#    endif
++#  elif defined(TARGET_OS_VISION) && TARGET_OS_VISION
++#    if defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR
++PLATFORM_TRIPLET=arm64-xrsimulator
++#    else
++PLATFORM_TRIPLET=arm64-xros
++#    endif
+ // Older macOS SDKs do not define TARGET_OS_OSX
+ #  elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX
+ PLATFORM_TRIPLET=darwin
+diff --git a/config.sub b/config.sub
+index 1bb6a05dc11..49febd56a37 100755
+--- a/config.sub
++++ b/config.sub
+@@ -1743,7 +1743,7 @@
+ 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+ 	     | hiux* | abug | nacl* | netware* | windows* \
+-	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
++	     | os9* | macos* | osx* | ios* | tvos* | watchos* | xros* \
+ 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+ 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+ 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+@@ -1867,7 +1867,7 @@
+ 		;;
+ 	*-eabi*- | *-gnueabi*-)
+ 		;;
+-	ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
++	ios*-simulator- | tvos*-simulator- | watchos*-simulator- | xros*-simulator-)
+ 		;;
+ 	none--*)
+ 		# None (no kernel, i.e. freestanding / bare metal),
+diff --git a/configure b/configure
+index 901a26c9602..508d01f1b7e 100755
+--- a/configure
++++ b/configure
+@@ -979,6 +979,10 @@
+ CFLAGS
+ CC
+ HAS_XCRUN
++EXPORT_XROS_DEPLOYMENT_TARGET
++WATCHOS_DEPLOYMENT_TARGET
++XROS_DEPLOYMENT_TARGET
++TVOS_DEPLOYMENT_TARGET
+ IPHONEOS_DEPLOYMENT_TARGET
+ EXPORT_MACOSX_DEPLOYMENT_TARGET
+ CONFIGURE_MACOSX_DEPLOYMENT_TARGET
+@@ -4058,6 +4062,15 @@
+ 	*-apple-ios*)
+ 		ac_sys_system=iOS
+ 		;;
++	*-apple-tvos*)
++		ac_sys_system=tvOS
++		;;
++	*-apple-xros*)
++		ac_sys_system=visionOS
++		;;
++	*-apple-watchos*)
++		ac_sys_system=watchOS
++		;;
+ 	*-*-vxworks*)
+ 	    ac_sys_system=VxWorks
+ 	    ;;
+@@ -4112,7 +4125,7 @@
+ # On cross-compile builds, configure will look for a host-specific compiler by
+ # prepending the user-provided host triple to the required binary name.
+ #
+-# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
++# On iOS/tvOS/visionOS/watchOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
+ # which isn't a binary that exists, and isn't very convenient, as it contains the
+ # iOS version. As the default cross-compiler name won't exist, configure falls
+ # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
+@@ -4127,6 +4140,17 @@
+ 		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
+ 		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
+ 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
++
++		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
++		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
++		x86_64-apple-tvos*-simulator)  AR=x86_64-apple-tvos-simulator-ar ;;
++
++		aarch64-apple-xros*-simulator) AR=arm64-apple-xros-simulator-ar ;;
++		aarch64-apple-xros*)           AR=arm64-apple-xros-ar ;;
++
++		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
++		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
++		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
+ 		*)
+ 	esac
+ fi
+@@ -4135,6 +4159,17 @@
+ 		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
+ 		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
+ 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
++
++		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
++		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
++		x86_64-apple-tvos*-simulator)  CC=x86_64-apple-tvos-simulator-clang ;;
++
++		aarch64-apple-xros*-simulator) CC=arm64-apple-xros-simulator-clang ;;
++		aarch64-apple-xros*)           CC=arm64-apple-xros-clang ;;
++
++		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
++		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
++		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
+ 		*)
+ 	esac
+ fi
+@@ -4143,6 +4178,17 @@
+ 		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
+ 		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
+ 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
++
++		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
++		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
++		x86_64-apple-tvos*-simulator)  CPP=x86_64-apple-tvos-simulator-cpp ;;
++
++		aarch64-apple-xros*-simulator) CPP=arm64-apple-xros-simulator-cpp ;;
++		aarch64-apple-xros*)           CPP=arm64-apple-xros-cpp ;;
++
++		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
++		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
++		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
+ 		*)
+ 	esac
+ fi
+@@ -4151,6 +4197,17 @@
+ 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+ 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+ 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
++
++		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
++		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
++		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
++
++		aarch64-apple-xros*-simulator) CXX=arm64-apple-xros-simulator-clang++ ;;
++		aarch64-apple-xros*)           CXX=arm64-apple-xros-clang++ ;;
++
++		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
++		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
++		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
+ 		*)
+ 	esac
+ fi
+@@ -4271,8 +4328,11 @@
+ 	case $enableval in
+ 	yes)
+ 		case $ac_sys_system in
+-			Darwin) enableval=/Library/Frameworks ;;
+-			iOS)    enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
++			Darwin)  enableval=/Library/Frameworks ;;
++			iOS)     enableval=Apple/iOS/Frameworks/\$\(MULTIARCH\) ;;
++			tvOS)    enableval=Apple/tvOS/Frameworks/\$\(MULTIARCH\) ;;
++			visionOS) enableval=Apple/visionOS/Frameworks/\$\(MULTIARCH\) ;;
++			watchOS) enableval=Apple/watchOS/Frameworks/\$\(MULTIARCH\) ;;
+ 			*) as_fn_error $? "Unknown platform for framework build" "$LINENO" 5
+ 		esac
+ 	esac
+@@ -4281,6 +4341,9 @@
+ 	no)
+ 		case $ac_sys_system in
+ 			iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
++			tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
++			visionOS) as_fn_error $? "visionOS builds must use --enable-framework" "$LINENO" 5 ;;
++			watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
+ 			*)
+ 				PYTHONFRAMEWORK=
+ 				PYTHONFRAMEWORKDIR=no-framework
+@@ -4383,9 +4446,54 @@
+ 
+ 				prefix=$PYTHONFRAMEWORKPREFIX
+ 				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
+-				RESSRCDIR=iOS/Resources
++				RESSRCDIR=Apple/iOS/Resources
++
++				ac_config_files="$ac_config_files Apple/iOS/Resources/Info.plist"
++
++				;;
++			tvOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/tvOS/Resources
++
++				ac_config_files="$ac_config_files Apple/tvOS/Resources/Info.plist"
++
++				;;
++			visionOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/visionOS/Resources
++
++				ac_config_files="$ac_config_files Apple/visionOS/Resources/Info.plist"
++
++				;;
++			watchOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/watchOS/Resources
+ 
+-				ac_config_files="$ac_config_files iOS/Resources/Info.plist"
++				ac_config_files="$ac_config_files Apple/watchOS/Resources/Info.plist"
+ 
+ 				;;
+ 			*)
+@@ -4398,6 +4506,9 @@
+ 
+ 	case $ac_sys_system in
+ 		iOS) as_fn_error $? "iOS builds must use --enable-framework" "$LINENO" 5 ;;
++		tvOS) as_fn_error $? "tvOS builds must use --enable-framework" "$LINENO" 5 ;;
++		visionOS) as_fn_error $? "visionOS builds must use --enable-framework" "$LINENO" 5 ;;
++		watchOS) as_fn_error $? "watchOS builds must use --enable-framework" "$LINENO" 5 ;;
+ 		*)
+ 			PYTHONFRAMEWORK=
+ 			PYTHONFRAMEWORKDIR=no-framework
+@@ -4451,8 +4562,8 @@
+     case "$withval" in
+     yes)
+       case $ac_sys_system in
+-        Darwin|iOS)
+-          # iOS is able to share the macOS patch
++        Darwin|iOS|tvOS|visionOS|watchOS)
++          # iOS/tvOS/visionOS/watchOS is able to share the macOS patch
+           APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+           ;;
+         *) as_fn_error $? "no default app store compliance patch available for $ac_sys_system" "$LINENO" 5 ;;
+@@ -4470,8 +4581,8 @@
+ else $as_nop
+ 
+     case $ac_sys_system in
+-      iOS)
+-        # Always apply the compliance patch on iOS; we can use the macOS patch
++      iOS|tvOS|visionOS|watchOS)
++        # Always apply the compliance patch on iOS/tvOS/visionOS/watchOS; we can use the macOS patch
+         APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: applying default app store compliance patch" >&5
+ printf "%s\n" "applying default app store compliance patch" >&6; }
+@@ -4488,6 +4599,8 @@
+ 
+ 
+ 
++EXPORT_XROS_DEPLOYMENT_TARGET='#'
++
+ 
+ if test "$cross_compiling" = yes; then
+ 	case "$host" in
+@@ -4525,6 +4638,78 @@
+ 				;;
+ 		esac
+ 		;;
++	*-apple-tvos*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# TVOS_DEPLOYMENT_TARGET is the minimum supported tvOS version
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking tvOS deployment target" >&5
++printf %s "checking tvOS deployment target... " >&6; }
++		TVOS_DEPLOYMENT_TARGET=${_host_os:4}
++		TVOS_DEPLOYMENT_TARGET=${TVOS_DEPLOYMENT_TARGET:=12.0}
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TVOS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$TVOS_DEPLOYMENT_TARGET" >&6; }
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${TVOS_DEPLOYMENT_TARGET}-arm64-appletv${_host_device}
++				;;
++			*)
++				_host_ident=${TVOS_DEPLOYMENT_TARGET}-$host_cpu-appletv${_host_device}
++				;;
++		esac
++		;;
++	*-apple-xros*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# XROS_DEPLOYMENT_TARGET is the minimum supported visionOS version
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking visionOS deployment target" >&5
++printf %s "checking visionOS deployment target... " >&6; }
++		XROS_DEPLOYMENT_TARGET=${_host_os:8}
++		XROS_DEPLOYMENT_TARGET=${XROS_DEPLOYMENT_TARGET:=2.0}
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XROS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$XROS_DEPLOYMENT_TARGET" >&6; }
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking exporting flag of visionOS deployment target" >&5
++printf %s "checking exporting flag of visionOS deployment target... " >&6; }
++        	export XROS_DEPLOYMENT_TARGET
++		EXPORT_XROS_DEPLOYMENT_TARGET=''
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXPORT_XROS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$EXPORT_XROS_DEPLOYMENT_TARGET" >&6; }
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-arm64-xr${_host_device}
++				;;
++			*)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-$host_cpu-xr${_host_device}
++				;;
++		esac
++		;;
++	*-apple-watchos*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# WATCHOS_DEPLOYMENT_TARGET is the minimum supported watchOS version
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking watchOS deployment target" >&5
++printf %s "checking watchOS deployment target... " >&6; }
++		WATCHOS_DEPLOYMENT_TARGET=${_host_os:7}
++		WATCHOS_DEPLOYMENT_TARGET=${WATCHOS_DEPLOYMENT_TARGET:=4.0}
++		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WATCHOS_DEPLOYMENT_TARGET" >&5
++printf "%s\n" "$WATCHOS_DEPLOYMENT_TARGET" >&6; }
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-arm64-watch${_host_device}
++				;;
++			*)
++				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
++				;;
++		esac
++		;;
+ 	*-*-vxworks*)
+ 		_host_ident=$host_cpu
+ 		;;
+@@ -4603,9 +4788,15 @@
+     define_xopen_source=no;;
+   Darwin/[12][0-9].*)
+     define_xopen_source=no;;
+-  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
++  # On iOS/tvOS/visionOS/watchOS, defining _POSIX_C_SOURCE also disables platform specific features.
+   iOS/*)
+     define_xopen_source=no;;
++  tvOS/*)
++    define_xopen_source=no;;
++  visionOS/*)
++    define_xopen_source=no;;
++  watchOS/*)
++    define_xopen_source=no;;
+   # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
+   # defining NI_NUMERICHOST.
+   QNX/6.3.2)
+@@ -4668,7 +4859,14 @@
+ CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
+ EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
+ 
+-# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
++# XROS_DEPLOYMENT_TARGET / WATCHOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++
++
++
++
++
++# XROS_DEPLOYMENT_TARGET should get exported
+ 
+ 
+ # checks for alternative programs
+@@ -4709,6 +4907,16 @@
+     as_fn_append CFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
+     as_fn_append LDFLAGS " -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"
+    ;; #(
++  tvOS) :
++
++    as_fn_append CFLAGS " -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"
++    as_fn_append LDFLAGS " -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"
++   ;; #(
++  watchOS) :
++
++    as_fn_append CFLAGS " -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"
++    as_fn_append LDFLAGS " -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"
++   ;; #(
+   *) :
+      ;;
+ esac
+@@ -7010,6 +7218,12 @@
+     MULTIARCH="" ;; #(
+   iOS) :
+     MULTIARCH="" ;; #(
++  tvOS) :
++    MULTIARCH="" ;; #(
++  visionOS) :
++    MULTIARCH="" ;; #(
++  watchOS) :
++    MULTIARCH="" ;; #(
+   FreeBSD*) :
+     MULTIARCH="" ;; #(
+   *) :
+@@ -7030,7 +7244,7 @@
+ printf "%s\n" "$MULTIARCH" >&6; }
+ 
+ case $ac_sys_system in #(
+-  iOS) :
++  iOS|tvOS|visionOS|watchOS) :
+     SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2` ;; #(
+   *) :
+     SOABI_PLATFORM=$PLATFORM_TRIPLET
+@@ -7081,6 +7295,18 @@
+     PY_SUPPORT_TIER=3 ;; #(
+     aarch64-apple-ios*/clang) :
+     PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-tvos*-simulator/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-tvos*/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-xros*-simulator/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-xros*/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    aarch64-apple-watchos*-simulator/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
++    arm64_32-apple-watchos*/clang) :
++    PY_SUPPORT_TIER=3 ;; #(
+     aarch64-*-linux-android/clang) :
+     PY_SUPPORT_TIER=3 ;; #(
+     x86_64-*-linux-android/clang) :
+@@ -7554,7 +7780,7 @@
+   case $ac_sys_system in
+     Darwin)
+       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
+-    iOS)
++    iOS|tvOS|visionOS|watchOS)
+       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
+     *)
+       as_fn_error $? "Unknown platform for framework build" "$LINENO" 5;;
+@@ -7620,7 +7846,7 @@
+       BLDLIBRARY='-L. -lpython$(LDVERSION)'
+       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+       ;;
+-    iOS)
++    iOS|tvOS|visionOS|watchOS)
+       LDLIBRARY='libpython$(LDVERSION).dylib'
+       ;;
+     AIX*)
+@@ -12975,7 +13201,7 @@
+ 			BLDSHARED="$LDSHARED"
+ 		fi
+ 		;;
+-	iOS/*)
++	iOS/*|tvOS/*|visionOS/*|watchOS/*)
+ 		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
+ 		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
+ 		BLDSHARED="$LDSHARED"
+@@ -13108,7 +13334,7 @@
+ 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
+ 	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	# -u libsys_s pulls in all symbols in libsys
+-	Darwin/*|iOS/*)
++	Darwin/*|iOS/*|tvOS/*|visionOS/*|watchOS/*)
+ 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+ 
+ 		# Issue #18075: the default maximum stack size (8MBytes) is too
+@@ -13132,7 +13358,7 @@
+ 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ 			fi
+ 			LINKFORSHARED="$LINKFORSHARED"
+-		elif test $ac_sys_system = "iOS"; then
++		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "visionOS" -o "$ac_sys_system" = "watchOS"; then
+ 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
+ 		fi
+ 		;;
+@@ -14728,7 +14954,7 @@
+ 
+             ctypes_malloc_closure=yes
+      ;; #(
+-  iOS) :
++  iOS|tvOS|visionOS|watchOS) :
+ 
+       ctypes_malloc_closure=yes
+      ;; #(
+@@ -18197,12 +18423,6 @@
+ then :
+   printf "%s\n" "#define HAVE_DUP3 1" >>confdefs.h
+ 
+-fi
+-ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
+-if test "x$ac_cv_func_execv" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
+-
+ fi
+ ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
+ if test "x$ac_cv_func_explicit_bzero" = xyes
+@@ -18263,18 +18483,6 @@
+ then :
+   printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h
+ 
+-fi
+-ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
+-if test "x$ac_cv_func_fork" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
+-
+-fi
+-ac_fn_c_check_func "$LINENO" "fork1" "ac_cv_func_fork1"
+-if test "x$ac_cv_func_fork1" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_FORK1 1" >>confdefs.h
+-
+ fi
+ ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf"
+ if test "x$ac_cv_func_fpathconf" = xyes
+@@ -18707,24 +18915,6 @@
+ then :
+   printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h
+ 
+-fi
+-ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
+-if test "x$ac_cv_func_posix_spawn" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
+-
+-fi
+-ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
+-if test "x$ac_cv_func_posix_spawnp" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
+-
+-fi
+-ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addclosefrom_np" "ac_cv_func_posix_spawn_file_actions_addclosefrom_np"
+-if test "x$ac_cv_func_posix_spawn_file_actions_addclosefrom_np" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP 1" >>confdefs.h
+-
+ fi
+ ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
+ if test "x$ac_cv_func_pread" = xyes
+@@ -19013,12 +19203,6 @@
+ then :
+   printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
+ 
+-fi
+-ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
+-if test "x$ac_cv_func_sigaltstack" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
+-
+ fi
+ ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset"
+ if test "x$ac_cv_func_sigfillset" = xyes
+@@ -19287,11 +19471,11 @@
+ 
+ fi
+ 
+-# iOS defines some system methods that can be linked (so they are
++# iOS/tvOS/visionOS/watchOS define some system methods that can be linked (so they are
+ # found by configure), but either raise a compilation error (because the
+ # header definition prevents usage - autoconf doesn't use the headers), or
+ # raise an error if used at runtime. Force these symbols off.
+-if test "$ac_sys_system" != "iOS" ; then
++if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "visionOS" -a "$ac_sys_system" != "watchOS" ; then
+   ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
+ if test "x$ac_cv_func_getentropy" = xyes
+ then :
+@@ -19313,6 +19497,53 @@
+ 
+ fi
+ 
++# tvOS/watchOS have some additional methods that can be found, but not used.
++if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
++  ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv"
++if test "x$ac_cv_func_execv" = xyes
++then :
++  printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
++if test "x$ac_cv_func_fork" = xyes
++then :
++  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "fork1" "ac_cv_func_fork1"
++if test "x$ac_cv_func_fork1" = xyes
++then :
++  printf "%s\n" "#define HAVE_FORK1 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
++if test "x$ac_cv_func_posix_spawn" = xyes
++then :
++  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
++if test "x$ac_cv_func_posix_spawnp" = xyes
++then :
++  printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addclosefrom_np" "ac_cv_func_posix_spawn_file_actions_addclosefrom_np"
++if test "x$ac_cv_func_posix_spawn_file_actions_addclosefrom_np" = xyes
++then :
++  printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP 1" >>confdefs.h
++
++fi
++ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack"
++if test "x$ac_cv_func_sigaltstack" = xyes
++then :
++  printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h
++
++fi
++
++fi
++
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
+ printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+ if test ${ac_cv_c_undeclared_builtin_options+y}
+@@ -22135,7 +22366,8 @@
+ 
+ 
+ # check for openpty, login_tty, and forkpty
+-
++# tvOS/watchOS have functions for tty, but can't use them
++if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
+ 
+   for ac_func in openpty
+ do :
+@@ -22231,7 +22463,7 @@
+ fi
+ 
+ done
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
++  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
+ printf %s "checking for library containing login_tty... " >&6; }
+ if test ${ac_cv_search_login_tty+y}
+ then :
+@@ -22388,6 +22620,7 @@
+ fi
+ 
+ done
++fi
+ 
+ # check for long file support functions
+ ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
+@@ -22634,10 +22867,10 @@
+ 
+ done
+ 
+-# On Android and iOS, clock_settime can be linked (so it is found by
++# On Android, iOS, tvOS, visionOS, and watchOS, clock_settime can be linked (so it is found by
+ # configure), but when used in an unprivileged process, it crashes rather than
+ # returning an error. Force the symbol off.
+-if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
++if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "visionOS" -a "$ac_sys_system" != "watchOS"
+ then
+ 
+   for ac_func in clock_settime
+@@ -22923,7 +23156,7 @@
+   if test "$cross_compiling" = yes
+ then :
+ 
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS" || test "$ac_sys_system" = "tvOS" || test "$ac_sys_system" = "visionOS" || test "$ac_sys_system" = "watchOS"; then
+   ac_cv_buggy_getaddrinfo="no"
+ elif test "${enable_ipv6+set}" = set; then
+   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
+@@ -24869,8 +25102,8 @@
+   LIBPYTHON="\$(BLDLIBRARY)"
+ fi
+ 
+-# On iOS the shared libraries must be linked with the Python framework
+-if test "$ac_sys_system" = "iOS"; then
++# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
++if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "visionOS" -o $ac_sys_system = "watchOS"; then
+   MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
+ fi
+ 
+@@ -27518,7 +27751,7 @@
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
+ printf "%s\n" "$as_me: checking for device files" >&6;}
+ 
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "visionOS"  -o "$ac_sys_system" = "watchOS" ; then
+   ac_cv_file__dev_ptmx=no
+   ac_cv_file__dev_ptc=no
+ else
+@@ -27951,7 +28184,7 @@
+     with_ensurepip=no ;; #(
+   WASI) :
+     with_ensurepip=no ;; #(
+-  iOS) :
++  iOS|tvOS|visionOS|watchOS) :
+     with_ensurepip=no ;; #(
+   *) :
+     with_ensurepip=upgrade
+@@ -28970,7 +29203,7 @@
+  ;; #(
+     Darwin) :
+      ;; #(
+-  iOS) :
++  iOS|tvOS|visionOS|watchOS) :
+ 
+ 
+ 
+@@ -32734,7 +32967,10 @@
+     "Mac/PythonLauncher/Makefile") CONFIG_FILES="$CONFIG_FILES Mac/PythonLauncher/Makefile" ;;
+     "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
+     "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
+-    "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
++    "Apple/iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Apple/iOS/Resources/Info.plist" ;;
++    "Apple/tvOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Apple/tvOS/Resources/Info.plist" ;;
++    "Apple/visionOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Apple/visionOS/Resources/Info.plist" ;;
++    "Apple/watchOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Apple/watchOS/Resources/Info.plist" ;;
+     "Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
+     "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
+     "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
+diff --git a/configure.ac b/configure.ac
+index 597a44b331a..5109db2f48f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -330,6 +330,15 @@
+ 	*-apple-ios*)
+ 		ac_sys_system=iOS
+ 		;;
++	*-apple-tvos*)
++		ac_sys_system=tvOS
++		;;
++	*-apple-xros*)
++		ac_sys_system=visionOS
++		;;
++	*-apple-watchos*)
++		ac_sys_system=watchOS
++		;;
+ 	*-*-vxworks*)
+ 	    ac_sys_system=VxWorks
+ 	    ;;
+@@ -382,7 +391,7 @@
+ # On cross-compile builds, configure will look for a host-specific compiler by
+ # prepending the user-provided host triple to the required binary name.
+ #
+-# On iOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
++# On iOS/tvOS/visionOS/watchOS, this results in binaries like "arm64-apple-ios13.0-simulator-gcc",
+ # which isn't a binary that exists, and isn't very convenient, as it contains the
+ # iOS version. As the default cross-compiler name won't exist, configure falls
+ # back to gcc, which *definitely* won't work. We're providing wrapper scripts for
+@@ -397,6 +406,17 @@
+ 		aarch64-apple-ios*-simulator) AR=arm64-apple-ios-simulator-ar ;;
+ 		aarch64-apple-ios*)           AR=arm64-apple-ios-ar ;;
+ 		x86_64-apple-ios*-simulator)  AR=x86_64-apple-ios-simulator-ar ;;
++
++		aarch64-apple-tvos*-simulator) AR=arm64-apple-tvos-simulator-ar ;;
++		aarch64-apple-tvos*)           AR=arm64-apple-tvos-ar ;;
++		x86_64-apple-tvos*-simulator)  AR=x86_64-apple-tvos-simulator-ar ;;
++
++		aarch64-apple-xros*-simulator) AR=arm64-apple-xros-simulator-ar ;;
++		aarch64-apple-xros*)           AR=arm64-apple-xros-ar ;;
++
++		aarch64-apple-watchos*-simulator) AR=arm64-apple-watchos-simulator-ar ;;
++		aarch64-apple-watchos*)           AR=arm64_32-apple-watchos-ar ;;
++		x86_64-apple-watchos*-simulator)  AR=x86_64-apple-watchos-simulator-ar ;;
+ 		*)
+ 	esac
+ fi
+@@ -405,6 +425,17 @@
+ 		aarch64-apple-ios*-simulator) CC=arm64-apple-ios-simulator-clang ;;
+ 		aarch64-apple-ios*)           CC=arm64-apple-ios-clang ;;
+ 		x86_64-apple-ios*-simulator)  CC=x86_64-apple-ios-simulator-clang ;;
++
++		aarch64-apple-tvos*-simulator) CC=arm64-apple-tvos-simulator-clang ;;
++		aarch64-apple-tvos*)           CC=arm64-apple-tvos-clang ;;
++		x86_64-apple-tvos*-simulator)  CC=x86_64-apple-tvos-simulator-clang ;;
++
++		aarch64-apple-xros*-simulator) CC=arm64-apple-xros-simulator-clang ;;
++		aarch64-apple-xros*)           CC=arm64-apple-xros-clang ;;
++
++		aarch64-apple-watchos*-simulator) CC=arm64-apple-watchos-simulator-clang ;;
++		aarch64-apple-watchos*)           CC=arm64_32-apple-watchos-clang ;;
++		x86_64-apple-watchos*-simulator)  CC=x86_64-apple-watchos-simulator-clang ;;
+ 		*)
+ 	esac
+ fi
+@@ -413,6 +444,17 @@
+ 		aarch64-apple-ios*-simulator) CPP=arm64-apple-ios-simulator-cpp ;;
+ 		aarch64-apple-ios*)           CPP=arm64-apple-ios-cpp ;;
+ 		x86_64-apple-ios*-simulator)  CPP=x86_64-apple-ios-simulator-cpp ;;
++
++		aarch64-apple-tvos*-simulator) CPP=arm64-apple-tvos-simulator-cpp ;;
++		aarch64-apple-tvos*)           CPP=arm64-apple-tvos-cpp ;;
++		x86_64-apple-tvos*-simulator)  CPP=x86_64-apple-tvos-simulator-cpp ;;
++
++		aarch64-apple-xros*-simulator) CPP=arm64-apple-xros-simulator-cpp ;;
++		aarch64-apple-xros*)           CPP=arm64-apple-xros-cpp ;;
++
++		aarch64-apple-watchos*-simulator) CPP=arm64-apple-watchos-simulator-cpp ;;
++		aarch64-apple-watchos*)           CPP=arm64_32-apple-watchos-cpp ;;
++		x86_64-apple-watchos*-simulator)  CPP=x86_64-apple-watchos-simulator-cpp ;;
+ 		*)
+ 	esac
+ fi
+@@ -421,6 +463,17 @@
+ 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+ 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+ 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
++
++		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
++		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
++		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
++
++		aarch64-apple-xros*-simulator) CXX=arm64-apple-xros-simulator-clang++ ;;
++		aarch64-apple-xros*)           CXX=arm64-apple-xros-clang++ ;;
++
++		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
++		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
++		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
+ 		*)
+ 	esac
+ fi
+@@ -535,8 +588,11 @@
+ 	case $enableval in
+ 	yes)
+ 		case $ac_sys_system in
+-			Darwin) enableval=/Library/Frameworks ;;
+-			iOS)    enableval=iOS/Frameworks/\$\(MULTIARCH\) ;;
++			Darwin)  enableval=/Library/Frameworks ;;
++			iOS)     enableval=Apple/iOS/Frameworks/\$\(MULTIARCH\) ;;
++			tvOS)    enableval=Apple/tvOS/Frameworks/\$\(MULTIARCH\) ;;
++			visionOS) enableval=Apple/visionOS/Frameworks/\$\(MULTIARCH\) ;;
++			watchOS) enableval=Apple/watchOS/Frameworks/\$\(MULTIARCH\) ;;
+ 			*) AC_MSG_ERROR([Unknown platform for framework build])
+ 		esac
+ 	esac
+@@ -545,6 +601,9 @@
+ 	no)
+ 		case $ac_sys_system in
+ 			iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
++			tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
++			visionOS) AC_MSG_ERROR([visionOS builds must use --enable-framework]) ;;
++			watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
+ 			*)
+ 				PYTHONFRAMEWORK=
+ 				PYTHONFRAMEWORKDIR=no-framework
+@@ -643,9 +702,51 @@
+ 
+ 				prefix=$PYTHONFRAMEWORKPREFIX
+ 				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
+-				RESSRCDIR=iOS/Resources
++				RESSRCDIR=Apple/iOS/Resources
+ 
+-				AC_CONFIG_FILES([iOS/Resources/Info.plist])
++				AC_CONFIG_FILES([Apple/iOS/Resources/Info.plist])
++				;;
++			tvOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/tvOS/Resources
++
++				AC_CONFIG_FILES([Apple/tvOS/Resources/Info.plist])
++				;;
++			visionOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/visionOS/Resources
++
++				AC_CONFIG_FILES([Apple/visionOS/Resources/Info.plist])
++				;;
++			watchOS) :
++				FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
++				FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
++				FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
++				FRAMEWORKPYTHONW=
++				INSTALLTARGETS="libinstall inclinstall sharedinstall"
++
++				prefix=$PYTHONFRAMEWORKPREFIX
++				PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
++				RESSRCDIR=Apple/watchOS/Resources
++
++				AC_CONFIG_FILES([Apple/watchOS/Resources/Info.plist])
+ 				;;
+ 			*)
+ 				AC_MSG_ERROR([Unknown platform for framework build])
+@@ -655,6 +756,9 @@
+ 	],[
+ 	case $ac_sys_system in
+ 		iOS) AC_MSG_ERROR([iOS builds must use --enable-framework]) ;;
++		tvOS) AC_MSG_ERROR([tvOS builds must use --enable-framework]) ;;
++		visionOS) AC_MSG_ERROR([visionOS builds must use --enable-framework]) ;;
++		watchOS) AC_MSG_ERROR([watchOS builds must use --enable-framework]) ;;
+ 		*)
+ 			PYTHONFRAMEWORK=
+ 			PYTHONFRAMEWORKDIR=no-framework
+@@ -707,8 +811,8 @@
+     case "$withval" in
+     yes)
+       case $ac_sys_system in
+-        Darwin|iOS)
+-          # iOS is able to share the macOS patch
++        Darwin|iOS|tvOS|visionOS|watchOS)
++          # iOS/tvOS/visionOS/watchOS is able to share the macOS patch
+           APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+           ;;
+         *) AC_MSG_ERROR([no default app store compliance patch available for $ac_sys_system]) ;;
+@@ -722,8 +826,8 @@
+     esac
+   ],[
+     case $ac_sys_system in
+-      iOS)
+-        # Always apply the compliance patch on iOS; we can use the macOS patch
++      iOS|tvOS|visionOS|watchOS)
++        # Always apply the compliance patch on iOS/tvOS/visionOS/watchOS; we can use the macOS patch
+         APP_STORE_COMPLIANCE_PATCH="Mac/Resources/app-store-compliance.patch"
+         AC_MSG_RESULT([applying default app store compliance patch])
+         ;;
+@@ -736,6 +840,8 @@
+ ])
+ AC_SUBST([APP_STORE_COMPLIANCE_PATCH])
+ 
++EXPORT_XROS_DEPLOYMENT_TARGET='#'
++
+ AC_SUBST([_PYTHON_HOST_PLATFORM])
+ if test "$cross_compiling" = yes; then
+ 	case "$host" in
+@@ -771,6 +877,70 @@
+ 				;;
+ 		esac
+ 		;;
++	*-apple-tvos*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# TVOS_DEPLOYMENT_TARGET is the minimum supported tvOS version
++		AC_MSG_CHECKING([tvOS deployment target])
++		TVOS_DEPLOYMENT_TARGET=${_host_os:4}
++		TVOS_DEPLOYMENT_TARGET=${TVOS_DEPLOYMENT_TARGET:=12.0}
++		AC_MSG_RESULT([$TVOS_DEPLOYMENT_TARGET])
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${TVOS_DEPLOYMENT_TARGET}-arm64-appletv${_host_device}
++				;;
++			*)
++				_host_ident=${TVOS_DEPLOYMENT_TARGET}-$host_cpu-appletv${_host_device}
++				;;
++		esac
++		;;
++	*-apple-xros*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# XROS_DEPLOYMENT_TARGET is the minimum supported visionOS version
++		AC_MSG_CHECKING([visionOS deployment target])
++		XROS_DEPLOYMENT_TARGET=${_host_os:8}
++		XROS_DEPLOYMENT_TARGET=${XROS_DEPLOYMENT_TARGET:=2.0}
++		AC_MSG_RESULT([$XROS_DEPLOYMENT_TARGET])
++		AC_MSG_CHECKING([exporting flag of visionOS deployment target])
++        	export XROS_DEPLOYMENT_TARGET
++		EXPORT_XROS_DEPLOYMENT_TARGET=''
++		AC_MSG_RESULT([$EXPORT_XROS_DEPLOYMENT_TARGET])
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-arm64-xr${_host_device}
++				;;
++			*)
++				_host_ident=${XROS_DEPLOYMENT_TARGET}-$host_cpu-xr${_host_device}
++				;;
++		esac
++		;;
++	*-apple-watchos*)
++		_host_os=`echo $host | cut -d '-' -f3`
++		_host_device=`echo $host | cut -d '-' -f4`
++		_host_device=${_host_device:=os}
++
++		# WATCHOS_DEPLOYMENT_TARGET is the minimum supported watchOS version
++		AC_MSG_CHECKING([watchOS deployment target])
++		WATCHOS_DEPLOYMENT_TARGET=${_host_os:7}
++		WATCHOS_DEPLOYMENT_TARGET=${WATCHOS_DEPLOYMENT_TARGET:=4.0}
++		AC_MSG_RESULT([$WATCHOS_DEPLOYMENT_TARGET])
++
++		case "$host_cpu" in
++			aarch64)
++				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-arm64-watch${_host_device}
++				;;
++			*)
++				_host_ident=${WATCHOS_DEPLOYMENT_TARGET}-$host_cpu-watch${_host_device}
++				;;
++		esac
++		;;
+ 	*-*-vxworks*)
+ 		_host_ident=$host_cpu
+ 		;;
+@@ -848,9 +1018,15 @@
+     define_xopen_source=no;;
+   Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
+     define_xopen_source=no;;
+-  # On iOS, defining _POSIX_C_SOURCE also disables platform specific features.
++  # On iOS/tvOS/visionOS/watchOS, defining _POSIX_C_SOURCE also disables platform specific features.
+   iOS/*)
+     define_xopen_source=no;;
++  tvOS/*)
++    define_xopen_source=no;;
++  visionOS/*)
++    define_xopen_source=no;;
++  watchOS/*)
++    define_xopen_source=no;;
+   # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
+   # defining NI_NUMERICHOST.
+   QNX/6.3.2)
+@@ -909,8 +1085,15 @@
+ CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
+ EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
+ 
+-# Record the value of IPHONEOS_DEPLOYMENT_TARGET enforced by the selected host triple.
++# Record the value of IPHONEOS_DEPLOYMENT_TARGET / TVOS_DEPLOYMENT_TARGET /
++# XROS_DEPLOYMENT_TARGET / WATCHOS_DEPLOYMENT_TARGET enforced by the selected host triple.
+ AC_SUBST([IPHONEOS_DEPLOYMENT_TARGET])
++AC_SUBST([TVOS_DEPLOYMENT_TARGET])
++AC_SUBST([XROS_DEPLOYMENT_TARGET])
++AC_SUBST([WATCHOS_DEPLOYMENT_TARGET])
++
++# XROS_DEPLOYMENT_TARGET should get exported
++AC_SUBST([EXPORT_XROS_DEPLOYMENT_TARGET])
+ 
+ # checks for alternative programs
+ 
+@@ -944,11 +1127,19 @@
+   ],
+ )
+ 
+-dnl Add the compiler flag for the iOS minimum supported OS version.
++dnl Add the compiler flag for the iOS/tvOS/watchOS minimum supported OS
++dnl version. visionOS doesn't use an explicit -mxros-version-min option -
++dnl it encodes the min version into the target triple.
+ AS_CASE([$ac_sys_system],
+   [iOS], [
+     AS_VAR_APPEND([CFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
+     AS_VAR_APPEND([LDFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
++  ],[tvOS], [
++    AS_VAR_APPEND([CFLAGS], [" -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"])
++    AS_VAR_APPEND([LDFLAGS], [" -mtvos-version-min=${TVOS_DEPLOYMENT_TARGET}"])
++  ],[watchOS], [
++    AS_VAR_APPEND([CFLAGS], [" -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"])
++    AS_VAR_APPEND([LDFLAGS], [" -mwatchos-version-min=${WATCHOS_DEPLOYMENT_TARGET}"])
+   ],
+ )
+ 
+@@ -1136,6 +1327,9 @@
+ AS_CASE([$ac_sys_system],
+   [Darwin*], [MULTIARCH=""],
+   [iOS], [MULTIARCH=""],
++  [tvOS], [MULTIARCH=""],
++  [visionOS], [MULTIARCH=""],
++  [watchOS], [MULTIARCH=""],
+   [FreeBSD*], [MULTIARCH=""],
+   [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
+ )
+@@ -1157,7 +1351,7 @@
+ dnl use a single "fat" binary at runtime. SOABI_PLATFORM is the component of
+ dnl the PLATFORM_TRIPLET that will be used in binary module extensions.
+ AS_CASE([$ac_sys_system],
+-  [iOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
++  [iOS|tvOS|visionOS|watchOS], [SOABI_PLATFORM=`echo "$PLATFORM_TRIPLET" | cut -d '-' -f2`],
+   [SOABI_PLATFORM=$PLATFORM_TRIPLET]
+ )
+ 
+@@ -1184,15 +1378,21 @@
+   [wasm32-unknown-wasip1/clang],     [PY_SUPPORT_TIER=2], dnl WebAssembly System Interface preview1, clang
+   [x86_64-*-linux-gnu/clang],        [PY_SUPPORT_TIER=2], dnl Linux on AMD64, any vendor, glibc, clang
+ 
+-  [aarch64-pc-windows-msvc/msvc],    [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC
+-  [armv7l-*-linux-gnueabihf/gcc],    [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
+-  [powerpc64le-*-linux-gnu/clang],   [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
+-  [s390x-*-linux-gnu/gcc],           [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
+-  [x86_64-*-freebsd*/clang],         [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
+-  [aarch64-apple-ios*-simulator/clang],   [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
+-  [aarch64-apple-ios*/clang],             [PY_SUPPORT_TIER=3], dnl iOS on ARM64
+-  [aarch64-*-linux-android/clang],   [PY_SUPPORT_TIER=3], dnl Android on ARM64
+-  [x86_64-*-linux-android/clang],    [PY_SUPPORT_TIER=3], dnl Android on AMD64
++  [aarch64-pc-windows-msvc/msvc],           [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC
++  [armv7l-*-linux-gnueabihf/gcc],           [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
++  [powerpc64le-*-linux-gnu/clang],          [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
++  [s390x-*-linux-gnu/gcc],                  [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
++  [x86_64-*-freebsd*/clang],                [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
++  [aarch64-apple-ios*-simulator/clang],     [PY_SUPPORT_TIER=3], dnl iOS Simulator on arm64
++  [aarch64-apple-ios*/clang],               [PY_SUPPORT_TIER=3], dnl iOS on ARM64
++  [aarch64-apple-tvos*-simulator/clang],    [PY_SUPPORT_TIER=3], dnl tvOS Simulator on arm64
++  [aarch64-apple-tvos*/clang],              [PY_SUPPORT_TIER=3], dnl tvOS on ARM64
++  [aarch64-apple-xros*-simulator/clang],    [PY_SUPPORT_TIER=3], dnl visionOS Simulator on arm64
++  [aarch64-apple-xros*/clang],              [PY_SUPPORT_TIER=3],    dnl visionOS on ARM64
++  [aarch64-apple-watchos*-simulator/clang], [PY_SUPPORT_TIER=3], dnl watchOS Simulator on arm64
++  [arm64_32-apple-watchos*/clang],          [PY_SUPPORT_TIER=3], dnl watchOS on ARM64
++  [aarch64-*-linux-android/clang],          [PY_SUPPORT_TIER=3], dnl Android on ARM64
++  [x86_64-*-linux-android/clang],           [PY_SUPPORT_TIER=3], dnl Android on AMD64
+ 
+   [PY_SUPPORT_TIER=0]
+ )
+@@ -1525,7 +1725,7 @@
+   case $ac_sys_system in
+     Darwin)
+       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
+-    iOS)
++    iOS|tvOS|visionOS|watchOS)
+       LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
+     *)
+       AC_MSG_ERROR([Unknown platform for framework build]);;
+@@ -1590,7 +1790,7 @@
+       BLDLIBRARY='-L. -lpython$(LDVERSION)'
+       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+       ;;
+-    iOS)
++    iOS|tvOS|visionOS|watchOS)
+       LDLIBRARY='libpython$(LDVERSION).dylib'
+       ;;
+     AIX*)
+@@ -3486,7 +3686,7 @@
+ 			BLDSHARED="$LDSHARED"
+ 		fi
+ 		;;
+-	iOS/*)
++	iOS/*|tvOS/*|visionOS/*|watchOS/*)
+ 		LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
+ 		LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)'
+ 		BLDSHARED="$LDSHARED"
+@@ -3610,7 +3810,7 @@
+ 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
+ 	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	# -u libsys_s pulls in all symbols in libsys
+-	Darwin/*|iOS/*)
++	Darwin/*|iOS/*|tvOS/*|visionOS/*|watchOS/*)
+ 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+ 
+ 		# Issue #18075: the default maximum stack size (8MBytes) is too
+@@ -3634,7 +3834,7 @@
+ 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ 			fi
+ 			LINKFORSHARED="$LINKFORSHARED"
+-		elif test $ac_sys_system = "iOS"; then
++		elif test "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "visionOS" -o "$ac_sys_system" = "watchOS"; then
+ 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
+ 		fi
+ 		;;
+@@ -4106,7 +4306,7 @@
+       dnl when do we need USING_APPLE_OS_LIBFFI?
+       ctypes_malloc_closure=yes
+     ],
+-    [iOS], [
++    [iOS|tvOS|visionOS|watchOS], [
+       ctypes_malloc_closure=yes
+     ],
+     [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]
+@@ -5217,9 +5417,9 @@
+ # checks for library functions
+ AC_CHECK_FUNCS([ \
+   accept4 alarm bind_textdomain_codeset chmod chown clock closefrom close_range confstr \
+-  copy_file_range ctermid dup dup3 execv explicit_bzero explicit_memset \
++  copy_file_range ctermid dup dup3 explicit_bzero explicit_memset \
+   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
+-  fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
++  fpathconf fstatat ftime ftruncate futimens futimes futimesat \
+   gai_strerror getegid geteuid getgid getgrent getgrgid getgrgid_r \
+   getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin getlogin_r \
+   getpeername getpgid getpid getppid getpriority _getpty \
+@@ -5227,15 +5427,14 @@
+   getspnam getuid getwd grantpt if_nameindex initgroups kill killpg lchown linkat \
+   lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
+   mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
+-  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt posix_spawn posix_spawnp \
+-  posix_spawn_file_actions_addclosefrom_np \
++  pipe2 plock poll posix_fadvise posix_fallocate posix_openpt \
+   pread preadv preadv2 process_vm_readv pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \
+   pthread_kill ptsname ptsname_r pwrite pwritev pwritev2 readlink readlinkat readv realpath renameat \
+   rtpSpawn sched_get_priority_max sched_rr_get_interval sched_setaffinity \
+   sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \
+   sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \
+   setitimer setlocale setpgid setpgrp setpriority setregid setresgid \
+-  setresuid setreuid setsid setuid setvbuf shutdown sigaction sigaltstack \
++  setresuid setreuid setsid setuid setvbuf shutdown sigaction \
+   sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
+   sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
+   sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
+@@ -5250,12 +5449,20 @@
+   AC_CHECK_FUNCS([lchmod])
+ fi
+ 
+-# iOS defines some system methods that can be linked (so they are
++# iOS/tvOS/visionOS/watchOS define some system methods that can be linked (so they are
+ # found by configure), but either raise a compilation error (because the
+ # header definition prevents usage - autoconf doesn't use the headers), or
+ # raise an error if used at runtime. Force these symbols off.
+-if test "$ac_sys_system" != "iOS" ; then
+-  AC_CHECK_FUNCS([getentropy getgroups system])
++if test "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "visionOS" -a "$ac_sys_system" != "watchOS" ; then
++  AC_CHECK_FUNCS([ getentropy getgroups system ])
++fi
++
++# tvOS/watchOS have some additional methods that can be found, but not used.
++if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
++  AC_CHECK_FUNCS([ \
++    execv fork fork1 posix_spawn posix_spawnp posix_spawn_file_actions_addclosefrom_np \
++    sigaltstack \
++  ])
+ fi
+ 
+ AC_CHECK_DECL([dirfd],
+@@ -5518,20 +5725,22 @@
+               [@%:@include <utmp.h>])
+ 
+ # check for openpty, login_tty, and forkpty
+-
+-AC_CHECK_FUNCS([openpty], [],
+-  [AC_CHECK_LIB([util], [openpty],
+-    [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lutil"],
+-    [AC_CHECK_LIB([bsd], [openpty],
+-      [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lbsd"])])])
+-AC_SEARCH_LIBS([login_tty], [util],
+- [AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
+-)
+-AC_CHECK_FUNCS([forkpty], [],
+-  [AC_CHECK_LIB([util], [forkpty],
+-    [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lutil"],
+-    [AC_CHECK_LIB([bsd], [forkpty],
+-      [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])])
++# tvOS/watchOS have functions for tty, but can't use them
++if test "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "watchOS" ; then
++  AC_CHECK_FUNCS([openpty], [],
++    [AC_CHECK_LIB([util], [openpty],
++      [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lutil"],
++      [AC_CHECK_LIB([bsd], [openpty],
++        [AC_DEFINE([HAVE_OPENPTY]) LIBS="$LIBS -lbsd"])])])
++  AC_SEARCH_LIBS([login_tty], [util],
++   [AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
++  )
++  AC_CHECK_FUNCS([forkpty], [],
++    [AC_CHECK_LIB([util], [forkpty],
++      [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lutil"],
++      [AC_CHECK_LIB([bsd], [forkpty],
++        [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])])
++fi
+ 
+ # check for long file support functions
+ AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs])
+@@ -5570,10 +5779,10 @@
+     ])
+ ])
+ 
+-# On Android and iOS, clock_settime can be linked (so it is found by
++# On Android, iOS, tvOS, visionOS, and watchOS, clock_settime can be linked (so it is found by
+ # configure), but when used in an unprivileged process, it crashes rather than
+ # returning an error. Force the symbol off.
+-if test "$ac_sys_system" != "Linux-android" && test "$ac_sys_system" != "iOS"
++if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "iOS" -a "$ac_sys_system" != "tvOS" -a "$ac_sys_system" != "visionOS" -a "$ac_sys_system" != "watchOS"
+ then
+   AC_CHECK_FUNCS([clock_settime], [], [
+       AC_CHECK_LIB([rt], [clock_settime], [
+@@ -5731,7 +5940,7 @@
+ [ac_cv_buggy_getaddrinfo=no],
+ [ac_cv_buggy_getaddrinfo=yes],
+ [
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS" || test "$ac_sys_system" = "tvOS" || test "$ac_sys_system" = "visionOS" || test "$ac_sys_system" = "watchOS"; then
+   ac_cv_buggy_getaddrinfo="no"
+ elif test "${enable_ipv6+set}" = set; then
+   ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6"
+@@ -6322,8 +6531,8 @@
+   LIBPYTHON="\$(BLDLIBRARY)"
+ fi
+ 
+-# On iOS the shared libraries must be linked with the Python framework
+-if test "$ac_sys_system" = "iOS"; then
++# On iOS/tvOS/watchOS the shared libraries must be linked with the Python framework
++if test "$ac_sys_system" = "iOS" -o $ac_sys_system = "tvOS" -o $ac_sys_system = "visionOS" -o $ac_sys_system = "watchOS"; then
+   MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
+ fi
+ 
+@@ -6931,7 +7140,7 @@
+ dnl NOTE: Inform user how to proceed with files when cross compiling.
+ dnl Some cross-compile builds are predictable; they won't ever
+ dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
+-if test "$ac_sys_system" = "Linux-android" || test "$ac_sys_system" = "iOS"; then
++if test "$ac_sys_system" = "Linux-android" -o "$ac_sys_system" = "iOS" -o "$ac_sys_system" = "tvOS" -o "$ac_sys_system" = "visionOS"  -o "$ac_sys_system" = "watchOS" ; then
+   ac_cv_file__dev_ptmx=no
+   ac_cv_file__dev_ptc=no
+ else
+@@ -7188,7 +7397,7 @@
+       AS_CASE([$ac_sys_system],
+         [Emscripten], [with_ensurepip=no],
+         [WASI], [with_ensurepip=no],
+-        [iOS], [with_ensurepip=no],
++        [iOS|tvOS|visionOS|watchOS], [with_ensurepip=no],
+         [with_ensurepip=upgrade]
+       )
+     ])
+@@ -7596,7 +7805,7 @@
+   [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
+   dnl The _scproxy module is available on macOS
+   [Darwin], [],
+-  [iOS], [
++  [iOS|tvOS|visionOS|watchOS], [
+     dnl subprocess and multiprocessing are not supported (no fork syscall).
+     dnl curses and tkinter user interface are not available.
+     dnl gdbm and nis aren't available

From 48611cb06d2b3c1a8ad19269e0598d35b56a147a Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 29 Sep 2025 09:02:34 +0800
Subject: [PATCH 40/40] Deprecate Python 3.9

---
 .github/workflows/ci.yaml |  9 +++++++++
 README.md                 | 15 ++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e5c63bb1..791943b2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -211,6 +211,15 @@ jobs:
         path: dist
         merge-multiple: true
 
+    - name: Set up Xcode
+      # GitHub recommends explicitly selecting the desired Xcode version:
+      # https://github.com/actions/runner-images/issues/12541#issuecomment-3083850140
+      # This became a necessity as a result of
+      # https://github.com/actions/runner-images/issues/12541 and
+      # https://github.com/actions/runner-images/issues/12751.
+      run: |
+        sudo xcode-select --switch /Applications/Xcode_16.4.app
+
     - name: Set up Python
       uses: actions/setup-python@v6.0.0
       with:
diff --git a/README.md b/README.md
index 33e689de..3da329cc 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@ embedded into a macOS, iOS, tvOS, watchOS, or visionOS project.
 **This branch builds a packaged version of Python 3.14**. Other Python
 versions are available by cloning other branches of the main repository:
 
-- [Python 3.9](https://github.com/beeware/Python-Apple-support/tree/3.9)
 - [Python
   3.10](https://github.com/beeware/Python-Apple-support/tree/3.10)
 - [Python
@@ -29,7 +28,7 @@ packages removed, and the App Store compliance patch applied.
 The iOS, tvOS, watchOS, and visionOS packages compiled by this project
 use the official [PEP 730](https://peps.python.org/pep-0730/) code that
 is part of Python 3.13 to provide iOS support; the relevant patches have
-been backported to 3.9-3.12. Additional patches have been applied to add
+been backported to 3.10-3.12. Additional patches have been applied to add
 tvOS, watchOS, and visionOS support.
 
 The binaries support x86_64 and arm64 for macOS; arm64 for iOS and
@@ -38,14 +37,14 @@ devices. It also supports device simulators on both x86_64 and M1
 hardware, except for visionOS, for which x86_64 simulators are
 officially unsupported. This should enable the code to run on:
 
-- macOS 11 (Big Sur) or later, on:  
+- macOS 11 (Big Sur) or later, on:
   - MacBook (including MacBooks using Apple Silicon)
   - iMac (including iMacs using Apple Silicon)
   - Mac Mini (including Apple Silicon Mac minis)
   - Mac Studio (all models)
   - Mac Pro (all models)
 
-- iOS 13.0 or later, on:  
+- iOS 13.0 or later, on:
   - iPhone (6s or later)
   - iPad (5th gen or later)
   - iPad Air (all models)
@@ -53,13 +52,13 @@ officially unsupported. This should enable the code to run on:
   - iPad Pro (all models)
   - iPod Touch (7th gen or later)
 
-- tvOS 12.0 or later, on:  
+- tvOS 12.0 or later, on:
   - Apple TV (4th gen or later)
 
-- watchOS 4.0 or later, on:  
+- watchOS 4.0 or later, on:
   - Apple Watch (4th gen or later)
 
-- visionOS 2.0 or later, on:  
+- visionOS 2.0 or later, on:
   - Apple Vision Pro
 
 ## Quickstart
@@ -166,3 +165,5 @@ maintained:
   (EOL September 2022)
 - [Python 3.8](https://github.com/beeware/Python-Apple-support/tree/3.8)
   (EOL October 2024)
+- [Python 3.9](https://github.com/beeware/Python-Apple-support/tree/3.9)
+  (EOL October 2025)