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
6720ef33
Commit
6720ef33
authored
Jan 22, 2016
by
Dimitris Couchell-Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Generate valid xcconfig when target includes spaces
parent
1626b8a1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
10 deletions
+12
-10
CHANGELOG.md
CHANGELOG.md
+5
-1
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+2
-2
pod_xcconfig.rb
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
+2
-4
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
aggregate_xcconfig_spec.rb
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
+2
-2
No files found.
CHANGELOG.md
View file @
6720ef33
...
...
@@ -10,7 +10,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
*
Properly add resource files to resources build phase.
*
Generate valid xcconfig when target name includes spaces.
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#4783
](
https://github.com/CocoaPods/CocoaPods/issues/4783
)
*
Properly add resource files to resources build phase.
[
Eric Firestone
](
https://github.com/efirestone
)
[
#4762
](
https://github.com/CocoaPods/CocoaPods/issues/4762
)
...
...
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
6720ef33
...
...
@@ -102,7 +102,7 @@ module Pod
end
end
build_settings
=
{
'PODS_FRAMEWORK_BUILD_PATH'
=>
target
.
scoped_configuration_build_dir
,
'PODS_FRAMEWORK_BUILD_PATH'
=>
XCConfigHelper
.
quote
([
target
.
scoped_configuration_build_dir
])
,
# Make framework headers discoverable by `import "…"`
'OTHER_CFLAGS'
=>
'$(inherited) '
+
XCConfigHelper
.
quote
(
framework_header_search_paths
,
'-iquote'
),
}
...
...
@@ -113,7 +113,7 @@ module Pod
build_settings
[
'OTHER_CFLAGS'
]
+=
' '
+
XCConfigHelper
.
quote
(
library_header_search_paths
,
'-isystem'
)
end
if
pod_targets
.
any?
{
|
t
|
t
.
should_build?
&&
t
.
scoped?
}
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
]
=
'
"$PODS_FRAMEWORK_BUILD_PATH"
'
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
]
=
'
$PODS_FRAMEWORK_BUILD_PATH
'
end
build_settings
else
...
...
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
View file @
6720ef33
...
...
@@ -58,11 +58,9 @@ module Pod
@xcconfig
=
Xcodeproj
::
Config
.
new
(
config
)
if
target
.
requires_frameworks?
&&
target
.
scoped?
# Only quote the FRAMEWORK_SEARCH_PATHS entry, because it’s a setting that takes multiple values.
# In addition, quoting CONFIGURATION_BUILD_DIR would make it be interpreted as a relative path.
build_settings
=
{
'PODS_FRAMEWORK_BUILD_PATH'
=>
target
.
configuration_build_dir
,
'FRAMEWORK_SEARCH_PATHS'
=>
'
"$PODS_FRAMEWORK_BUILD_PATH"
'
,
'PODS_FRAMEWORK_BUILD_PATH'
=>
XCConfigHelper
.
quote
([
target
.
configuration_build_dir
])
,
'FRAMEWORK_SEARCH_PATHS'
=>
'
$PODS_FRAMEWORK_BUILD_PATH
'
,
'CONFIGURATION_BUILD_DIR'
=>
'$PODS_FRAMEWORK_BUILD_PATH'
,
}
@xcconfig
.
merge!
(
build_settings
)
...
...
cocoapods-integration-specs
@
bfd098b2
Subproject commit
3c74dd99cf532ba61336e940f79fb8b02467a65b
Subproject commit
bfd098b2ee45861951a200f609dbe7d7a1485628
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
View file @
6720ef33
...
...
@@ -189,7 +189,7 @@ module Pod
end
it
'sets the PODS_FRAMEWORK_BUILD_PATH build variable'
do
@xcconfig
.
to_hash
[
'PODS_FRAMEWORK_BUILD_PATH'
].
should
==
'
$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods
'
@xcconfig
.
to_hash
[
'PODS_FRAMEWORK_BUILD_PATH'
].
should
==
'
"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods"
'
end
describe
'with a scoped pod target'
do
...
...
@@ -198,7 +198,7 @@ module Pod
end
it
'adds the framework build path to the xcconfig, with quotes, as framework search paths'
do
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'$(inherited)
"$PODS_FRAMEWORK_BUILD_PATH"
'
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'$(inherited)
$PODS_FRAMEWORK_BUILD_PATH
'
end
it
'adds the framework header paths to the xcconfig, with quotes, as local headers'
do
...
...
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