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 vendored .bcsymbolmap on new build system #9734

Merged
merged 1 commit into from May 22, 2020

Conversation

mplorentz
Copy link
Contributor

@mplorentz mplorentz commented Apr 20, 2020

🌈 Fix for #9419

I moved the .bcsymbolmap copy command out of the Embed Frameworks phase and into the new Copy dSYMs phase that was added in #9547.

I got a good start on this but I'm not sure if I have bandwidth to take it over the finish line. I haven't used submodules before so I'm not sure how to get those changes to show up in this PR. I'm also unsure how to update the "after" folder in the integration test fixtures with a new xcproj file. Happy for a maintainer to clean this up if they are interested.

edit by dnkoutso:

integration specs CocoaPods/cocoapods-integration-specs#282

@dnkoutso
Copy link
Contributor

Nice start! can you ensure I have access maybe i can take over it and continue it?

@dnkoutso dnkoutso added this to the 1.10.0 milestone Apr 20, 2020
@amorde
Copy link
Member

amorde commented Apr 20, 2020

Thanks for taking the time to investigate this 🙏

@dnkoutso dnkoutso force-pushed the fix_vendored_bcsymbolmap branch 2 times, most recently from 25ef334 to ac34fc3 Compare May 22, 2020 18:07
@dnkoutso dnkoutso force-pushed the fix_vendored_bcsymbolmap branch 2 times, most recently from 42a382a to a5a72ef Compare May 22, 2020 18:18
@dnkoutso dnkoutso force-pushed the fix_vendored_bcsymbolmap branch 2 times, most recently from 143a3cb to ce3581f Compare May 22, 2020 18:24
@dnkoutso dnkoutso force-pushed the fix_vendored_bcsymbolmap branch 8 times, most recently from db00a9d to 5d3a2fe Compare May 22, 2020 19:00
if dsym_paths.empty?
script_phase = native_target.shell_script_build_phases.find { |bp| bp.name && bp.name.end_with?(UserProjectIntegrator::TargetIntegrator::COPY_DSYM_FILES_PHASE_NAME) }
if dsym_paths.empty? && bcsymbolmap_paths.empty?
script_phase = native_target.shell_script_build_phases.find do |bp|
Copy link
Contributor

Choose a reason for hiding this comment

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

just formatting to make line smaller, no change

@dnkoutso dnkoutso force-pushed the fix_vendored_bcsymbolmap branch 6 times, most recently from 2ec710e to cd147bf Compare May 22, 2020 19:21
@dnkoutso dnkoutso merged commit 6835eff into CocoaPods:master May 22, 2020
@dnkoutso dnkoutso deleted the fix_vendored_bcsymbolmap branch May 22, 2020 19:45
@mplorentz
Copy link
Contributor Author

@dnkoutso thanks so much for finishing this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants