Commit de94188a authored by Fabio Pelosin's avatar Fabio Pelosin Committed by Fabio Pelosin

[PodTargetInstaller] Add user build configurations to resource bundles

Closes CocoaPods/CocoaPods#1309
parent 292ab701
...@@ -54,6 +54,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -54,6 +54,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[Nikolaj Schumacher](https://github.com/nschum) [Nikolaj Schumacher](https://github.com/nschum)
[#1063](https://github.com/CocoaPods/CocoaPods/issues/1063) [#1063](https://github.com/CocoaPods/CocoaPods/issues/1063)
* User defined build configurations are now added to the resource bundle
targets.
[#1309](https://github.com/CocoaPods/CocoaPods/issues/1309),
## 0.23.0 ## 0.23.0
......
...@@ -17,7 +17,7 @@ GIT ...@@ -17,7 +17,7 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
revision: df4686205a651aca5acb9cdb47b5032e717d98f5 revision: 011187e211ecd625e9209f54c926c644db0f70f9
branch: master branch: master
specs: specs:
xcodeproj (0.9.0) xcodeproj (0.9.0)
......
...@@ -52,13 +52,7 @@ module Pod ...@@ -52,13 +52,7 @@ module Pod
@target.build_settings('Release').merge!(settings) @target.build_settings('Release').merge!(settings)
library.user_build_configurations.each do |bc_name, type| library.user_build_configurations.each do |bc_name, type|
unless @target.build_configurations.map(&:name).include?(bc_name) @target.add_build_configuration(bc_name, type)
build_config = project.new(Xcodeproj::Project::XCBuildConfiguration)
build_config.name = bc_name
settings = @target.build_settings(type.to_s.capitalize).dup
build_config.build_settings = settings
target.build_configurations << build_config
end
end end
library.target = @target library.target = @target
......
...@@ -71,6 +71,10 @@ module Pod ...@@ -71,6 +71,10 @@ module Pod
bundle_target = project.new_resources_bundle(bundle_name, file_accessor.spec_consumer.platform_name, product_group) bundle_target = project.new_resources_bundle(bundle_name, file_accessor.spec_consumer.platform_name, product_group)
bundle_target.add_resources(file_references) bundle_target.add_resources(file_references)
library.user_build_configurations.each do |bc_name, type|
bundle_target.add_build_configuration(bc_name, type)
end
target.add_dependency(bundle_target) target.add_dependency(bundle_target)
end end
end end
......
Subproject commit 72e16098943ff0c289fdb4ab0794831a15b2a91e Subproject commit 38233cf183d62dd70fdc874ae42c9fdf58a558e4
...@@ -106,6 +106,10 @@ module Pod ...@@ -106,6 +106,10 @@ module Pod
end end
xit 'adds the build configurations to the resources bundle targets' do
end
#--------------------------------------# #--------------------------------------#
it "creates the xcconfig file" do it "creates the xcconfig file" do
......
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