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
87f1e8b0
Commit
87f1e8b0
authored
Nov 09, 2014
by
Kyle Fuller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Integration] Fix issue when a build configuration contains a slash
Fixes #2767
parent
def218ec
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
CHANGELOG.md
CHANGELOG.md
+5
-0
target.rb
lib/cocoapods/target.rb
+1
-1
pod_target_spec.rb
spec/unit/target/pod_target_spec.rb
+6
-0
No files found.
CHANGELOG.md
View file @
87f1e8b0
...
...
@@ -17,6 +17,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Kyle Fuller
](
https://github.com/kylef
)
[
#2803
](
https://github.com/CocoaPods/CocoaPods/issues/2803
)
*
Fixes an issue with integrating into projects where there is a slash in the
build configuration name.
[
Kyle Fuller
](
https://github.com/kylef
)
[
#2767
](
https://github.com/CocoaPods/CocoaPods/issues/2767
)
*
Pods will use
`CLANG_ENABLE_OBJC_ARC = 'YES'`
instead of
`CLANG_ENABLE_OBJC_ARC = 'NO'`
. For pods with
`requires_arc = false`
the
`-fno-objc-arc`
flag will be specified for the all source files.
...
...
lib/cocoapods/target.rb
View file @
87f1e8b0
...
...
@@ -83,7 +83,7 @@ module Pod
#
def
xcconfig_path
(
variant
=
nil
)
if
variant
support_files_dir
+
"
#{
label
}
.
#{
variant
.
downcase
}
.xcconfig"
support_files_dir
+
"
#{
label
}
.
#{
variant
.
gsub
(
File
::
SEPARATOR
,
'-'
).
downcase
}
.xcconfig"
else
support_files_dir
+
"
#{
label
}
.xcconfig"
end
...
...
spec/unit/target/pod_target_spec.rb
View file @
87f1e8b0
...
...
@@ -68,6 +68,12 @@ module Pod
)
end
it
'escapes the file separators in variant build configuration name in the xcconfig file'
do
@pod_target
.
xcconfig_path
(
"Release
#{
File
::
SEPARATOR
}
1"
).
to_s
.
should
.
include?
(
'Pods/Target Support Files/Pods-BananaLib/Pods-BananaLib.release-1.xcconfig'
)
end
it
'returns the absolute path of the target header file'
do
@pod_target
.
target_environment_header_path
.
to_s
.
should
.
include?
(
'Pods/Target Support Files/Pods/Pods-environment.h'
...
...
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