Commit 34dac294 authored by Fabio Pelosin's avatar Fabio Pelosin

[Specification] Rename exclude_headers to exclude_header_search_paths.

parent 74b38c8d
...@@ -384,10 +384,10 @@ module Pod ...@@ -384,10 +384,10 @@ module Pod
# #
def file_patterns_errors def file_patterns_errors
messages = [] messages = []
messages << "The sources did not match any file" if !@spec.source_files.empty? && @pod.source_files.empty? messages << "The sources did not match any file" if !@spec.source_files.empty? && @pod.source_files.empty?
messages << "The resources did not match any file" if !@spec.resources.empty? && @pod.resources.empty? messages << "The resources did not match any file" if !@spec.resources.empty? && @pod.resources.empty?
messages << "The preserve_paths did not match any file" if !@spec.preserve_paths.empty? && @pod.preserve_paths.empty? messages << "The preserve_paths did not match any file" if !@spec.preserve_paths.empty? && @pod.preserve_paths.empty?
messages << "The exclude_headers did not match any file" if !@spec.exclude_headers.empty? && @pod.exclude_headers.empty? messages << "The exclude_header_search_paths did not match any file" if !@spec.exclude_header_search_paths.empty? && @pod.headers_excluded_from_search_paths.empty?
messages messages
end end
......
...@@ -169,7 +169,7 @@ module Pod ...@@ -169,7 +169,7 @@ module Pod
# This is not overriden anymore in specification refactor and the code # This is not overriden anymore in specification refactor and the code
# Pod::Specification#copy_header_mapping can be moved here. # Pod::Specification#copy_header_mapping can be moved here.
def copy_header_mappings def copy_header_mappings
search_path_headers = header_files - exclude_headers search_path_headers = header_files - headers_excluded_from_search_paths
search_path_headers.inject({}) do |mappings, from| search_path_headers.inject({}) do |mappings, from|
from_without_prefix = from.relative_path_from(relative_root) from_without_prefix = from.relative_path_from(relative_root)
to = top_specification.header_dir + top_specification.copy_header_mapping(from_without_prefix) to = top_specification.header_dir + top_specification.copy_header_mapping(from_without_prefix)
...@@ -195,8 +195,8 @@ module Pod ...@@ -195,8 +195,8 @@ module Pod
files_by_spec files_by_spec
end end
def exclude_headers def headers_excluded_from_search_paths
chained_expanded_paths(:exclude_headers, :relative_to_sandbox => true) chained_expanded_paths(:exclude_header_search_paths, :relative_to_sandbox => true)
end end
def chained_expanded_paths(accessor, options = {}) def chained_expanded_paths(accessor, options = {})
......
...@@ -35,7 +35,7 @@ module Pod ...@@ -35,7 +35,7 @@ module Pod
end end
# multi-platform attributes # multi-platform attributes
%w[ source_files resources preserve_paths exclude_headers frameworks libraries dependencies compiler_flags].each do |attr| %w[ source_files resources preserve_paths exclude_header_search_paths frameworks libraries dependencies compiler_flags].each do |attr|
instance_variable_set( "@#{attr}", { :ios => [], :osx => [] } ) instance_variable_set( "@#{attr}", { :ios => [], :osx => [] } )
end end
@xcconfig = { :ios => Xcodeproj::Config.new, :osx => Xcodeproj::Config.new } @xcconfig = { :ios => Xcodeproj::Config.new, :osx => Xcodeproj::Config.new }
...@@ -199,12 +199,12 @@ module Pod ...@@ -199,12 +199,12 @@ module Pod
### Attributes **with** multiple platform support ### Attributes **with** multiple platform support
pltf_chained_attr_accessor :source_files, lambda {|value, current| pattern_list(value) } pltf_chained_attr_accessor :source_files, lambda {|value, current| pattern_list(value) }
pltf_chained_attr_accessor :resources, lambda {|value, current| pattern_list(value) } pltf_chained_attr_accessor :resources, lambda {|value, current| pattern_list(value) }
pltf_chained_attr_accessor :preserve_paths, lambda {|value, current| pattern_list(value) } # Paths that should not be cleaned pltf_chained_attr_accessor :preserve_paths, lambda {|value, current| pattern_list(value) } # Paths that should not be cleaned
pltf_chained_attr_accessor :exclude_headers, lambda {|value, current| pattern_list(value) } # Headers to be excluded from being added to search paths (RestKit) pltf_chained_attr_accessor :exclude_header_search_paths, lambda {|value, current| pattern_list(value) } # Headers to be excluded from being added to search paths (RestKit)
pltf_chained_attr_accessor :frameworks, lambda {|value, current| current << value } pltf_chained_attr_accessor :frameworks, lambda {|value, current| current << value }
pltf_chained_attr_accessor :libraries, lambda {|value, current| current << value } pltf_chained_attr_accessor :libraries, lambda {|value, current| current << value }
alias_method :resource=, :resources= alias_method :resource=, :resources=
alias_method :framework=, :frameworks= alias_method :framework=, :frameworks=
......
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