Commit 75452ffc authored by Fabio Pelosin's avatar Fabio Pelosin

[CopyResourcesScript] Fix xcassets compilations with paths including a space

parent 669f926a
...@@ -12,6 +12,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -12,6 +12,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[Adam Sharp](https://github.com/sharplet) [Adam Sharp](https://github.com/sharplet)
[Core#30](https://github.com/CocoaPods/Core/pull/30) [Core#30](https://github.com/CocoaPods/Core/pull/30)
* The copy resources script now compiles xcassets resources.
[Ulrik Damm](https://github.com/ulrikdamm)
[#1427](https://github.com/CocoaPods/CocoaPods/pull/1427)
###### Bug Fixes ###### Bug Fixes
* The architecture is now set in the build settings of the user build * The architecture is now set in the build settings of the user build
...@@ -96,10 +100,6 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -96,10 +100,6 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[Fabio Pelosin](https://github.com/irrationalfab) [Fabio Pelosin](https://github.com/irrationalfab)
[#1273](https://github.com/CocoaPods/CocoaPods/pull/1273) [#1273](https://github.com/CocoaPods/CocoaPods/pull/1273)
* Compiles xcassets from pods.
[Ulrik Damm](https://github.com/ulrikdamm)
[#1427](https://github.com/CocoaPods/CocoaPods/pull/1427)
###### Bug Fixes ###### Bug Fixes
* The search paths of vendored frameworks and libraries now are always * The search paths of vendored frameworks and libraries now are always
......
...@@ -140,7 +140,7 @@ EOS ...@@ -140,7 +140,7 @@ EOS
if [ `find . -name '*.xcassets' | wc -l` -ne 0 ] if [ `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`
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}.app" `find $PWD -name '*.xcassets'` 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}"
fi fi
EOS EOS
end end
......
Subproject commit ea4f2366f53ed7e379b0bf04bb6690ac4676f350 Subproject commit 4ae6545aaa358a2ee8efc9b57787f2ac20aed346
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