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
82a6c8fb
Commit
82a6c8fb
authored
Nov 24, 2011
by
Dieter Komendera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make symlinking headers work with specs which overwrite Spec#copy_header_mapping.
parent
fa69d832
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
installer.rb
lib/cocoapods/installer.rb
+6
-3
specification.rb
lib/cocoapods/specification.rb
+1
-1
xcodeproj_ext.rb
lib/cocoapods/xcodeproj_ext.rb
+1
-0
No files found.
lib/cocoapods/installer.rb
View file @
82a6c8fb
...
@@ -30,6 +30,7 @@ module Pod
...
@@ -30,6 +30,7 @@ module Pod
@xcconfig
||=
Xcodeproj
::
Config
.
new
({
@xcconfig
||=
Xcodeproj
::
Config
.
new
({
# In a workspace this is where the static library headers should be found.
# In a workspace this is where the static library headers should be found.
'HEADER_SEARCH_PATHS'
=>
'"Pods/Headers"'
,
'HEADER_SEARCH_PATHS'
=>
'"Pods/Headers"'
,
'ALWAYS_SEARCH_USER_PATHS'
=>
'YES'
,
# This makes categories from static libraries work, which many libraries
# This makes categories from static libraries work, which many libraries
# require, so we add these by default.
# require, so we add these by default.
'OTHER_LDFLAGS'
=>
'-ObjC -all_load'
,
'OTHER_LDFLAGS'
=>
'-ObjC -all_load'
,
...
@@ -98,9 +99,11 @@ module Pod
...
@@ -98,9 +99,11 @@ module Pod
spec
.
copy_header_mappings
.
each
do
|
header_dir
,
files
|
spec
.
copy_header_mappings
.
each
do
|
header_dir
,
files
|
target_dir
=
"
#{
headers_symlink_path_name
}
/
#{
header_dir
}
"
target_dir
=
"
#{
headers_symlink_path_name
}
/
#{
header_dir
}
"
FileUtils
.
mkdir_p
(
target_dir
)
FileUtils
.
mkdir_p
(
target_dir
)
Dir
.
chdir
(
target_dir
)
do
target_dir_real_path
=
Pathname
.
new
(
target_dir
).
realpath
files
.
each
do
|
file
|
files
.
each
do
|
file
|
FileUtils
.
ln_s
(
"../../
#{
file
}
"
,
file
.
basename
)
source
=
Pathname
.
new
(
"Pods/
#{
file
}
"
).
realpath
.
relative_path_from
(
target_dir_real_path
)
Dir
.
chdir
(
target_dir
)
do
FileUtils
.
ln_sf
(
source
,
File
.
basename
(
file
))
end
end
end
end
end
end
...
...
lib/cocoapods/specification.rb
View file @
82a6c8fb
...
@@ -296,7 +296,7 @@ module Pod
...
@@ -296,7 +296,7 @@ module Pod
# methods.
# methods.
def
header_search_paths
def
header_search_paths
dirs
=
[
header_dir
]
+
copy_header_mappings
.
keys
dirs
=
[
header_dir
]
+
copy_header_mappings
.
keys
dirs
.
map
{
|
dir
|
%{"
Pods
/Headers/#{dir}"}
}
dirs
.
map
{
|
dir
|
%{"
$(POD_SRCROOT)
/Headers/#{dir}"}
}
end
end
def
to_s
def
to_s
...
...
lib/cocoapods/xcodeproj_ext.rb
View file @
82a6c8fb
...
@@ -99,6 +99,7 @@ module Xcodeproj
...
@@ -99,6 +99,7 @@ module Xcodeproj
def
self
.
build_settings
(
platform
,
scheme
)
def
self
.
build_settings
(
platform
,
scheme
)
settings
=
COMMON_BUILD_SETTINGS
[
:all
].
merge
(
COMMON_BUILD_SETTINGS
[
platform
])
settings
=
COMMON_BUILD_SETTINGS
[
:all
].
merge
(
COMMON_BUILD_SETTINGS
[
platform
])
settings
[
'COPY_PHASE_STRIP'
]
=
scheme
==
:debug
?
'NO'
:
'YES'
settings
[
'COPY_PHASE_STRIP'
]
=
scheme
==
:debug
?
'NO'
:
'YES'
settings
[
'POD_SRCROOT'
]
=
'$(SRCROOT)'
if
scheme
==
:debug
if
scheme
==
:debug
settings
.
merge!
(
COMMON_BUILD_SETTINGS
[
:debug
])
settings
.
merge!
(
COMMON_BUILD_SETTINGS
[
:debug
])
settings
[
'ONLY_ACTIVE_ARCH'
]
=
'YES'
if
platform
==
:osx
settings
[
'ONLY_ACTIVE_ARCH'
]
=
'YES'
if
platform
==
:osx
...
...
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