Commit fbe58121 authored by Fabio Pelosin's avatar Fabio Pelosin

[Installer] Handle build configuration case insensitively

parent e0e98e51
...@@ -96,7 +96,7 @@ module Pod ...@@ -96,7 +96,7 @@ module Pod
def resolve_dependencies def resolve_dependencies
UI.section "Analyzing dependencies" do UI.section "Analyzing dependencies" do
analyze analyze
validate_whitelisted_configurations validate_build_configurations
prepare_for_legacy_compatibility prepare_for_legacy_compatibility
clean_sandbox clean_sandbox
end end
...@@ -183,11 +183,11 @@ module Pod ...@@ -183,11 +183,11 @@ module Pod
# #
# @raise If a unknown user configuration is found. # @raise If a unknown user configuration is found.
# #
def validate_whitelisted_configurations def validate_build_configurations
whitelisted_configs = pod_targets.map do |target| whitelisted_configs = pod_targets.map do |target|
target.target_definition.all_whitelisted_configurations target.target_definition.all_whitelisted_configurations
end.flatten.uniq end.flatten.uniq
all_user_configurations = analysis_result.all_user_build_configurations.keys all_user_configurations = analysis_result.all_user_build_configurations.keys.map(&:downcase)
remainder = whitelisted_configs - all_user_configurations remainder = whitelisted_configs - all_user_configurations
unless remainder.empty? unless remainder.empty?
......
...@@ -112,7 +112,6 @@ module Pod ...@@ -112,7 +112,6 @@ module Pod
native_target.build_configurations.each do |config| native_target.build_configurations.each do |config|
path = target.xcconfig_relative_path(config.name) path = target.xcconfig_relative_path(config.name)
xcconfig = user_project.files.select { |f| f.path == path }.first || user_project.new_file(path) xcconfig = user_project.files.select { |f| f.path == path }.first || user_project.new_file(path)
check_overridden_build_settings(target.xcconfigs[config.name], native_target) check_overridden_build_settings(target.xcconfigs[config.name], native_target)
config.base_configuration_reference = xcconfig config.base_configuration_reference = xcconfig
end end
......
...@@ -154,7 +154,7 @@ module Pod ...@@ -154,7 +154,7 @@ module Pod
target_definition.whitelist_pod_for_configuration('JSONKit', 'YOLO') target_definition.whitelist_pod_for_configuration('JSONKit', 'YOLO')
@installer.send(:analyze) @installer.send(:analyze)
should.raise Informative do should.raise Informative do
@installer.send(:validate_whitelisted_configurations) @installer.send(:validate_build_configurations)
end end
end end
...@@ -163,7 +163,7 @@ module Pod ...@@ -163,7 +163,7 @@ module Pod
target_definition.whitelist_pod_for_configuration('JSONKit', 'Test') target_definition.whitelist_pod_for_configuration('JSONKit', 'Test')
@installer.send(:analyze) @installer.send(:analyze)
should.not.raise do should.not.raise do
@installer.send(:validate_whitelisted_configurations) @installer.send(:validate_build_configurations)
end end
end end
end end
......
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