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
2ef0db19
Commit
2ef0db19
authored
Aug 01, 2014
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Xcodeproj]: Fix issue for libraries with a space in the name
parent
a81d8161
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
14 deletions
+15
-14
Gemfile.lock
Gemfile.lock
+1
-1
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+2
-1
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
aggregate_xcconfig_spec.rb
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
+1
-1
public_pod_xcconfig_spec.rb
spec/unit/generator/xcconfig/public_pod_xcconfig_spec.rb
+3
-3
xcconfig_helper_spec.rb
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
+7
-7
No files found.
Gemfile.lock
View file @
2ef0db19
...
...
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision:
96d04e9f2d96b848bb36d5fe214843f8cfac2664
revision:
730a09310e986bb2ec5430ef303f8453537d01ac
branch: master
specs:
xcodeproj (0.18.0)
...
...
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
2ef0db19
...
...
@@ -73,8 +73,9 @@ module Pod
# Add pod static lib to list of libraries that are to be linked with
# the user’s project.
@xcconfig
.
merge!
({
'OTHER_LDFLAGS'
=>
"-l
#{
pod_target
.
name
}
"
'OTHER_LDFLAGS'
=>
%Q(-l "
#{
pod_target
.
name
}
")
})
end
...
...
cocoapods-integration-specs
@
3200e101
Subproject commit
a25af1f983d611cc1e709680ed9af26e9fa3bb29
Subproject commit
3200e10190c6892b837e5ef3b87c2a2a612f69b6
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
View file @
2ef0db19
...
...
@@ -75,7 +75,7 @@ module Pod
end
it
"links the pod targets with the aggregate integration library target"
do
@xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
.
include
'-l
Pods-BananaLib
'
@xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
.
include
'-l
"Pods-BananaLib"
'
end
it
"does not links the pod targets with the aggregate integration library target for non-whitelisted configuration"
do
...
...
spec/unit/generator/xcconfig/public_pod_xcconfig_spec.rb
View file @
2ef0db19
...
...
@@ -36,15 +36,15 @@ module Pod
end
it
"includes the libraries for the specifications"
do
@xcconfig
.
to_hash
[
"OTHER_LDFLAGS"
].
should
.
include
(
'-lxml2'
)
@xcconfig
.
to_hash
[
"OTHER_LDFLAGS"
].
should
.
include
(
%q(-l "xml2")
)
end
it
"includes the frameworks of the specifications"
do
@xcconfig
.
to_hash
[
"OTHER_LDFLAGS"
].
should
.
include
(
'-framework QuartzCore'
)
@xcconfig
.
to_hash
[
"OTHER_LDFLAGS"
].
should
.
include
(
%q(-framework "QuartzCore")
)
end
it
"includes the weak-frameworks of the specifications"
do
@xcconfig
.
to_hash
[
"OTHER_LDFLAGS"
].
should
.
include
(
'-weak_framework iAd'
)
@xcconfig
.
to_hash
[
"OTHER_LDFLAGS"
].
should
.
include
(
%q(-weak_framework "iAd")
)
end
it
"includes the developer frameworks search paths when SenTestingKit is detected"
do
...
...
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @
2ef0db19
...
...
@@ -57,7 +57,7 @@ module Pod
:platform_name
=>
:ios
})
@sut
.
add_spec_build_settings_to_xcconfig
(
consumer
,
xcconfig
)
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
'-framework SenTestingKit'
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
%q(-framework "SenTestingKit")
end
it
"adds the libraries of the xcconfig"
do
...
...
@@ -70,7 +70,7 @@ module Pod
:platform_name
=>
:ios
})
@sut
.
add_spec_build_settings_to_xcconfig
(
consumer
,
xcconfig
)
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
'-lxml2'
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
%q(-l "xml2")
end
it
"adds the frameworks of the xcconfig"
do
...
...
@@ -83,7 +83,7 @@ module Pod
:platform_name
=>
:ios
})
@sut
.
add_spec_build_settings_to_xcconfig
(
consumer
,
xcconfig
)
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
'-framework CoreAnimation'
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
%q(-framework "CoreAnimation")
end
it
"adds the weak frameworks of the xcconfig"
do
...
...
@@ -96,7 +96,7 @@ module Pod
:platform_name
=>
:ios
})
@sut
.
add_spec_build_settings_to_xcconfig
(
consumer
,
xcconfig
)
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
'-weak_framework iAd'
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
%q(-weak_framework "iAd")
end
it
"adds the ios developer frameworks search paths if needed"
do
...
...
@@ -136,7 +136,7 @@ module Pod
xcconfig
=
Xcodeproj
::
Config
.
new
@sut
.
add_framework_build_settings
(
framework_path
,
xcconfig
,
config
.
sandbox
.
root
)
hash_config
=
xcconfig
.
to_hash
hash_config
[
'OTHER_LDFLAGS'
].
should
==
"-framework Parse"
hash_config
[
'OTHER_LDFLAGS'
].
should
==
%q(-framework "Parse")
hash_config
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'"$(PODS_ROOT)/Parse"'
end
...
...
@@ -145,7 +145,7 @@ module Pod
xcconfig
=
Xcodeproj
::
Config
.
new
(
{
'OTHER_LDFLAGS'
=>
'-framework CoreAnimation'
}
)
@sut
.
add_framework_build_settings
(
framework_path
,
xcconfig
,
config
.
sandbox
.
root
)
hash_config
=
xcconfig
.
to_hash
hash_config
[
'OTHER_LDFLAGS'
].
should
==
"-framework CoreAnimation -framework Parse"
hash_config
[
'OTHER_LDFLAGS'
].
should
==
%q(-framework "CoreAnimation" -framework "Parse")
end
it
"doesn't ovverides exiting frameworks search paths"
do
...
...
@@ -165,7 +165,7 @@ module Pod
xcconfig
=
Xcodeproj
::
Config
.
new
@sut
.
add_library_build_settings
(
path
,
xcconfig
,
config
.
sandbox
.
root
)
hash_config
=
xcconfig
.
to_hash
hash_config
[
'OTHER_LDFLAGS'
].
should
==
"-lProj4"
hash_config
[
'OTHER_LDFLAGS'
].
should
==
%q(-l "Proj4")
hash_config
[
'LIBRARY_SEARCH_PATHS'
].
should
==
'"$(PODS_ROOT)/MapBox/Proj4"'
end
end
...
...
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