Skip to content

C
cocoapods
Commit e87f9313 authored by Florent Vilmart's avatar Florent Vilmart Committed by Marius Rackwitz
Browse files
Options

Updates exclude list on rsync to match Xcode Copy Frameworks strategy

parent f3205471
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
lib/cocoapods/generator/embed_frameworks_script.rb
View file @ e87f9313
...@@ -60,8 +60,9 @@ module Pod ...@@ -60,8 +60,9 @@ module Pod
source=$(readlink "${source}") source=$(readlink "${source}")
fi fi
echo "rsync -av --exclude '*.h' ${source} ${destination}" # use filter instead of exclude so missing patterns dont' throw errors
rsync -av --exclude *.h "${source}" "${destination}" echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers/\" --filter \"- PrivateHeaders/\" ${source} ${destination}"
rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers/" --filter "- PrivateHeaders/" "${source}" "${destination}"
# Resign the code if required by the build settings to avoid unstable apps # Resign the code if required by the build settings to avoid unstable apps
if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
code_sign "${destination}/$1" code_sign "${destination}/$1"
...@@ -72,9 +73,10 @@ module Pod ...@@ -72,9 +73,10 @@ module Pod
code_sign() { code_sign() {
# 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 "codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1" 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" /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1
} }
eos eos
script += "\n" unless frameworks_by_config.values.all?(&:empty?) script += "\n" unless frameworks_by_config.values.all?(&:empty?)
frameworks_by_config.each do |config, frameworks| frameworks_by_config.each do |config, frameworks|
......
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