Commit 3e0ea475 authored by Fabio Pelosin's avatar Fabio Pelosin

Merge pull request #576 from jonathanpenn/master

Add support for .hh header files
parents fe96a978 bd5105ef
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.1...master) [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.1...master)
###### Bug fixes
- Added support for `.hh` headers.
[#576](https://github.com/CocoaPods/CocoaPods/pull/576)
## 0.15.1 ## 0.15.1
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.0...0.15.1) [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.0...0.15.1)
......
...@@ -240,7 +240,7 @@ module Pod ...@@ -240,7 +240,7 @@ module Pod
# {Specification}. # {Specification}.
# #
def source_files_by_spec def source_files_by_spec
options = {:glob => '*.{h,hpp,m,mm,c,cpp}'} options = {:glob => '*.{h,hpp,hh,m,mm,c,cpp}'}
paths_by_spec(:source_files, options) paths_by_spec(:source_files, options)
end end
...@@ -262,7 +262,7 @@ module Pod ...@@ -262,7 +262,7 @@ module Pod
def header_files_by_spec def header_files_by_spec
result = {} result = {}
source_files_by_spec.each do |spec, paths| source_files_by_spec.each do |spec, paths|
headers = paths.select { |f| f.extname == '.h' || f.extname == '.hpp' } headers = paths.select { |f| f.extname == '.h' || f.extname == '.hpp' || f.extname == '.hh' }
result[spec] = headers unless headers.empty? result[spec] = headers unless headers.empty?
end end
result result
...@@ -276,7 +276,7 @@ module Pod ...@@ -276,7 +276,7 @@ module Pod
# header files (i.e. the build ones) are intended to be public. # header files (i.e. the build ones) are intended to be public.
# #
def public_header_files_by_spec def public_header_files_by_spec
public_headers = paths_by_spec(:public_header_files, :glob => '*.{h,hpp}') public_headers = paths_by_spec(:public_header_files, :glob => '*.{h,hpp,hh}')
build_headers = header_files_by_spec build_headers = header_files_by_spec
result = {} result = {}
...@@ -379,7 +379,7 @@ module Pod ...@@ -379,7 +379,7 @@ module Pod
if (public_h = public_headers[spec]) && !public_h.empty? if (public_h = public_headers[spec]) && !public_h.empty?
result += public_h result += public_h
elsif (source_f = source_files[spec]) && !source_f.empty? elsif (source_f = source_files[spec]) && !source_f.empty?
build_h = source_f.select { |f| f.extname == '.h' || f.extname == '.hpp' } build_h = source_f.select { |f| f.extname == '.h' || f.extname == '.hpp' || f.extname == '.hh' }
result += build_h unless build_h.empty? result += build_h unless build_h.empty?
end end
end end
...@@ -433,7 +433,7 @@ module Pod ...@@ -433,7 +433,7 @@ module Pod
# (the files the need to compiled) of the pod. # (the files the need to compiled) of the pod.
# #
def implementation_files def implementation_files
relative_source_files.reject { |f| f.extname == '.h' || f.extname == '.hpp' } relative_source_files.reject { |f| f.extname == '.h' || f.extname == '.hpp' || f.extname == '.hh' }
end end
# @return [Pathname] The path of the pod relative from the sandbox. # @return [Pathname] The path of the pod relative from the sandbox.
...@@ -476,7 +476,7 @@ module Pod ...@@ -476,7 +476,7 @@ module Pod
# included in the linker search paths. # included in the linker search paths.
# #
def headers_excluded_from_search_paths def headers_excluded_from_search_paths
options = { :glob => '*.{h,hpp}' } options = { :glob => '*.{h,hpp,hh}' }
paths = paths_by_spec(:exclude_header_search_paths, options) paths = paths_by_spec(:exclude_header_search_paths, options)
paths.values.compact.uniq paths.values.compact.uniq
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