Commit 764a42a0 authored by Michal Konturek's avatar Michal Konturek Committed by Eloy Durán

[CopyResourcesScript] FIX xcassets not compatible with Xcode < 5.0.0.

parent f5a712c1
...@@ -12,6 +12,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -12,6 +12,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[Noah McCann](https://github.com/nmccann) [Noah McCann](https://github.com/nmccann)
[#1521](https://github.com/CocoaPods/CocoaPods/pull/1521) [#1521](https://github.com/CocoaPods/CocoaPods/pull/1521)
* Added additional condition to check if `actool` is available when compiling `xcassets`.
This prevents build failures of Xcode 5 projects on Travis CI (or lower Xcode versions).
[Michal Konturek](https://github.com/michalkonturek)
[#1511](https://github.com/CocoaPods/CocoaPods/pull/1511)
## 0.27.1 ## 0.27.1
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.2...0.27.1) [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.2...0.27.1)
......
...@@ -137,7 +137,7 @@ EOS ...@@ -137,7 +137,7 @@ EOS
XCASSETS_COMPILE = <<EOS XCASSETS_COMPILE = <<EOS
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ] if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
then then
DEVICE=`if [ "${TARGETED_DEVICE_FAMILY}" -eq 1 ]; then echo "iphone"; else echo "ipad"; fi` DEVICE=`if [ "${TARGETED_DEVICE_FAMILY}" -eq 1 ]; then echo "iphone"; else echo "ipad"; fi`
find "${PWD}" -name "*.xcassets" -print0 | xargs -0 actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" --target-device "${DEVICE}" --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}" find "${PWD}" -name "*.xcassets" -print0 | xargs -0 actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" --target-device "${DEVICE}" --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}"
......
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