-
Notifications
You must be signed in to change notification settings - Fork 6k
Updates objectc script to accept relative paths. #35190
Conversation
Recipes v2 do not know the final paths in advance to be provided in the configurations. The support of relative paths allow to calculate full paths at runtime. This change is also moving the creation of zips to the script to simplify the recipes. Bug: flutter/flutter#81855
zanderso
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAIK, this script is only invoked from the recipe, and so I'm not sure there's any reason that it needs to be a shell script. Would it be too much trouble to replace it with a python script?
It can definitely be translated to python but it will require a few iterations to deprecate the bash script. I can create a bug and translate it as a follow up.
It is possible to translate it to python but it may take a few iterations to implement it and test it. I created flutter/flutter#109068 to follow up on the migration to python. |
|
|
||
| # Create the final zip file. | ||
| pushd $OUTPUT_DIR | ||
| zip -r "$ZIP_DESTINATION/ios-objcdoc.zip" . |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will the current recipe fail if a file already exists at this path?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, ios-objcdoc is generated in a temp file before uploading. If the file exists the zip command overrides it.
jmagman
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I may not have the bash-foo to say, but LGTM? Should wait for @zanderso or his delegate though.
tools/gen_objcdoc.sh
Outdated
| pushd "$SCRIPT_DIR/../../flutter" | ||
|
|
||
| FLUTTER_UMBRELLA_HEADER=$(find ../out -maxdepth 4 -type f -name Flutter.h | grep 'ios_' | head -n 1) | ||
| echo "$(pwd)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this a leftover debug print?
| if [ "${OUTPUT_DIR:0:1}" != "/" ] | ||
| then | ||
| ZIP_DESTINATION="$SCRIPT_DIR/../../$1" | ||
| OUTPUT_DIR="$ZIP_DESTINATION/objectc_docs" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should OUTPUT_DIR also be nested under ZIP_DESTINATION when $1 is an absolute path?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
…)" (flutter#35265) This reverts commit 9aaa21a.
Recipes v2 do not know the final paths in advance to be provided in the
configurations. The support of relative paths allow to calculate full
paths at runtime.
This change is also moving the creation of zips to the script to
simplify the recipes.
Bug: flutter/flutter#81855
Pre-launch Checklist
writing and running engine tests.
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.