Commit 03950f65 authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #3460 from CocoaPods/seg-scope-file-flags

[PodTargetInstaller] Dont set clang-specific flags for files that wont b...
parents 4a6e1e1c bebac02b
......@@ -47,6 +47,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/segiddins)
[#3436](https://github.com/CocoaPods/CocoaPods/issues/3436)
* Don't set the `-fno-objc-arc` compiler flags for files for which the flag
makes no sense.
[Samuel Giddins](https://github.com/segiddins)
[#2559](https://github.com/CocoaPods/CocoaPods/issues/2559)
## 0.37.0.beta.1
......
......@@ -38,6 +38,8 @@ module Pod
#-----------------------------------------------------------------------#
SOURCE_FILE_EXTENSIONS = Sandbox::FileAccessor::SOURCE_FILE_EXTENSIONS
# Adds the build files of the pods to the target and adds a reference to
# the frameworks of the Pods.
#
......@@ -53,7 +55,7 @@ module Pod
headers = file_accessor.headers
public_headers = file_accessor.public_headers
private_headers = file_accessor.private_headers
other_source_files = file_accessor.source_files.select { |sf| sf.extname == '.d' }
other_source_files = file_accessor.source_files.reject { |sf| SOURCE_FILE_EXTENSIONS.include?(sf.extname) }
{
true => file_accessor.arc_source_files,
......
......@@ -8,11 +8,12 @@ module Pod
#
class FileAccessor
HEADER_EXTENSIONS = Xcodeproj::Constants::HEADER_FILES_EXTENSIONS
SOURCE_FILE_EXTENSIONS = (%w(.m .mm .c .cpp .swift) + HEADER_EXTENSIONS).uniq.freeze
GLOB_PATTERNS = {
:readme => 'readme{*,.*}'.freeze,
:license => 'licen{c,s}e{*,.*}'.freeze,
:source_files => '*.{h,hpp,tpp,hh,m,mm,c,cpp,swift}'.freeze,
:source_files => "*{#{SOURCE_FILE_EXTENSIONS.join(',')}}".freeze,
:public_header_files => "*{#{HEADER_EXTENSIONS.join(',')}}".freeze,
}.freeze
......
Subproject commit e47491f7c98ccb6eaabb110740556bbb60ce6d6a
Subproject commit b26caaceb64e29fb82a04f72c3a697af6e4dc35f
......@@ -211,7 +211,7 @@ module Pod
file_patterns = ['Classes/*.{h,m,d}', 'Vendor']
options = {
:exclude_patterns => ['Classes/**/osx/**/*', 'Resources/**/osx/**/*'],
:dir_pattern => '*.{h,hpp,tpp,hh,m,mm,c,cpp,swift}',
:dir_pattern => '*{.m,.mm,.c,.cpp,.swift,.h,.hh,.hpp,.ipp,.tpp}',
:include_dirs => false,
}
@spec.exclude_files = options[:exclude_patterns]
......
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