Skip to content

Commit

Permalink
Merge pull request #4606 from CocoaPods/yavuz/fix/resourceBundleInfoP…
Browse files Browse the repository at this point in the history
…list

Create Info.plist files for resource bundles
  • Loading branch information
manuyavuz committed Nov 29, 2015
2 parents 5ab5414 + 5264fcd commit 776c18e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -91,6 +91,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Bug Fixes

* Fix compiling of asset catalog files inside resource bundles.
[Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
[#4501](https://github.com/CocoaPods/CocoaPods/issues/4501)

* Prevent installer to be run from inside sandbox directory.
[Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Expand Up @@ -24,7 +24,7 @@ GIT

GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: f7d31a59aa080c24fd50cbb66b50ee30ddf52a50
revision: ad8f6b78e424c274b63ff42ff6ad72840cb307a6
branch: master
specs:
xcodeproj (0.28.2)
Expand Down
10 changes: 10 additions & 0 deletions lib/cocoapods/installer/target_installer/pod_target_installer.rb
Expand Up @@ -137,8 +137,18 @@ def add_resources_bundle_targets
end
end

# Create Info.plist file for bundle
path = target.info_plist_path
path.dirname.mkdir unless path.dirname.exist?
info_plist_path = path.dirname + "ResourceBundle-#{bundle_name}-#{path.basename}"
generator = Generator::InfoPlistFile.new(target)
generator.save_as(info_plist_path)
add_file_to_support_group(info_plist_path)

bundle_target.build_configurations.each do |c|
c.build_settings['PRODUCT_NAME'] = bundle_name
relative_info_plist_path = info_plist_path.relative_path_from(sandbox.root)
c.build_settings['INFOPLIST_FILE'] = relative_info_plist_path.to_s
if target.requires_frameworks? && target.scoped?
c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
end
Expand Down
2 changes: 1 addition & 1 deletion spec/cocoapods-integration-specs
Submodule cocoapods-integration-specs updated 25 files
+1 −3 install_add_pod/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_custom_build_configuration/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_custom_module_map/after/Pods/Pods.xcodeproj.yaml
+1 −3 install_custom_module_name/after/Pods/Pods.xcodeproj.yaml
+1 −3 install_custom_workspace/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_external_source/after/Pods/Pods.xcodeproj.yaml
+4 −3 install_framework_resources/after/Pods/Pods.xcodeproj.yaml
+26 −0 ...ces/after/Pods/Target Support Files/SamplePodWithResources/ResourceBundle-SamplePodWithResources-Info.plist
+1 −2 install_local_source/after/Pods/Pods.xcodeproj.yaml
+1 −5 install_multiple_targets/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_new/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_non_objective_c_files/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_podspec/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_remove_pod/after/Pods/Pods.xcodeproj.yaml
+4 −2 install_resources/after/Pods/Pods.xcodeproj.yaml
+26 −0 install_resources/after/Pods/Target Support Files/res/ResourceBundle-res-Info.plist
+5 −1 install_resources_no_source_files/after/Pods/Pods.xcodeproj.yaml
+26 −0 install_resources_no_source_files/after/Pods/Target Support Files/res/ResourceBundle-res-Info.plist
+1 −4 install_subspecs/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_subspecs_no_duplicate_prefix/after/Pods/Pods.xcodeproj.yaml
+1 −4 install_using_checkout_options/after/Pods/Pods.xcodeproj.yaml
+1 −2 install_vendored_dynamic_framework/after/Pods/Pods.xcodeproj.yaml
+1 −2 update_all/after/Pods/Pods.xcodeproj.yaml
+1 −3 update_selected/after/Pods/Pods.xcodeproj.yaml

0 comments on commit 776c18e

Please sign in to comment.