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
b262b873
Commit
b262b873
authored
Dec 19, 2012
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer|TargetInstaller] Improve handling of frameworks in Pods project.
parent
1a34157e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
10 deletions
+18
-10
Gemfile.lock
Gemfile.lock
+1
-1
installer.rb
lib/cocoapods/installer.rb
+2
-4
target_installer.rb
lib/cocoapods/installer/target_installer.rb
+15
-5
No files found.
Gemfile.lock
View file @
b262b873
...
...
@@ -9,7 +9,7 @@ GIT
GIT
remote: git://github.com/CocoaPods/Xcodeproj.git
revision:
d2bd1824f39ca1f2742e1e7af352db36251a267d
revision:
72b587172e84cfd38aa9ce70c5f6075aca19973c
specs:
xcodeproj (0.4.0)
activesupport (~> 3.2.6)
...
...
lib/cocoapods/installer.rb
View file @
b262b873
...
...
@@ -220,7 +220,7 @@ module Pod
def
generate_names_of_pods_to_install
changed_pods_names
=
[]
if
update_mode
changed_pods_names
+=
pods
.
select
do
|
pod
s
|
changed_pods_names
+=
pods
.
select
do
|
pod
|
pod
.
top_specification
.
version
.
head?
||
resolver
.
pods_from_external_sources
.
include?
(
pod
.
name
)
end
...
...
@@ -334,9 +334,6 @@ module Pod
local_pods
.
each
do
|
pod
|
pod
.
add_file_references_to_project
(
pods_project
)
pod
.
link_headers
pod
.
frameworks
.
each
do
|
framework
|
file_ref
=
pods_project
.
add_system_framework
(
framework
,
pod
.
platform
.
name
)
end
unless
pod
.
resources
.
empty?
resources_group
=
pods_project
.
new_group
(
pod
.
name
,
"Resources"
)
...
...
@@ -406,6 +403,7 @@ module Pod
#
def
write_pod_project
UI
.
message
"- Writing Xcode project file to
#{
UI
.
path
sandbox
.
project_path
}
"
do
pods_project
[
'Frameworks'
].
sort_by_type!
pods_project
.
main_group
.
sort_by_type!
pods_project
.
save_as
(
sandbox
.
project_path
)
end
...
...
lib/cocoapods/installer/target_installer.rb
View file @
b262b873
...
...
@@ -22,7 +22,7 @@ module Pod
def
install!
add_file_reference_for_support_files
add_target
add_
build_files_to_target
add_
pod_references
create_xcconfig_file
create_prefix_header
...
...
@@ -126,15 +126,25 @@ module Pod
c
.
base_configuration_reference
=
xcconfig_file_ref
end
library
.
target
=
@target
library
.
target
=
@target
end
# Adds the build files of the pods to the target.
# Adds the build files of the pods to the target and adds a refence to
# the frameworks of the Pods.
#
# @note The Frameworks are used only for presentation purporses as the
# xcconfig is the authoritative source about their information.
#
# @return [void]
#
def
add_build_files_to_target
pods
.
each
{
|
p
|
p
.
add_build_files_to_target
(
target
)
}
def
add_pod_references
pods
.
each
do
|
pod
|
pod
.
add_build_files_to_target
(
target
)
pod
.
frameworks
.
each
do
|
framework
|
framework_ref
=
project
.
add_system_framework
(
framework
,
target
)
end
end
end
# Generates the contents of the xcconfig file and saves it to disk.
...
...
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