Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix objcdoc generation #9772

Merged
merged 2 commits into from
Jul 11, 2019
Merged

fix objcdoc generation #9772

merged 2 commits into from
Jul 11, 2019

Conversation

dnfield
Copy link
Contributor

@dnfield dnfield commented Jul 11, 2019

#9255 split up some of the header files into a common location - which means that our objective C document generation has been missing them, which broke some links on the website.

This pulls the source files from the out/ios_* directories instead of directly from the shell folder, and does a check that the expected class files get generated - whcih will need to be updated if classes get renamed, added, or removed from the embedding.

I'm keeping the cwd logic the same so we don't have to update the recipe and make it incompatible with older builds.

/cc @sfshaza2

@@ -5,9 +5,10 @@

# Generates objc docs for Flutter iOS libraries.

if [[ ! -d "shell/platform/darwin/ios" ]]
FLUTTER_UMBRELLA_HEADER=$(find ../out -maxdepth 4 -type f -name Flutter.h | grep 'ios_' | head -n 1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the bots, can't we always assume that a particular variant (e.g. ios_debug_unopt is present?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could, but I figured this would make it easier to test locally (e.g. I almost never build the debug opt variant, and this way I don't have to edit the file to check it if I'm on ios_debug_unopt)

ACTUAL_CLASSES=$(ls "$1/Classes" | sort)

if [[ $EXPECTED_CLASSES != $ACTUAL_CLASSES ]]; then

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uber-nit: kill this blank line.

Copy link
Member

@cbracken cbracken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM stamp from a Japanese personal seal

@dnfield dnfield merged commit 51c3c11 into flutter:master Jul 11, 2019
@dnfield dnfield deleted the objc_doc branch July 11, 2019 06:06
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 11, 2019
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request Jul 11, 2019
flutter/engine@49445ce...0f6229a

git log 49445ce..0f6229a --no-merges --oneline
0f6229a Roll fuchsia/sdk/core/mac-amd64 from lKQ0yBPnk1oXLyNM7XhqSDl5llP6Cx2GWkQjS0ExozcC to XOXaWqvr4OuJ6O3uPefSwSFjZMaEmDHy5JQm3Q8Oc0wC (flutter/engine#9786)
e40149e Roll src/third_party/skia af4e7b6cf616..f9fcf7ffa89a (33 commits) (flutter/engine#9784)
009b1d5 Roll fuchsia/sdk/core/mac-amd64 from 1F71B9KuZAVZz0LDQW_g0bbfWsxEgQkDpHPKrkc97xYC to lKQ0yBPnk1oXLyNM7XhqSDl5llP6Cx2GWkQjS0ExozcC (flutter/engine#9779)
fbe50c6 Roll fuchsia/sdk/core/mac-amd64 from bYFmlYp6Mc82r7dw58IaEny3_mnq-yZW06Ccr19j0lIC to 1F71B9KuZAVZz0LDQW_g0bbfWsxEgQkDpHPKrkc97xYC (flutter/engine#9778)
51c3c11 fix objcdoc generation (flutter/engine#9772)
f076a60 Roll fuchsia/sdk/core/mac-amd64 from EYnRdXFT9l-d8Qkz4zeTRXnqfV3KQzpQhoPs1r0-740C to bYFmlYp6Mc82r7dw58IaEny3_mnq-yZW06Ccr19j0lIC (flutter/engine#9771)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff ([email protected]), and stop
the roller if necessary.
johnsonmh pushed a commit to johnsonmh/flutter that referenced this pull request Jul 30, 2019
flutter/engine@49445ce...0f6229a

git log 49445ce..0f6229a --no-merges --oneline
0f6229a Roll fuchsia/sdk/core/mac-amd64 from lKQ0yBPnk1oXLyNM7XhqSDl5llP6Cx2GWkQjS0ExozcC to XOXaWqvr4OuJ6O3uPefSwSFjZMaEmDHy5JQm3Q8Oc0wC (flutter/engine#9786)
e40149e Roll src/third_party/skia af4e7b6cf616..f9fcf7ffa89a (33 commits) (flutter/engine#9784)
009b1d5 Roll fuchsia/sdk/core/mac-amd64 from 1F71B9KuZAVZz0LDQW_g0bbfWsxEgQkDpHPKrkc97xYC to lKQ0yBPnk1oXLyNM7XhqSDl5llP6Cx2GWkQjS0ExozcC (flutter/engine#9779)
fbe50c6 Roll fuchsia/sdk/core/mac-amd64 from bYFmlYp6Mc82r7dw58IaEny3_mnq-yZW06Ccr19j0lIC to 1F71B9KuZAVZz0LDQW_g0bbfWsxEgQkDpHPKrkc97xYC (flutter/engine#9778)
51c3c11 fix objcdoc generation (flutter/engine#9772)
f076a60 Roll fuchsia/sdk/core/mac-amd64 from EYnRdXFT9l-d8Qkz4zeTRXnqfV3KQzpQhoPs1r0-740C to bYFmlYp6Mc82r7dw58IaEny3_mnq-yZW06Ccr19j0lIC (flutter/engine#9771)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff ([email protected]), and stop
the roller if necessary.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants