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
3f915e5e
Commit
3f915e5e
authored
Feb 16, 2016
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PodTarget] Introduce #build_product_path
parent
c774957d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
3 deletions
+19
-3
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+1
-1
aggregate_target_installer.rb
.../installer/target_installer/aggregate_target_installer.rb
+1
-1
pod_target.rb
lib/cocoapods/target/pod_target.rb
+9
-0
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
pod_target_spec.rb
spec/unit/target/pod_target_spec.rb
+7
-0
No files found.
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
3f915e5e
...
@@ -97,7 +97,7 @@ module Pod
...
@@ -97,7 +97,7 @@ module Pod
if
target
.
requires_frameworks?
if
target
.
requires_frameworks?
build_pod_targets
=
pod_targets
.
select
(
&
:should_build?
)
build_pod_targets
=
pod_targets
.
select
(
&
:should_build?
)
framework_header_search_paths
=
build_pod_targets
.
map
do
|
target
|
framework_header_search_paths
=
build_pod_targets
.
map
do
|
target
|
"
#{
target
.
configuration_build_dir
}
/
#{
target
.
product_name
}
/Headers"
"
#{
target
.
build_product_path
}
/Headers"
end
end
build_settings
=
{
build_settings
=
{
# Make framework headers discoverable by `import "…"`
# Make framework headers discoverable by `import "…"`
...
...
lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
View file @
3f915e5e
...
@@ -151,7 +151,7 @@ module Pod
...
@@ -151,7 +151,7 @@ module Pod
end
end
frameworks_by_config
[
config
]
=
relevant_pod_targets
.
flat_map
do
|
pod_target
|
frameworks_by_config
[
config
]
=
relevant_pod_targets
.
flat_map
do
|
pod_target
|
frameworks
=
pod_target
.
file_accessors
.
flat_map
(
&
:vendored_dynamic_artifacts
).
map
{
|
fw
|
"${PODS_ROOT}/
#{
fw
.
relative_path_from
(
sandbox
.
root
)
}
"
}
frameworks
=
pod_target
.
file_accessors
.
flat_map
(
&
:vendored_dynamic_artifacts
).
map
{
|
fw
|
"${PODS_ROOT}/
#{
fw
.
relative_path_from
(
sandbox
.
root
)
}
"
}
frameworks
<<
"
#{
pod_target
.
label
}
/
#{
pod_target
.
product_name
}
"
if
pod_target
.
should_build?
&&
pod_target
.
requires_frameworks?
frameworks
<<
pod_target
.
build_product_path
if
pod_target
.
should_build?
&&
pod_target
.
requires_frameworks?
frameworks
frameworks
end
end
end
end
...
...
lib/cocoapods/target/pod_target.rb
View file @
3f915e5e
...
@@ -264,6 +264,15 @@ module Pod
...
@@ -264,6 +264,15 @@ module Pod
"
#{
dir
}
/
#{
label
}
"
"
#{
dir
}
/
#{
label
}
"
end
end
# @param [String] dir
# @see #configuration_build_dir
#
# @return [String] The absolute path to the build product
#
def
build_product_path
(
dir
=
'$CONFIGURATION_BUILD_DIR'
)
"
#{
configuration_build_dir
(
dir
)
}
/
#{
product_name
}
"
end
private
private
# @param [TargetDefinition] target_definition
# @param [TargetDefinition] target_definition
...
...
cocoapods-integration-specs
@
b57d9907
Subproject commit
256f6d0f99105687c413d9900a6a4f1bdc327bdb
Subproject commit
b57d990760c8c1bca6fd34b5887094a1ae7106ba
spec/unit/target/pod_target_spec.rb
View file @
3f915e5e
...
@@ -174,6 +174,13 @@ module Pod
...
@@ -174,6 +174,13 @@ module Pod
@pod_target
.
configuration_build_dir
(
'$PODS_SHARED_BUILD_DIR'
).
should
==
'$PODS_SHARED_BUILD_DIR/BananaLib'
@pod_target
.
configuration_build_dir
(
'$PODS_SHARED_BUILD_DIR'
).
should
==
'$PODS_SHARED_BUILD_DIR/BananaLib'
@pod_target
.
scoped
.
first
.
configuration_build_dir
(
'$PODS_SHARED_BUILD_DIR'
).
should
==
'$PODS_SHARED_BUILD_DIR/BananaLib-Pods'
@pod_target
.
scoped
.
first
.
configuration_build_dir
(
'$PODS_SHARED_BUILD_DIR'
).
should
==
'$PODS_SHARED_BUILD_DIR/BananaLib-Pods'
end
end
it
'returns the path for the CONFIGURATION_BUILD_DIR build setting'
do
@pod_target
.
build_product_path
.
should
==
'$CONFIGURATION_BUILD_DIR/BananaLib/libBananaLib.a'
@pod_target
.
scoped
.
first
.
build_product_path
.
should
==
'$CONFIGURATION_BUILD_DIR/BananaLib-Pods/libBananaLib-Pods.a'
@pod_target
.
build_product_path
(
'$BUILT_PRODUCTS_DIR'
).
should
==
'$BUILT_PRODUCTS_DIR/BananaLib/libBananaLib.a'
@pod_target
.
scoped
.
first
.
build_product_path
(
'$BUILT_PRODUCTS_DIR'
).
should
==
'$BUILT_PRODUCTS_DIR/BananaLib-Pods/libBananaLib-Pods.a'
end
end
end
describe
'Product type dependent helpers'
do
describe
'Product type dependent helpers'
do
...
...
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