Commit eb900a78 authored by Dimitris Koutsogiorgas's avatar Dimitris Koutsogiorgas Committed by GitHub

Merge pull request #7083 from dnkoutso/correct_symroot

Ensure `SYMROOT` is properly set for all user configurations
parents 0f2de2ec 0843a5ce
...@@ -18,6 +18,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -18,6 +18,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Paul Beusterien](https://github.com/paulb777) [Paul Beusterien](https://github.com/paulb777)
[#7058](https://github.com/CocoaPods/CocoaPods/pull/7058) [#7058](https://github.com/CocoaPods/CocoaPods/pull/7058)
* Ensure `SYMROOT` is properly set for all user configurations
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7081](https://github.com/CocoaPods/CocoaPods/issues/7081)
## 1.4.0.beta.1 (2017-09-24) ## 1.4.0.beta.1 (2017-09-24)
......
...@@ -124,6 +124,8 @@ module Pod ...@@ -124,6 +124,8 @@ module Pod
analysis_result.all_user_build_configurations.each do |name, type| analysis_result.all_user_build_configurations.each do |name, type|
@project.add_build_configuration(name, type) @project.add_build_configuration(name, type)
end end
# Reset symroot just in case the user has added a new build configuration other than 'Debug' or 'Release'.
@project.symroot = Pod::Project::LEGACY_BUILD_ROOT
pod_names = pod_targets.map(&:pod_name).uniq pod_names = pod_targets.map(&:pod_name).uniq
pod_names.each do |pod_name| pod_names.each do |pod_name|
......
Subproject commit bf175988c4c3f2ee733674384fc6849e3d845da0 Subproject commit 70e3f73d93e62c964c0ef96c340d4a35e63907c5
...@@ -55,7 +55,7 @@ module Pod ...@@ -55,7 +55,7 @@ module Pod
@generator = @installer.send(:create_generator) @generator = @installer.send(:create_generator)
end end
describe 'Preparing' do describe '#prepare' do
before do before do
@generator.send(:prepare) @generator.send(:prepare)
end end
...@@ -71,6 +71,13 @@ module Pod ...@@ -71,6 +71,13 @@ module Pod
@generator.project.build_settings('App Store')['STRIP_INSTALLED_PRODUCT'].should == 'NO' @generator.project.build_settings('App Store')['STRIP_INSTALLED_PRODUCT'].should == 'NO'
end end
it 'sets the SYMROOT to the default value for all configurations for the whole project' do
@generator.project.build_settings('Debug')['SYMROOT'].should == Pod::Project::LEGACY_BUILD_ROOT
@generator.project.build_settings('Test')['SYMROOT'].should == Pod::Project::LEGACY_BUILD_ROOT
@generator.project.build_settings('Release')['SYMROOT'].should == Pod::Project::LEGACY_BUILD_ROOT
@generator.project.build_settings('App Store')['SYMROOT'].should == Pod::Project::LEGACY_BUILD_ROOT
end
it 'creates the Pods project' do it 'creates the Pods project' do
@generator.send(:prepare) @generator.send(:prepare)
@generator.project.class.should == Pod::Project @generator.project.class.should == Pod::Project
......
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