Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 4878a32

Browse files
authored
[iOS] Rename create_{full_,}ios_framework.py (#54493)
This renames the iOS framework creation script for consistency with the analogous macOS script. Previously, we had two iOS framework creation scripts: * create_ios_framework.py * create_full_ios_framework.py The former was unused and was deleted in #54227. The addition of "full" is no longer necessary to differentiate the two. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent 98e1c7d commit 4878a32

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

build/archives/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ generated_file("artifacts_entitlement_config") {
3131
# gen_snapshot_x64 are used in its place).
3232
#
3333
# Target-specific iOS artifacts.zip are produced in:
34-
# //flutter/sky/tools/create_full_ios_framework.py
34+
# //flutter/sky/tools/create_ios_framework.py
3535
#
3636
# Target-specific Android archives are produced in:
3737
# //flutter/shell/platform/android:gen_snapshot

ci/builders/README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ be relative to the checkout directory.
431431
"--simulator-arm64-out-dir",
432432
"out/ios_debug_sim_arm64"
433433
],
434-
"script": "flutter/sky/tools/create_full_ios_framework.py",
434+
"script": "flutter/sky/tools/create_ios_framework.py",
435435
"language": "python3"
436436
}
437437
```
@@ -657,7 +657,11 @@ copied verbatim from the executions details of the build.
657657
The following example will run the generator to create the ios artifacts:
658658

659659
```bash
660-
python3 flutter/sky/tools/create_full_ios_framework.py --dst out/release \
661-
--arm64-out-dir out/ios_release --simulator-x64-out-dir out/ios_debug_sim \
662-
--simulator-arm64-out-dir out/ios_debug_sim_arm64 --dsym --strip
660+
python3 flutter/sky/tools/create_ios_framework.py \
661+
--dst out/release \
662+
--arm64-out-dir out/ios_release \
663+
--simulator-x64-out-dir out/ios_debug_sim \
664+
--simulator-arm64-out-dir out/ios_debug_sim_arm64 \
665+
--dsym \
666+
--strip
663667
```

ci/builders/mac_ios_engine.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@
479479
"--simulator-arm64-out-dir",
480480
"out/ci/ios_debug_sim_arm64"
481481
],
482-
"script": "flutter/sky/tools/create_full_ios_framework.py",
482+
"script": "flutter/sky/tools/create_ios_framework.py",
483483
"language": "python3"
484484
},
485485
{
@@ -494,7 +494,7 @@
494494
"--simulator-arm64-out-dir",
495495
"out/ci/ios_debug_sim_arm64"
496496
],
497-
"script": "flutter/sky/tools/create_full_ios_framework.py",
497+
"script": "flutter/sky/tools/create_ios_framework.py",
498498
"language": "python3"
499499
},
500500
{
@@ -511,7 +511,7 @@
511511
"--dsym",
512512
"--strip"
513513
],
514-
"script": "flutter/sky/tools/create_full_ios_framework.py",
514+
"script": "flutter/sky/tools/create_ios_framework.py",
515515
"language": "python3"
516516
},
517517
{

ci/licenses_golden/excluded_files

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@
429429
../../../flutter/sky/packages/sky_engine/lib/_embedder.yaml
430430
../../../flutter/sky/packages/sky_engine/pubspec.yaml
431431
../../../flutter/sky/tools/create_embedder_framework.py
432-
../../../flutter/sky/tools/create_full_ios_framework.py
432+
../../../flutter/sky/tools/create_ios_framework.py
433433
../../../flutter/sky/tools/create_macos_binary.py
434434
../../../flutter/sky/tools/create_macos_framework.py
435435
../../../flutter/sky/tools/create_macos_gen_snapshots.py

docs/release/Code-signing-metadata.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,15 @@ You can reference the
148148
[mac_host_engine.json](https://github.com/flutter/engine/blob/main/ci/builders/mac_host_engine.json)).
149149
150150
The generator script related to iOS is located at
151-
`sky/tools/create_full_ios_framework.py`, and generator script related to
151+
`sky/tools/create_ios_framework.py`, and generator script related to
152152
macOS is located at `sky/tools/create_macos_framework.py`.
153153
154154
2. Add / Update the variables ending with `with_entitlements` /
155155
`without_entitlements` suffix from the generator script you found in step
156156
one.
157157
158158
As an example, you can find variables `ios_file_without_entitlements` and
159-
`ios_file_with_entitlements` in sky/tools/create_full_ios_framework.py; and
159+
`ios_file_with_entitlements` in sky/tools/create_ios_framework.py; and
160160
find variables `filepath_without_entitlements` and
161161
`filepath_with_entitlements` in sky/tools/create_macos_framework.py
162162
@@ -176,7 +176,7 @@ that exist in a zip bundle called `ios/artifacts.zip`.
176176
1. Following step 1, in
177177
[mac_ios_engine.json](https://github.com/flutter/engine/blob/main/ci/builders/mac_ios_engine.json),
178178
it builds the artifact with the
179-
`flutter/sky/tools/create_full_ios_framework.py` script.
179+
`flutter/sky/tools/create_ios_framework.py` script.
180180
181181
2. Following step 2, since
182182
`Flutter.xcframework/ios-arm64/Flutter.framework/Flutter` shouldn't be code
@@ -185,12 +185,12 @@ that exist in a zip bundle called `ios/artifacts.zip`.
185185
`ios_file_without_entitlements` variable.
186186
187187
You can reference the generator script
188-
[create_full_ios_framework.py](https://github.com/flutter/engine/blob/main/sky/tools/create_full_ios_framework.py).
188+
[create_ios_framework.py](https://github.com/flutter/engine/blob/main/sky/tools/create_ios_framework.py).
189189
190190
## Code signing artifacts other than flutter engine binaries
191191
192192
The code signing functionality is implemented as [a recipe module in flutter recipes](https://cs.opensource.google/flutter/recipes/+/master:recipe_modules/signing/api.py). Therefore it can also be used to
193193
code sign arbitrary flutter artifacts built through recipe, for example, flutter iOS usb dependencies.
194194
195195
To code sign, after the artifacts are built, pass the file paths into
196-
the code signing recipe module and invoke the function. An example is [how engine V2 invokes the code signing recipe module](https://cs.opensource.google/flutter/recipes/+/master:recipes/engine_v2/engine_v2.py;l=197-212).
196+
the code signing recipe module and invoke the function. An example is [how engine V2 invokes the code signing recipe module](https://cs.opensource.google/flutter/recipes/+/master:recipes/engine_v2/engine_v2.py;l=197-212).
File renamed without changes.

0 commit comments

Comments
 (0)