Improve dSYM handling for XCFrameworks #9540
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amorde
added a commit
to CocoaPods/cocoapods-integration-specs
that referenced
this pull request
Feb 17, 2020
amorde
commented
Feb 17, 2020
| else | ||
| # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. | ||
| touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" |
There was a problem hiding this comment.
this was the expected format for vendored frameworks, but since xcframeworks will have many dSYM files they must be named differently
| # Get architectures for current target binary | ||
| binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" | ||
| # Intersect them with the architectures we are building for | ||
| intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\\n' | sort | uniq -d)" | ||
| # If there are no archs supported by this binary then warn the user | ||
| if [[ -z "$intersected_archs" ]]; then | ||
| echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." | ||
| if [[ "$warn_missing_arch" == "true" ]]; then | ||
| echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." |
There was a problem hiding this comment.
for xcframeworks, it's possible for a dSYM to be excluded completely due to archs not matching. this isn't an error, since there are multiple dSYMs instead of 1
|
|
||
| local target_dsym="" | ||
| for i in ${!dsyms[@]}; do | ||
| install_artifact "$dsym_folder/${dsyms[$i]}" "$CONFIGURATION_BUILD_DIR" "true" |
There was a problem hiding this comment.
in the prepare step, we now copy all dsyms and filter out the ones we need inside the Embed Frameworks script
139aa10 to
b696e1e
Compare
dnkoutso
reviewed
Feb 17, 2020
dnkoutso
reviewed
Feb 17, 2020
dnkoutso
approved these changes
Feb 17, 2020
amorde
added a commit
to CocoaPods/cocoapods-integration-specs
that referenced
this pull request
Feb 17, 2020
Changes: - Ensure all dSYMs are archived, not only files that match the naming scheme of framework slices - Correctly handle dSYM files that do not have the extension `.framework.dSYM` - Ensure dSYMS are stored in the correct directory when archiving
b696e1e to
1012c85
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
.framework.dSYMCloses #9530
Requires CocoaPods/cocoapods-integration-specs#268