Merge branch 'respect-codesign-flags'

5bf34d84 · Marius Rackwitz · f375b48f · 7f8dcb0b · 5bf34d84 · 792d2aa8
Commit 5bf34d84 authored Apr 14, 2016 by Marius Rackwitz
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

embed_frameworks_script.rb lib/cocoapods/generator/embed_frameworks_script.rb +2 -2

cocoapods-integration-specs spec/cocoapods-integration-specs +1 -1

No files found.
--- a/lib/cocoapods/generator/embed_frameworks_script.rb
+++ b/lib/cocoapods/generator/embed_frameworks_script.rb
@@ -96,8 +96,8 @@ module Pod
            if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
              # Use the current code_sign_identitiy
              echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-              echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \\"$1\\""
-              /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+              echo "/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"
            fi
          }


--- a/cocoapods-integration-specs @ 792d2aa8
+++ b/cocoapods-integration-specs @ 792d2aa8
-Subproject commit 5ab50939447c8c69fe3ab4cbfceaab3c90dd7f33
+Subproject commit 792d2aa8f0cf2ce3e32e9de05e6b4ca77073c378