Skip to content

Commit 5eb579d

Browse files
committed
gh-154753: revert Platforms path changes for backport
1 parent baf934e commit 5eb579d

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

Doc/using/android.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ much easier experience:
3737
* `Termux <https://termux.dev/en/>`__
3838

3939
If you're sure you want to do all of this manually, read on. You can use the
40-
:source:`testbed app <Platforms/Android/testbed>` as a guide; each step below contains a
40+
:source:`testbed app <Android/testbed>` as a guide; each step below contains a
4141
link to the relevant file.
4242

4343
* First, acquire a build of Python for Android:
@@ -47,10 +47,10 @@ link to the relevant file.
4747
mentioned below is at the top level of the package.
4848

4949
* Or if you want to build it yourself, follow the instructions in
50-
:source:`Platforms/Android/README.md`. The ``prefix`` directory will be created under
50+
:source:`Android/README.md`. The ``prefix`` directory will be created under
5151
:samp:`cross-build/{HOST}`.
5252

53-
* Add code to your :source:`build.gradle <Platforms/Android/testbed/app/build.gradle.kts>`
53+
* Add code to your :source:`build.gradle <Android/testbed/app/build.gradle.kts>`
5454
file to copy the following items into your project. All except your own Python
5555
code can be copied from ``prefix/lib``:
5656

@@ -65,10 +65,10 @@ link to the relevant file.
6565
* ``python*.*/site-packages`` (your own Python code)
6666

6767
* Add code to your app to :source:`extract the assets to the filesystem
68-
<Platforms/Android/testbed/app/src/main/java/org/python/testbed/MainActivity.kt>`.
68+
<Android/testbed/app/src/main/java/org/python/testbed/MainActivity.kt>`.
6969

7070
* Add code to your app to :source:`start Python in embedded mode
71-
<Platforms/Android/testbed/app/src/main/c/main_activity.c>`. This will need to be C code
71+
<Android/testbed/app/src/main/c/main_activity.c>`. This will need to be C code
7272
called via JNI.
7373

7474
Building a Python package for Android

Doc/using/configure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ See :source:`Mac/README.rst`.
11591159
iOS Options
11601160
-----------
11611161

1162-
See :source:`Platforms/Apple/iOS/README.md`.
1162+
See :source:`iOS/README.rst`.
11631163

11641164
.. option:: --enable-framework=INSTALLDIR
11651165

Doc/using/ios.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ helpful.
170170
To add Python to an iOS Xcode project:
171171

172172
1. Build or obtain a Python ``XCFramework``. See the instructions in
173-
:source:`Platforms/Apple/iOS/README.md` (in the CPython source distribution) for details on
173+
:source:`Apple/iOS/README.md` (in the CPython source distribution) for details on
174174
how to build a Python ``XCFramework``. At a minimum, you will need a build
175175
that supports ``arm64-apple-ios``, plus one of either
176176
``arm64-apple-ios-simulator`` or ``x86_64-apple-ios-simulator``.
@@ -266,11 +266,11 @@ modules in your app, some additional steps will be required:
266266
Testing a Python package
267267
------------------------
268268

269-
The CPython source tree contains :source:`a testbed project <Platforms/Apple/testbed>` that
269+
The CPython source tree contains :source:`a testbed project <Apple/iOS/testbed>` that
270270
is used to run the CPython test suite on the iOS simulator. This testbed can also
271271
be used as a testbed project for running your Python library's test suite on iOS.
272272

273-
After building or obtaining an iOS XCFramework (see :source:`Platforms/Apple/iOS/README.md`
273+
After building or obtaining an iOS XCFramework (see :source:`Apple/iOS/README.md`
274274
for details), create a clone of the Python iOS testbed project. If you used the
275275
``Platforms/Apple`` build script to build the XCframework, you can run:
276276

@@ -282,7 +282,7 @@ Or, if you've sourced your own XCframework, by running:
282282

283283
.. code-block:: bash
284284
285-
$ python Platforms/Apple/testbed clone --platform iOS --framework <path/to/Python.xcframework> --app <path/to/module1> --app <path/to/module2> app-testbed
285+
$ python Apple/iOS/testbed clone --platform iOS --framework <path/to/Python.xcframework> --app <path/to/module1> --app <path/to/module2> app-testbed
286286
287287
Any folders specified with the ``--app`` flag will be copied into the cloned
288288
testbed project. The resulting testbed will be created in the ``app-testbed``

0 commit comments

Comments
 (0)