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
142d114b
Commit
142d114b
authored
Feb 05, 2014
by
Eloy Durán
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AggregateTargetInstaller] Only pass around the build config name.
parent
79f78516
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+8
-5
aggregate_target_installer.rb
.../installer/target_installer/aggregate_target_installer.rb
+1
-1
pod_target.rb
lib/cocoapods/target/pod_target.rb
+5
-4
No files found.
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
142d114b
...
...
@@ -11,11 +11,13 @@ module Pod
attr_reader
:target
# @param [Target] target @see target
# @param [String] build_config Name of the build config to generate this xcconfig for
#
def
initialize
(
target
,
build_config
)
# @param [String] configuration_name Name of the build configuration to
# generate this xcconfig for.
#
def
initialize
(
target
,
configuration_name
)
@target
=
target
@
build_config
=
build_config
@
configuration_name
=
configuration_name
end
# @return [Xcodeproj::Config] The generated xcconfig.
...
...
@@ -56,7 +58,7 @@ module Pod
})
target
.
pod_targets
.
each
do
|
pod_target
|
next
unless
pod_target
.
include_in_build_config?
(
@
build_config
)
next
unless
pod_target
.
include_in_build_config?
(
@
configuration_name
)
pod_target
.
file_accessors
.
each
do
|
file_accessor
|
XCConfigHelper
.
add_spec_build_settings_to_xcconfig
(
file_accessor
.
spec_consumer
,
@xcconfig
)
...
...
@@ -68,7 +70,8 @@ module Pod
end
end
# This is how the Pods project now links with dependencies, instead of a "Link with Libraries" build phase
# Add pod static lib to list of libraries that are to be linked with
# the user’s project.
@xcconfig
.
merge!
({
'OTHER_LDFLAGS'
=>
"-l
#{
pod_target
.
name
}
"
})
...
...
lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
View file @
142d114b
...
...
@@ -35,7 +35,7 @@ module Pod
target
.
build_configurations
.
each
do
|
build_config
|
path
=
library
.
xcconfig_path
build_config
UI
.
message
"- Generating
#{
build_config
.
name
}
xcconfig file at
#{
UI
.
path
(
path
)
}
"
do
gen
=
Generator
::
XCConfig
::
AggregateXCConfig
.
new
(
library
,
build_config
)
gen
=
Generator
::
XCConfig
::
AggregateXCConfig
.
new
(
library
,
build_config
.
name
)
gen
.
save_as
(
path
)
library
.
xcconfigs
[
build_config
.
name
]
=
gen
.
xcconfig
xcconfig_file_ref
=
add_file_to_support_group
(
path
)
...
...
lib/cocoapods/target/pod_target.rb
View file @
142d114b
...
...
@@ -64,10 +64,11 @@ module Pod
end
.
flatten
end
# @param [String] build_config Name of the build configuration that caller is unsure if this target should
# be linked with.
def
include_in_build_config?
(
build_config
)
@target_definition
.
pod_whitelisted_for_configuration?
(
@specs
[
0
].
name
,
build_config
)
# @param [String] configuration_name Name of the build configuration that
# the caller is unsure of if this target should be linked with.
#
def
include_in_build_config?
(
configuration_name
)
@target_definition
.
pod_whitelisted_for_configuration?
(
pod_name
,
configuration_name
)
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