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
b20366fc
Commit
b20366fc
authored
Nov 12, 2011
by
Eloy Duran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be sure to override the OTHER_LDFLAGS in the Pods project for the targets.
parent
de99b446
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
installer.rb
lib/cocoapods/installer.rb
+1
-0
integration_spec.rb
spec/integration_spec.rb
+6
-6
No files found.
lib/cocoapods/installer.rb
View file @
b20366fc
...
@@ -142,6 +142,7 @@ EOS
...
@@ -142,6 +142,7 @@ EOS
# Assign the xcconfig as the base config of each config.
# Assign the xcconfig as the base config of each config.
@target
.
buildConfigurations
.
each
do
|
config
|
@target
.
buildConfigurations
.
each
do
|
config
|
config
.
baseConfiguration
=
xcconfig_file
config
.
baseConfiguration
=
xcconfig_file
config
.
buildSettings
[
'OTHER_LDFLAGS'
]
=
''
config
.
buildSettings
[
'GCC_PREFIX_HEADER'
]
=
prefix_header_filename
config
.
buildSettings
[
'GCC_PREFIX_HEADER'
]
=
prefix_header_filename
end
end
end
end
...
...
spec/integration_spec.rb
View file @
b20366fc
...
@@ -117,7 +117,6 @@ else
...
@@ -117,7 +117,6 @@ else
end
end
end
end
if
false
before
do
before
do
FileUtils
.
cp_r
(
fixture
(
'integration/.'
),
config
.
project_pods_root
)
FileUtils
.
cp_r
(
fixture
(
'integration/.'
),
config
.
project_pods_root
)
end
end
...
@@ -169,7 +168,6 @@ if false
...
@@ -169,7 +168,6 @@ if false
end
end
end
end
#if false
it
"does not activate pods that are only part of other pods"
do
it
"does not activate pods that are only part of other pods"
do
spec
=
Pod
::
Podfile
.
new
do
spec
=
Pod
::
Podfile
.
new
do
# first ensure that the correct info is available to the specs when they load
# first ensure that the correct info is available to the specs when they load
...
@@ -182,8 +180,11 @@ if false
...
@@ -182,8 +180,11 @@ if false
installer
=
SpecHelper
::
Installer
.
new
(
spec
)
installer
=
SpecHelper
::
Installer
.
new
(
spec
)
installer
.
install!
installer
.
install!
(
config
.
project_pods_root
+
'Reachability.podspec'
).
should
.
exist
YAML
.
load
(
installer
.
lock_file
.
read
).
should
==
{
(
config
.
project_pods_root
+
'ASIHTTPRequest.podspec'
).
should
.
not
.
exist
'PODS'
=>
[{
'Reachability (2.0.4)'
=>
[
"ASIHTTPRequest (>= 1.8)"
]
}],
'DOWNLOAD_ONLY'
=>
[
"ASIHTTPRequest (1.8.1)"
],
'DEPENDENCIES'
=>
[
"Reachability"
]
}
end
end
it
"adds resources to the xcode copy script"
do
it
"adds resources to the xcode copy script"
do
...
@@ -299,7 +300,7 @@ if false
...
@@ -299,7 +300,7 @@ if false
phase
.
files
.
map
{
|
buildFile
|
buildFile
.
file
}.
should
.
include
libPods
phase
.
files
.
map
{
|
buildFile
|
buildFile
.
file
}.
should
.
include
libPods
# should be the last phase
# should be the last phase
target
.
buildPhases
.
last
.
shellScript
.
should
==
"${SRCROOT}/Pods/Pods-resources.sh
\n
"
target
.
buildPhases
.
last
.
shellScript
.
should
==
%{"${SRCROOT}/Pods/Pods-resources.sh"\n}
end
end
end
end
...
@@ -307,4 +308,3 @@ if false
...
@@ -307,4 +308,3 @@ if false
end
end
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