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
2716b347
Commit
2716b347
authored
Oct 20, 2011
by
Eloy Duran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add the '-ObjC -all_load' linker flags by default. Closes #6.
parent
19029672
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
7 deletions
+26
-7
project.pbxproj
examples/SSCatalog/SSCatalog.xcodeproj/project.pbxproj
+1
-1
installer.rb
lib/cocoapods/installer.rb
+4
-3
installer_spec.rb
spec/unit/installer_spec.rb
+21
-3
No files found.
examples/SSCatalog/SSCatalog.xcodeproj/project.pbxproj
View file @
2716b347
...
@@ -321,7 +321,7 @@
...
@@ -321,7 +321,7 @@
/* Begin PBXShellScriptBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
513D6140144F6D3600A8A360
/* ShellScript */
=
{
513D6140144F6D3600A8A360
/* ShellScript */
=
{
isa
=
PBXShellScriptBuildPhase
;
isa
=
PBXShellScriptBuildPhase
;
buildActionMask
=
2147483647
;
buildActionMask
=
12
;
files
=
(
files
=
(
);
);
inputPaths
=
(
inputPaths
=
(
...
...
lib/cocoapods/installer.rb
View file @
2716b347
...
@@ -20,11 +20,12 @@ module Pod
...
@@ -20,11 +20,12 @@ module Pod
def
xcconfig
def
xcconfig
@xcconfig
||=
Xcode
::
Config
.
new
({
@xcconfig
||=
Xcode
::
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.
# We could also make this recursive, but let's let the user decide on that.
'USER_HEADER_SEARCH_PATHS'
=>
'"$(BUILT_PRODUCTS_DIR)/Pods"'
,
'USER_HEADER_SEARCH_PATHS'
=>
'"$(BUILT_PRODUCTS_DIR)/Pods"'
,
# search the user headers
'ALWAYS_SEARCH_USER_PATHS'
=>
'YES'
,
'ALWAYS_SEARCH_USER_PATHS'
=>
'YES'
,
# This makes categories from static libraries work, which many libraries
# require, so we add these by default.
'OTHER_LDFLAGS'
=>
'-ObjC -all_load'
,
})
})
end
end
...
...
spec/unit/installer_spec.rb
View file @
2716b347
require
File
.
expand_path
(
'../../spec_helper'
,
__FILE__
)
require
File
.
expand_path
(
'../../spec_helper'
,
__FILE__
)
describe
"Pod::Installer"
do
describe
"Pod::Installer"
do
describe
", by default,"
do
before
do
@xcconfig
=
Pod
::
Installer
.
new
(
Pod
::
Spec
.
new
).
xcconfig
.
to_hash
end
it
"sets the header search paths where installed Pod headers can be found"
do
@xcconfig
[
'USER_HEADER_SEARCH_PATHS'
].
should
==
'"$(BUILT_PRODUCTS_DIR)/Pods"'
@xcconfig
[
'ALWAYS_SEARCH_USER_PATHS'
].
should
==
'YES'
end
it
"configures the project to load categories from the static library"
do
@xcconfig
[
'OTHER_LDFLAGS'
].
should
==
'-ObjC -all_load'
end
end
before
do
before
do
config
.
project_pods_root
=
fixture
(
'integration'
)
config
.
project_pods_root
=
fixture
(
'integration'
)
fixture
(
'spec-repos/master'
)
# ensure the archive is unpacked
fixture
(
'spec-repos/master'
)
# ensure the archive is unpacked
...
@@ -38,7 +53,8 @@ describe "Pod::Installer" do
...
@@ -38,7 +53,8 @@ describe "Pod::Installer" do
'"$(BUILT_PRODUCTS_DIR)/Pods/ASIHTTPRequest" '
\
'"$(BUILT_PRODUCTS_DIR)/Pods/ASIHTTPRequest" '
\
'"$(BUILT_PRODUCTS_DIR)/Pods/Reachability"'
,
'"$(BUILT_PRODUCTS_DIR)/Pods/Reachability"'
,
"ALWAYS_SEARCH_USER_PATHS"
=>
"YES"
,
"ALWAYS_SEARCH_USER_PATHS"
=>
"YES"
,
"OTHER_LDFLAGS"
=>
"-framework SystemConfiguration -framework CFNetwork "
\
"OTHER_LDFLAGS"
=>
"-ObjC -all_load "
\
"-framework SystemConfiguration -framework CFNetwork "
\
"-framework MobileCoreServices -l z.1"
"-framework MobileCoreServices -l z.1"
}
}
],
],
...
@@ -49,7 +65,8 @@ describe "Pod::Installer" do
...
@@ -49,7 +65,8 @@ describe "Pod::Installer" do
{
{
"USER_HEADER_SEARCH_PATHS"
=>
'"$(BUILT_PRODUCTS_DIR)/Pods" '
\
"USER_HEADER_SEARCH_PATHS"
=>
'"$(BUILT_PRODUCTS_DIR)/Pods" '
\
'"$(BUILT_PRODUCTS_DIR)/Pods/Reachability"'
,
'"$(BUILT_PRODUCTS_DIR)/Pods/Reachability"'
,
"ALWAYS_SEARCH_USER_PATHS"
=>
"YES"
"ALWAYS_SEARCH_USER_PATHS"
=>
"YES"
,
"OTHER_LDFLAGS"
=>
"-ObjC -all_load"
}
}
],
],
[
[
...
@@ -62,7 +79,8 @@ describe "Pod::Installer" do
...
@@ -62,7 +79,8 @@ describe "Pod::Installer" do
'"$(BUILT_PRODUCTS_DIR)/Pods/Reachability"'
,
'"$(BUILT_PRODUCTS_DIR)/Pods/Reachability"'
,
"ALWAYS_SEARCH_USER_PATHS"
=>
"YES"
,
"ALWAYS_SEARCH_USER_PATHS"
=>
"YES"
,
"HEADER_SEARCH_PATHS"
=>
"$(SDKROOT)/usr/include/libxml2"
,
"HEADER_SEARCH_PATHS"
=>
"$(SDKROOT)/usr/include/libxml2"
,
"OTHER_LDFLAGS"
=>
"-l xml2.2.7.3 -framework SystemConfiguration "
\
"OTHER_LDFLAGS"
=>
"-ObjC -all_load "
\
"-l xml2.2.7.3 -framework SystemConfiguration "
\
"-framework CFNetwork -framework MobileCoreServices -l z.1"
"-framework CFNetwork -framework MobileCoreServices -l z.1"
}
}
],
],
...
...
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