Merge pull request #1556 from Widgetlabs/fix-actool-wrapper-name

Corrected wrong output path passed to actool for Apps.

CHANGELOG.md

@@ -20,6 +20,12 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ###### Bug Fixes
 
+* Compiling `xcassets` with `actool` now uses `UNLOCALIZED_RESOURCES_FOLDER_PATH`
+  instead of `PRODUCT_NAME.WRAPPER_EXTENSION` as output directory as it is more
+  accurate and allows the project to overwrite `WRAPPER_NAME`.
+  [Marc Knaup](https://github.com/fluidsonic)
+  [#1556](https://github.com/CocoaPods/CocoaPods/pull/1556)
+
 * 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.

lib/cocoapods/generator/copy_resources_script.rb

@@ -140,7 +140,7 @@ EOS
 if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `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}"
+  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}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
 EOS
     end