Permalink
Browse files

Merge pull request #576 from jonathanpenn/master

Add support for .hh header files
  • Loading branch information...
2 parents fe96a97 + bd5105e commit 3e0ea475dab25b733b76f92b18613ea88c8e0c3c @fabiopelosin fabiopelosin committed Oct 8, 2012
Showing with 11 additions and 6 deletions.
  1. +5 −0 CHANGELOG.md
  2. +6 −6 lib/cocoapods/local_pod.rb
View
@@ -2,6 +2,11 @@
[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
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.0...0.15.1)
View
@@ -240,7 +240,7 @@ def relative_source_files_by_spec
# {Specification}.
#
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)
end
@@ -262,7 +262,7 @@ def relative_header_files
def header_files_by_spec
result = {}
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?
end
result
@@ -276,7 +276,7 @@ def header_files_by_spec
# header files (i.e. the build ones) are intended to be public.
#
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
result = {}
@@ -379,7 +379,7 @@ def documentation_headers
if (public_h = public_headers[spec]) && !public_h.empty?
result += public_h
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?
end
end
@@ -433,7 +433,7 @@ def requires_arc?
# (the files the need to compiled) of the pod.
#
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
# @return [Pathname] The path of the pod relative from the sandbox.
@@ -476,7 +476,7 @@ def headers_sandbox
# included in the linker 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.values.compact.uniq
end

0 comments on commit 3e0ea47

Please sign in to comment.