Migrate the Apple folder to the Platforms directory.

Author: freakboy3742

.github/workflows/build.yml

@@ -369,7 +369,7 @@ jobs:
           sudo xcode-select --switch /Applications/Xcode_15.4.app
 
       - name: Build and test
-        run: python3 Apple ci iOS --fast-ci --simulator 'iPhone SE (3rd generation),OS=17.5'
+        run: python3 Platforms/Apple ci iOS --fast-ci --simulator 'iPhone SE (3rd generation),OS=17.5'
 
   build-emscripten:
     name: 'Emscripten'

Makefile.pre.in

@@ -2358,7 +2358,7 @@ testios:
 	fi
 
 	# Clone the testbed project into the XCFOLDER
-	$(PYTHON_FOR_BUILD) $(srcdir)/Apple/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
+	$(PYTHON_FOR_BUILD) $(srcdir)/Platforms/Apple/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
 
 	# Run the testbed project
 	$(PYTHON_FOR_BUILD) "$(XCFOLDER)" run --verbose -- test -uall --single-process --rerun -W
@@ -3286,10 +3286,10 @@ clean-retain-profile: pycremoval
 	-find build -type f -a ! -name '*.gc??' -exec rm -f {} ';'
 	-rm -f Include/pydtrace_probes.h
 	-rm -f profile-gen-stamp
-	-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
+	-rm -rf Platforms/Apple/iOS/testbed/Python.xcframework/ios-*/bin
+	-rm -rf Platforms/Apple/iOS/testbed/Python.xcframework/ios-*/lib
+	-rm -rf Platforms/Apple/iOS/testbed/Python.xcframework/ios-*/include
+	-rm -rf Platforms/Apple/iOS/testbed/Python.xcframework/ios-*/Python.framework
 
 .PHONY: profile-removal
 profile-removal:
@@ -3323,7 +3323,7 @@ clobber: clean
 		config.cache config.log pyconfig.h Modules/config.c
 	-rm -rf build platform
 	-rm -rf $(PYTHONFRAMEWORKDIR)
-	-rm -rf Apple/iOS/Frameworks
+	-rm -rf Platforms/Apple/iOS/Frameworks
 	-rm -rf iOSTestbed.*
 	-rm -f python-config.py python-config
 	-rm -rf cross-build

Apple/.ruff.toml Platforms/Apple/.ruff.tomlApple/.ruff.toml renamed to Platforms/Apple/.ruff.toml

@@ -1,4 +1,4 @@
-extend = "../.ruff.toml"  # Inherit the project-wide settings
+extend = "../../.ruff.toml"  # Inherit the project-wide settings
 
 [format]
 preview = true

Apple/__main__.py Platforms/Apple/__main__.pyApple/__main__.py renamed to Platforms/Apple/__main__.py

@@ -10,7 +10,7 @@
 #
 # The simplest entry point is:
 #
-#   $ python Apple ci iOS
+#   $ python Platforms/Apple ci iOS
 #
 # which will:
 # * Clean any pre-existing build artefacts
@@ -57,7 +57,7 @@
 ArgsT = Sequence[str | Path]
 
 SCRIPT_NAME = Path(__file__).name
-PYTHON_DIR = Path(__file__).resolve().parent.parent
+PYTHON_DIR = Path(__file__).resolve().parent.parent.parent
 
 CROSS_BUILD_DIR = PYTHON_DIR / "cross-build"
 
@@ -140,7 +140,7 @@ def apple_env(host: str) -> EnvironmentT:
     """Construct an Apple development environment for the given host."""
     env = {
         "PATH": ":".join([
-            str(PYTHON_DIR / "Apple/iOS/Resources/bin"),
+            str(PYTHON_DIR / "Platforms/Apple/iOS/Resources/bin"),
             str(subdir(host) / "prefix"),
             "/usr/bin",
             "/bin",
@@ -440,7 +440,7 @@ def framework_path(host_triple: str, multiarch: str) -> Path:
     :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/iOS/Frameworks/{multiarch}"
+    return CROSS_BUILD_DIR / f"{host_triple}/Platforms/Apple/iOS/Frameworks/{multiarch}"
 
 
 def package_version(prefix_path: Path) -> str:
@@ -624,7 +624,7 @@ def create_xcframework(platform: str) -> str:
 
         # Copy in the cross-architecture pyconfig.h
         shutil.copy(
-            PYTHON_DIR / f"Apple/{platform}/Resources/pyconfig.h",
+            PYTHON_DIR / f"Platforms/Apple/{platform}/Resources/pyconfig.h",
             slice_framework / "Headers/pyconfig.h",
         )
 
@@ -661,7 +661,7 @@ def create_xcframework(platform: str) -> str:
             host_path = (
                 CROSS_BUILD_DIR
                 / host_triple
-                / "Apple/iOS/Frameworks"
+                / "Platforms/Apple/iOS/Frameworks"
                 / multiarch
             )
             host_framework = host_path / "Python.framework"
@@ -691,7 +691,7 @@ def create_xcframework(platform: str) -> str:
 
     print(" - build tools")
     shutil.copytree(
-        PYTHON_DIR / "Apple/testbed/Python.xcframework/build",
+        PYTHON_DIR / "Platforms/Apple/testbed/Python.xcframework/build",
         package_path / "Python.xcframework/build",
     )
 
@@ -711,7 +711,7 @@ def package(context: argparse.Namespace) -> None:
         print()
         run([
             sys.executable,
-            "Apple/testbed",
+            "Platforms/Apple/testbed",
             "clone",
             "--platform",
             context.platform,
@@ -806,13 +806,13 @@ def test(context: argparse.Namespace, host: str | None = None) -> None:  # noqa:
                 framework_path = (
                     CROSS_BUILD_DIR
                     / host
-                    / f"Apple/{context.platform}"
+                    / f"Platforms/Apple/{context.platform}"
                     / f"Frameworks/{apple_multiarch(host)}"
                 )
 
         run([
             sys.executable,
-            "Apple/testbed",
+            "Platforms/Apple/testbed",
             "clone",
             "--platform",
             context.platform,