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
c020eca3
Commit
c020eca3
authored
Oct 13, 2016
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Generate a PODS_TARGET_SRCROOT build setting for every pod target
parent
e2decfa3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
1 deletion
+22
-1
CHANGELOG.md
CHANGELOG.md
+4
-0
pod_xcconfig.rb
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
+1
-0
pod_target.rb
lib/cocoapods/target/pod_target.rb
+6
-0
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
pod_xcconfig_spec.rb
spec/unit/generator/xcconfig/pod_xcconfig_spec.rb
+10
-0
No files found.
CHANGELOG.md
View file @
c020eca3
...
@@ -8,6 +8,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -8,6 +8,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Enhancements
##### Enhancements
*
Generate
`PODS_TARGET_SRCROOT`
build setting for each pod target.
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#5375
](
https://github.com/CocoaPods/CocoaPods/issues/5375
)
*
Add support for running CocoaPods on Linux.
*
Add support for running CocoaPods on Linux.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
...
...
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
View file @
c020eca3
...
@@ -51,6 +51,7 @@ module Pod
...
@@ -51,6 +51,7 @@ module Pod
'LIBRARY_SEARCH_PATHS'
=>
'$(inherited) '
,
'LIBRARY_SEARCH_PATHS'
=>
'$(inherited) '
,
'OTHER_LDFLAGS'
=>
XCConfigHelper
.
default_ld_flags
(
target
),
'OTHER_LDFLAGS'
=>
XCConfigHelper
.
default_ld_flags
(
target
),
'PODS_ROOT'
=>
'${SRCROOT}'
,
'PODS_ROOT'
=>
'${SRCROOT}'
,
'PODS_TARGET_SRCROOT'
=>
target
.
pod_target_srcroot
,
'PRODUCT_BUNDLE_IDENTIFIER'
=>
'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
,
'PRODUCT_BUNDLE_IDENTIFIER'
=>
'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
,
'SKIP_INSTALL'
=>
'YES'
,
'SKIP_INSTALL'
=>
'YES'
,
# 'USE_HEADERMAP' => 'NO'
# 'USE_HEADERMAP' => 'NO'
...
...
lib/cocoapods/target/pod_target.rb
View file @
c020eca3
...
@@ -292,6 +292,12 @@ module Pod
...
@@ -292,6 +292,12 @@ module Pod
"
#{
configuration_build_dir
(
dir
)
}
/
#{
product_name
}
"
"
#{
configuration_build_dir
(
dir
)
}
/
#{
product_name
}
"
end
end
# @return [String] The source path of the root for this target relative to `$(PODS_ROOT)`
#
def
pod_target_srcroot
"${PODS_ROOT}/
#{
sandbox
.
pod_dir
(
pod_name
).
relative_path_from
(
sandbox
.
root
)
}
"
end
private
private
# @param [TargetDefinition] target_definition
# @param [TargetDefinition] target_definition
...
...
cocoapods-integration-specs
@
80c9b1f2
Subproject commit
b840101a6992392409e4419089bf3e55b25b340
2
Subproject commit
80c9b1f2fa480c2fe801253776e5f0b18106e83
2
spec/unit/generator/xcconfig/pod_xcconfig_spec.rb
View file @
c020eca3
...
@@ -79,6 +79,16 @@ module Pod
...
@@ -79,6 +79,16 @@ module Pod
@xcconfig
.
to_hash
[
'PODS_ROOT'
].
should
.
not
.
nil?
@xcconfig
.
to_hash
[
'PODS_ROOT'
].
should
.
not
.
nil?
end
end
it
'sets the PODS_TARGET_SRCROOT build variable for non local pod'
do
@xcconfig
.
to_hash
[
'PODS_TARGET_SRCROOT'
].
should
==
'${PODS_ROOT}/BananaLib'
end
it
'sets the PODS_TARGET_SRCROOT build variable for local pod'
do
@pod_target
.
sandbox
.
store_local_path
(
@pod_target
.
pod_name
,
@spec
.
defined_in_file
)
@xcconfig
=
@generator
.
generate
@xcconfig
.
to_hash
[
'PODS_TARGET_SRCROOT'
].
should
==
'${PODS_ROOT}/../../spec/fixtures/banana-lib/BananaLib.podspec'
end
it
'adds the library build headers and public headers search paths to the xcconfig, with quotes'
do
it
'adds the library build headers and public headers search paths to the xcconfig, with quotes'
do
private_headers
=
"
\"
#{
@pod_target
.
build_headers
.
search_paths
(
:ios
).
join
(
'" "'
)
}
\"
"
private_headers
=
"
\"
#{
@pod_target
.
build_headers
.
search_paths
(
:ios
).
join
(
'" "'
)
}
\"
"
public_headers
=
"
\"
#{
config
.
sandbox
.
public_headers
.
search_paths
(
:ios
).
join
(
'" "'
)
}
\"
"
public_headers
=
"
\"
#{
config
.
sandbox
.
public_headers
.
search_paths
(
:ios
).
join
(
'" "'
)
}
\"
"
...
...
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