Commit 776c18e3 authored by Muhammed Yavuz Nuzumlalı's avatar Muhammed Yavuz Nuzumlalı

Merge pull request #4606 from CocoaPods/yavuz/fix/resourceBundleInfoPlist

Create Info.plist files for resource bundles
parents 5ab54146 5264fcdb
...@@ -91,6 +91,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -91,6 +91,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### 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. * Prevent installer to be run from inside sandbox directory.
[Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz) [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
......
...@@ -24,7 +24,7 @@ GIT ...@@ -24,7 +24,7 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
revision: f7d31a59aa080c24fd50cbb66b50ee30ddf52a50 revision: ad8f6b78e424c274b63ff42ff6ad72840cb307a6
branch: master branch: master
specs: specs:
xcodeproj (0.28.2) xcodeproj (0.28.2)
......
...@@ -137,8 +137,18 @@ module Pod ...@@ -137,8 +137,18 @@ module Pod
end end
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| bundle_target.build_configurations.each do |c|
c.build_settings['PRODUCT_NAME'] = bundle_name 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? if target.requires_frameworks? && target.scoped?
c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
end end
......
Subproject commit a98b63248bd1286f0ecebcb08df6c75a3015bc3b Subproject commit 565dd11d9ad810cf7665f1c5830eb5a1305c7e45
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment