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
5070013c
Commit
5070013c
authored
Oct 26, 2016
by
Ben Asher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CHANGELOG entry. COCOAPODS_ prefix
parent
b55dadbb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
CHANGELOG.md
CHANGELOG.md
+5
-0
embed_frameworks_script.rb
lib/cocoapods/generator/embed_frameworks_script.rb
+1
-1
embed_frameworks_script_spec.rb
spec/unit/generator/embed_frameworks_script_spec.rb
+4
-4
No files found.
CHANGELOG.md
View file @
5070013c
...
@@ -19,6 +19,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -19,6 +19,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
on FFI, Xcode, and macOS.
on FFI, Xcode, and macOS.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
*
Run codesigning in parallel in the embed frameworks build phase when
`COCOAPODS_PARALLEL_CODE_SIGN`
is set to
`true`
[
Ben Asher
](
https://github.com/benasher44
)
[
#6088
](
https://github.com/CocoaPods/CocoaPods/pull/6088
)
##### Bug Fixes
##### Bug Fixes
*
Add target-device tvOS in copy_resources generator.
*
Add target-device tvOS in copy_resources generator.
...
...
lib/cocoapods/generator/embed_frameworks_script.rb
View file @
5070013c
...
@@ -35,7 +35,7 @@ module Pod
...
@@ -35,7 +35,7 @@ module Pod
#
#
def
script
def
script
codesign_bg
=
''
codesign_bg
=
''
parallel_codesign
=
ENV
[
'PARALLEL_CODE_SIGN'
]
==
'true'
parallel_codesign
=
ENV
[
'
COCOAPODS_
PARALLEL_CODE_SIGN'
]
==
'true'
if
parallel_codesign
if
parallel_codesign
codesign_bg
=
' &'
codesign_bg
=
' &'
end
end
...
...
spec/unit/generator/embed_frameworks_script_spec.rb
View file @
5070013c
...
@@ -3,7 +3,7 @@ require File.expand_path('../../../spec_helper', __FILE__)
...
@@ -3,7 +3,7 @@ require File.expand_path('../../../spec_helper', __FILE__)
module
Pod
module
Pod
describe
Generator
::
EmbedFrameworksScript
do
describe
Generator
::
EmbedFrameworksScript
do
before
do
before
do
ENV
.
delete
(
'PARALLEL_CODE_SIGN'
)
ENV
.
delete
(
'
COCOAPODS_
PARALLEL_CODE_SIGN'
)
frameworks
=
{
frameworks
=
{
'Debug'
=>
%w(Pods/Loopback.framework Reveal.framework)
,
'Debug'
=>
%w(Pods/Loopback.framework Reveal.framework)
,
'Release'
=>
%w(CrashlyticsFramework.framework)
,
'Release'
=>
%w(CrashlyticsFramework.framework)
,
...
@@ -24,8 +24,8 @@ module Pod
...
@@ -24,8 +24,8 @@ module Pod
SH
SH
end
end
it
'runs codesigning in the background when PARALLEL_CODE_SIGN is set to true'
do
it
'runs codesigning in the background when
COCOAPODS_
PARALLEL_CODE_SIGN is set to true'
do
ENV
[
'PARALLEL_CODE_SIGN'
]
=
'true'
ENV
[
'
COCOAPODS_
PARALLEL_CODE_SIGN'
]
=
'true'
@generator
.
send
(
:script
).
should
.
include
<<-
SH
.
strip_heredoc
@generator
.
send
(
:script
).
should
.
include
<<-
SH
.
strip_heredoc
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" &
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" &
SH
SH
...
@@ -34,7 +34,7 @@ module Pod
...
@@ -34,7 +34,7 @@ module Pod
SH
SH
end
end
it
'does not run codesigning in the background when PARALLEL_CODE_SIGN is set to true'
do
it
'does not run codesigning in the background when
COCOAPODS_
PARALLEL_CODE_SIGN is set to true'
do
@generator
.
send
(
:script
).
should
.
include
<<-
SH
.
strip_heredoc
@generator
.
send
(
:script
).
should
.
include
<<-
SH
.
strip_heredoc
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
SH
SH
...
...
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