Commit 5070013c authored by Ben Asher's avatar Ben Asher

CHANGELOG entry. COCOAPODS_ prefix

parent b55dadbb
...@@ -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.
......
...@@ -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
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment