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
187ce57c
Commit
187ce57c
authored
Oct 30, 2015
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4469 from andreacremaschi/master
parents
e8c9366e
08b6aa5e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
CHANGELOG.md
CHANGELOG.md
+6
-1
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+2
-1
xcconfig_helper_spec.rb
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
+9
-0
No files found.
CHANGELOG.md
View file @
187ce57c
...
@@ -11,7 +11,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -11,7 +11,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
*
Improve
`pod search`
performance while using _
`--full`
_ flag
*
Improve
`pod search`
performance while using _
`--full`
_ flag
[
Muhammed Yavuz Nuzumlalı
](
https://github.com/manuyavuz
)
[
Muhammed Yavuz Nuzumlalı
](
https://github.com/manuyavuz
)
[
cocoapods-search#8
](
https://github.com/CocoaPods/cocoapods-search/issues/8
)
[
cocoapods-search#8
](
https://github.com/CocoaPods/cocoapods-search/issues/8
)
*
Improve message when there is no spec in repos for dependency set in Podfile.
*
Improve message when there is no spec in repos for dependency set in Podfile.
[
Muhammed Yavuz Nuzumlalı
](
https://github.com/manuyavuz
)
[
Muhammed Yavuz Nuzumlalı
](
https://github.com/manuyavuz
)
[
#4430
](
https://github.com/CocoaPods/CocoaPods/issues/4430
)
[
#4430
](
https://github.com/CocoaPods/CocoaPods/issues/4430
)
...
@@ -82,6 +82,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -82,6 +82,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#3683
](
https://github.com/CocoaPods/CocoaPods/issues/3683
)
[
#3683
](
https://github.com/CocoaPods/CocoaPods/issues/3683
)
*
Remove the library name's extension when adding it in the "linker flags" build
setting to support dynamic libraries.
[
Andrea Cremaschi
](
https://github.com/andreacremaschi
)
[
#4468
](
https://github.com/CocoaPods/CocoaPods/issues/4468
)
## 0.39.0 (2015-10-09)
## 0.39.0 (2015-10-09)
...
...
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
187ce57c
...
@@ -153,7 +153,8 @@ module Pod
...
@@ -153,7 +153,8 @@ module Pod
# The path retrieved from Sandbox#root.
# The path retrieved from Sandbox#root.
#
#
def
self
.
add_library_build_settings
(
library_path
,
xcconfig
,
sandbox_root
)
def
self
.
add_library_build_settings
(
library_path
,
xcconfig
,
sandbox_root
)
name
=
File
.
basename
(
library_path
,
'.a'
).
sub
(
/\Alib/
,
''
)
extension
=
File
.
extname
(
library_path
)
name
=
File
.
basename
(
library_path
,
extension
).
sub
(
/\Alib/
,
''
)
dirname
=
'${PODS_ROOT}/'
+
library_path
.
dirname
.
relative_path_from
(
sandbox_root
).
to_s
dirname
=
'${PODS_ROOT}/'
+
library_path
.
dirname
.
relative_path_from
(
sandbox_root
).
to_s
build_settings
=
{
build_settings
=
{
'OTHER_LDFLAGS'
=>
"-l
#{
name
}
"
,
'OTHER_LDFLAGS'
=>
"-l
#{
name
}
"
,
...
...
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @
187ce57c
...
@@ -158,6 +158,15 @@ module Pod
...
@@ -158,6 +158,15 @@ module Pod
hash_config
[
'OTHER_LDFLAGS'
].
should
==
'-l"Proj4"'
hash_config
[
'OTHER_LDFLAGS'
].
should
==
'-l"Proj4"'
hash_config
[
'LIBRARY_SEARCH_PATHS'
].
should
==
'$(inherited) "${PODS_ROOT}/MapBox/Proj4"'
hash_config
[
'LIBRARY_SEARCH_PATHS'
].
should
==
'$(inherited) "${PODS_ROOT}/MapBox/Proj4"'
end
end
it
'adds dylib build settings to the given xcconfig'
do
path
=
config
.
sandbox
.
root
+
'MapBox/Proj4/libProj4.dylib'
xcconfig
=
Xcodeproj
::
Config
.
new
@sut
.
add_library_build_settings
(
path
,
xcconfig
,
config
.
sandbox
.
root
)
hash_config
=
xcconfig
.
to_hash
hash_config
[
'OTHER_LDFLAGS'
].
should
==
'-l"Proj4"'
hash_config
[
'LIBRARY_SEARCH_PATHS'
].
should
==
'$(inherited) "${PODS_ROOT}/MapBox/Proj4"'
end
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