Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
038c2013
Commit
038c2013
authored
Apr 27, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PodTargetInstaller] Dont set clang-specific flags for files that wont be compiled with clang
parent
4a6e1e1c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
CHANGELOG.md
CHANGELOG.md
+5
-0
pod_target_installer.rb
...oapods/installer/target_installer/pod_target_installer.rb
+3
-1
file_accessor.rb
lib/cocoapods/sandbox/file_accessor.rb
+2
-1
file_accessor_spec.rb
spec/unit/sandbox/file_accessor_spec.rb
+1
-1
No files found.
CHANGELOG.md
View file @
038c2013
...
@@ -47,6 +47,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -47,6 +47,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#3436
](
https://github.com/CocoaPods/CocoaPods/issues/3436
)
[
#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
## 0.37.0.beta.1
...
...
lib/cocoapods/installer/target_installer/pod_target_installer.rb
View file @
038c2013
...
@@ -38,6 +38,8 @@ module Pod
...
@@ -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
# Adds the build files of the pods to the target and adds a reference to
# the frameworks of the Pods.
# the frameworks of the Pods.
#
#
...
@@ -53,7 +55,7 @@ module Pod
...
@@ -53,7 +55,7 @@ module Pod
headers
=
file_accessor
.
headers
headers
=
file_accessor
.
headers
public_headers
=
file_accessor
.
public_headers
public_headers
=
file_accessor
.
public_headers
private_headers
=
file_accessor
.
private_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
,
true
=>
file_accessor
.
arc_source_files
,
...
...
lib/cocoapods/sandbox/file_accessor.rb
View file @
038c2013
...
@@ -8,11 +8,12 @@ module Pod
...
@@ -8,11 +8,12 @@ module Pod
#
#
class
FileAccessor
class
FileAccessor
HEADER_EXTENSIONS
=
Xcodeproj
::
Constants
::
HEADER_FILES_EXTENSIONS
HEADER_EXTENSIONS
=
Xcodeproj
::
Constants
::
HEADER_FILES_EXTENSIONS
SOURCE_FILE_EXTENSIONS
=
(
%w(.m .mm .c .cpp .swift)
+
HEADER_EXTENSIONS
).
uniq
.
freeze
GLOB_PATTERNS
=
{
GLOB_PATTERNS
=
{
:readme
=>
'readme{*,.*}'
.
freeze
,
:readme
=>
'readme{*,.*}'
.
freeze
,
:license
=>
'licen{c,s}e{*,.*}'
.
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
,
:public_header_files
=>
"*{
#{
HEADER_EXTENSIONS
.
join
(
','
)
}
}"
.
freeze
,
}.
freeze
}.
freeze
...
...
spec/unit/sandbox/file_accessor_spec.rb
View file @
038c2013
...
@@ -211,7 +211,7 @@ module Pod
...
@@ -211,7 +211,7 @@ module Pod
file_patterns
=
[
'Classes/*.{h,m,d}'
,
'Vendor'
]
file_patterns
=
[
'Classes/*.{h,m,d}'
,
'Vendor'
]
options
=
{
options
=
{
:exclude_patterns
=>
[
'Classes/**/osx/**/*'
,
'Resources/**/osx/**/*'
],
: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
,
:include_dirs
=>
false
,
}
}
@spec
.
exclude_files
=
options
[
:exclude_patterns
]
@spec
.
exclude_files
=
options
[
:exclude_patterns
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment