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
bb55c0a3
Commit
bb55c0a3
authored
Jun 28, 2014
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Refactor] Renamed Target#target to native_target
This should make it more intuitive why we have to navigate there.
parent
17a5f930
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
library_representation.rb
lib/cocoapods/hooks/library_representation.rb
+1
-1
installer.rb
lib/cocoapods/installer.rb
+3
-3
target.rb
lib/cocoapods/target.rb
+1
-1
library_representation_spec.rb
spec/unit/hooks/library_representation_spec.rb
+1
-1
aggregate_target_installer_spec.rb
...aller/target_installer/aggregate_target_installer_spec.rb
+2
-2
pod_target_installer_spec.rb
...t/installer/target_installer/pod_target_installer_spec.rb
+4
-4
No files found.
lib/cocoapods/hooks/library_representation.rb
View file @
bb55c0a3
...
...
@@ -69,7 +69,7 @@ module Pod
# process.
#
def
target
library
.
target
library
.
native_
target
end
#-----------------------------------------------------------------------#
...
...
lib/cocoapods/installer.rb
View file @
bb55c0a3
...
...
@@ -418,7 +418,7 @@ module Pod
pod_targets
.
sort_by
(
&
:name
).
each
do
|
pod_target
|
pod_target
.
file_accessors
.
each
do
|
file_accessor
|
file_accessor
.
spec_consumer
.
frameworks
.
each
do
|
framework
|
pod_target
.
target
.
add_system_framework
(
framework
)
pod_target
.
native_
target
.
add_system_framework
(
framework
)
end
end
end
...
...
@@ -428,7 +428,7 @@ module Pod
def
set_target_dependencies
aggregate_targets
.
each
do
|
aggregate_target
|
aggregate_target
.
pod_targets
.
each
do
|
pod_target
|
aggregate_target
.
target
.
add_dependency
(
pod_target
.
target
)
aggregate_target
.
native_target
.
add_dependency
(
pod_target
.
native_
target
)
pod_target
.
dependencies
.
each
do
|
dep
|
unless
dep
==
pod_target
.
pod_name
...
...
@@ -437,7 +437,7 @@ module Pod
unless
pod_dependency_target
puts
"[BUG] DEP:
#{
dep
}
"
end
pod_target
.
target
.
add_dependency
(
pod_dependency_target
.
target
)
pod_target
.
native_target
.
add_dependency
(
pod_dependency_target
.
native_
target
)
end
end
end
...
...
lib/cocoapods/target.rb
View file @
bb55c0a3
...
...
@@ -52,7 +52,7 @@ module Pod
# @return [PBXNativeTarget] the target generated in the Pods project for
# this library.
#
attr_accessor
:target
attr_accessor
:
native_
target
# @return [Platform] the platform for this library.
#
...
...
spec/unit/hooks/library_representation_spec.rb
View file @
bb55c0a3
...
...
@@ -64,7 +64,7 @@ module Pod
it
'returns the native target'
do
target
=
stub
@lib
.
target
=
target
@lib
.
native_
target
=
target
@rep
.
target
.
should
==
target
end
...
...
spec/unit/installer/target_installer/aggregate_target_installer_spec.rb
View file @
bb55c0a3
...
...
@@ -109,7 +109,7 @@ module Pod
it
'does not enable the GCC_WARN_INHIBIT_ALL_WARNINGS flag by default'
do
@installer
.
install!
@installer
.
library
.
target
.
build_configurations
.
each
do
|
config
|
@installer
.
library
.
native_
target
.
build_configurations
.
each
do
|
config
|
config
.
build_settings
[
'GCC_WARN_INHIBIT_ALL_WARNINGS'
].
should
.
be
.
nil
end
end
...
...
@@ -166,7 +166,7 @@ module Pod
it
'creates a dummy source to ensure the creation of a single base library'
do
@installer
.
install!
build_files
=
@installer
.
library
.
target
.
source_build_phase
.
files
build_files
=
@installer
.
library
.
native_
target
.
source_build_phase
.
files
build_file
=
build_files
.
find
{
|
bf
|
bf
.
file_ref
.
path
.
include?
(
'Pods-dummy.m'
)
}
build_file
.
should
.
be
.
not
.
nil
build_file
.
file_ref
.
path
.
should
==
'Pods-dummy.m'
...
...
spec/unit/installer/target_installer/pod_target_installer_spec.rb
View file @
bb55c0a3
...
...
@@ -88,7 +88,7 @@ module Pod
it
'does not enable the GCC_WARN_INHIBIT_ALL_WARNINGS flag by default'
do
@installer
.
install!
@installer
.
library
.
target
.
build_configurations
.
each
do
|
config
|
@installer
.
library
.
native_
target
.
build_configurations
.
each
do
|
config
|
config
.
build_settings
[
'GCC_WARN_INHIBIT_ALL_WARNINGS'
].
should
.
be
.
nil
end
end
...
...
@@ -97,7 +97,7 @@ module Pod
it
'adds the source files of each pod to the target of the Pod library'
do
@installer
.
install!
names
=
@installer
.
library
.
target
.
source_build_phase
.
files
.
map
{
|
bf
|
bf
.
file_ref
.
display_name
}
names
=
@installer
.
library
.
native_
target
.
source_build_phase
.
files
.
map
{
|
bf
|
bf
.
file_ref
.
display_name
}
names
.
should
.
include
(
'Banana.m'
)
end
...
...
@@ -142,7 +142,7 @@ module Pod
it
'creates a dummy source to ensure the compilation of libraries with only categories'
do
@installer
.
install!
build_files
=
@installer
.
library
.
target
.
source_build_phase
.
files
build_files
=
@installer
.
library
.
native_
target
.
source_build_phase
.
files
build_file
=
build_files
.
find
{
|
bf
|
bf
.
file_ref
.
display_name
==
'Pods-BananaLib-dummy.m'
}
build_file
.
should
.
be
.
not
.
nil
build_file
.
file_ref
.
path
.
should
==
'Pods-BananaLib-dummy.m'
...
...
@@ -161,7 +161,7 @@ module Pod
@installer
.
library
.
target_definition
.
stubs
(
:inhibits_warnings_for_pod?
).
returns
(
true
)
@installer
.
install!
dtrace_files
=
@installer
.
library
.
target
.
source_build_phase
.
files
.
reject
do
|
sf
|
dtrace_files
=
@installer
.
library
.
native_target
.
source_build_phase
.
files
.
reject
do
|
sf
|
!
(
File
.
extname
(
sf
.
file_ref
.
path
)
==
'.d'
)
end
dtrace_files
.
each
do
|
dt
|
...
...
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