Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid compiling xcassets in some cases #1521

Merged
merged 2 commits into from Oct 29, 2013
Merged

Avoid compiling xcassets in some cases #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4565f01
Avoid compiling xcassets in some cases
nmccann Oct 28, 2013
0ba86b3
[CHANGELOG]
nmccann Oct 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/generator/copy_resources_script.rb
View file
Open in desktop
Expand Up @@ -137,7 +137,7 @@ def script

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}"
Expand Down