8000 Include `bcsymbolmap` file output paths into script phase. by dnkoutso · Pull Request #8563 · CocoaPods/CocoaPods · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Include bcsymbolmap file output paths into script phase. #8563

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 27, 2019
Merged

Include bcsymbolmap file output paths into script phase. #8563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Bug Fixes

* Copy `bcsymbolmap` files into correct destination to avoid invalid app archives
* Include `bcsymbolmap` file output paths into script phase.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#8563](https://github.com/CocoaPods/CocoaPods/pull/8563)

* Copy `bcsymbolmap` files into correct destination to avoid invalid app archives
[florianbuerger](https://github.com/florianbuerger)
[#8558](https://github.com/CocoaPods/CocoaPods/pull/8558)

Expand Down
13 changes: 9 additions & 4 deletions lib/cocoapods/installer/user_project_integrator/target_integrator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,15 @@ def resource_output_paths(resource_input_paths)
def framework_output_paths(framework_input_paths)
framework_input_paths.flat_map do |framework_path|
framework_output_path = "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{File.basename(framework_path.source_path)}"
dsym_path = if (dsym_input_path = framework_path.dsym_path)
"${DWARF_DSYM_FOLDER_PATH}/#{File.basename(dsym_input_path)}"
end
[framework_output_path, dsym_path]
dsym_output_path = if (dsym_input_path = framework_path.dsym_path)
"${DWARF_DSYM_FOLDER_PATH}/#{File.basename(dsym_input_path)}"
end
bcsymbol_output_paths = unless framework_path.bcsymbolmap_paths.nil?
framework_path.bcsymbolmap_paths.map do |bcsymbolmap_path|
"${BUILT_PRODUCTS_DIR}/#{File.basename(bcsymbolmap_path)}"
end
end
[framework_output_path, dsym_output_path, *bcsymbol_output_paths]
Copy link
Member

Choose a reason for hiding this comment

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

might need a .compact here in case framework_path.bcsymbolmap_paths is non-nil and empty. although that shouldn't ever happen

Copy link
Contributor Author

Choose a reason for hiding this comment

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

its already done below!

Copy link
Member

Choose a reason for hiding this comment

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

doh, good catch

end.compact.uniq
end
end
Expand Down
5 changes: 4 additions & 1 deletion spec/unit/installer/user_project_integrator/target_integrator_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,8 @@ module Pod

it 'adds embed frameworks build phase input and output paths for vendored and non vendored frameworks' do
debug_vendored_framework = Target::FrameworkPaths.new('${PODS_ROOT}/DebugVendoredFramework/ios/DebugVendoredFramework.framework',
80A7 '${PODS_ROOT}/DebugVendoredFramework/ios/DebugVendoredFramework.framework.dSYM')
'${PODS_ROOT}/DebugVendoredFramework/ios/DebugVendoredFramework.framework.dSYM',
['${PODS_ROOT}/DebugVendoredFramework/ios/A6621399-62A0-3DC3-A6E3-B6B51BD287AD.bcsymbolmap'])

debug_non_vendored_framework = Target::FrameworkPaths.new('${BUILT_PRODUCTS_DIR}/DebugCompiledFramework/DebugCompiledFramework.framework')

Expand All @@ -458,13 +459,15 @@ module Pod
phase = target.shell_script_build_phases.find { |bp| bp.name == @embed_framework_phase_name }
phase.input_paths.sort.should == %w(
${BUILT_PRODUCTS_DIR}/DebugCompiledFramework/DebugCompiledFramework.framework
${PODS_ROOT}/DebugVendoredFramework/ios/A6621399-62A0-3DC3-A6E3-B6B51BD287AD.bcsymbolmap
${PODS_ROOT}/DebugVendoredFramework/ios/DebugVendoredFramework.framework
${PODS_ROOT}/DebugVendoredFramework/ios/DebugVendoredFramework.framework.dSYM
${PODS_ROOT}/ReleaseVendoredFramework/ios/ReleaseVendoredFramework.framework
${PODS_ROOT}/ReleaseVendoredFramework/ios/ReleaseVendoredFramework.framework.dSYM
${PODS_ROOT}/Target\ Support\ Files/Pods/Pods-frameworks.sh
)
phase.output_paths.sort.should == %w(
${BUILT_PRODUCTS_DIR}/A6621399-62A0-3DC3-A6E3-B6B51BD287AD.bcsymbolmap
${DWARF_DSYM_FOLDER_PATH}/DebugVendoredFramework.framework.dSYM
${DWARF_DSYM_FOLDER_PATH}/ReleaseVendoredFramework.framework.dSYM
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DebugCompiledFramework.framework
Expand Down
0