Commit 5a201487 authored by Kyle Fuller's avatar Kyle Fuller

Merge pull request #3166 from CocoaPods/rsync-update-for-swift-libs

Copy Swift libraries using `rsync -u`
parents 7a93cdf0 5155be0a
...@@ -40,6 +40,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -40,6 +40,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/segiddins) [Samuel Giddins](https://github.com/segiddins)
[#2926](https://github.com/CocoaPods/CocoaPods/issues/2926) [#2926](https://github.com/CocoaPods/CocoaPods/issues/2926)
* Do not copy Swift standard libraries multiple times.
[Boris Bügling](https://github.com/neonichu)
[#3131](https://github.com/CocoaPods/CocoaPods/issues/3131)
##### Bug Fixes ##### Bug Fixes
* Added support for .tpp C++ header files in specs (previously were getting * Added support for .tpp C++ header files in specs (previously were getting
......
...@@ -76,8 +76,8 @@ module Pod ...@@ -76,8 +76,8 @@ module Pod
local swift_runtime_libs local swift_runtime_libs
swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/$1/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u && exit ${PIPESTATUS[0]}) swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/$1/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u && exit ${PIPESTATUS[0]})
for lib in $swift_runtime_libs; do for lib in $swift_runtime_libs; do
echo "rsync -av \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\"" echo "rsync -auv \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
rsync -av "${SWIFT_STDLIB_PATH}/${lib}" "${destination}" rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
code_sign "${destination}/${lib}" code_sign "${destination}/${lib}"
fi fi
......
Subproject commit 49e0adbdaae0c5a3ccd7b910ed1de0ef5b09bcd3 Subproject commit ff944cb149a27f867b7908b8ec10133bc34a3312
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