Commit 8cbdcdb0 authored by Eloy Durán's avatar Eloy Durán

Merge pull request #1521 from nmccann/feature/fix_resources_script

Avoid compiling xcassets in some cases
parents 92aa8a2c 0ba86b3d
......@@ -2,6 +2,17 @@
To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
## Master
###### Bug Fixes
* Added a condition to avoid compiling xcassets when WRAPPER_EXTENSION
is undefined, as it would be in the case of static libraries. This prevents
trying to copy the compiled files to a directory that does not exist.
[Noah McCann](https://github.com/nmccann)
[#1521](https://github.com/CocoaPods/CocoaPods/pull/1521)
## 0.27.1
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.2...0.27.1)
[cocoapods-core](https://github.com/CocoaPods/Core/compare/0.26.2...0.27.1)
......
......@@ -137,7 +137,7 @@ EOS
XCASSETS_COMPILE = <<EOS
if [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
then
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}"
......
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