Commit e70fc5f1 authored by Ben Asher's avatar Ben Asher Committed by GitHub

Merge pull request #6088 from benasher44/basher_parallel_codesign

Run codesigning in parallel if COCOAPODS_PARALLEL_CODE_SIGN is set to true
parents 849935d6 95aed6ae
...@@ -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.
......
...@@ -96,8 +96,13 @@ module Pod ...@@ -96,8 +96,13 @@ module Pod
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy # Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \\"$1\\"" local code_sign_cmd="/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"
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &"
fi
echo "$code_sign_cmd"
eval "$code_sign_cmd"
fi fi
} }
...@@ -130,6 +135,11 @@ module Pod ...@@ -130,6 +135,11 @@ module Pod
script << "fi\n" script << "fi\n"
end end
end end
script << <<-SH.strip_heredoc
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
wait
fi
SH
script script
end end
end end
......
Subproject commit 80c9b1f2fa480c2fe801253776e5f0b18106e832 Subproject commit 24a7488df64ea41de9aea5c1966ab56c505c7f18
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