Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
75452ffc
Commit
75452ffc
authored
Oct 17, 2013
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CopyResourcesScript] Fix xcassets compilations with paths including a space
parent
669f926a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
CHANGELOG.md
CHANGELOG.md
+4
-4
copy_resources_script.rb
lib/cocoapods/generator/copy_resources_script.rb
+1
-1
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
No files found.
CHANGELOG.md
View file @
75452ffc
...
@@ -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
...
...
lib/cocoapods/generator/copy_resources_script.rb
View file @
75452ffc
...
@@ -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
...
...
cocoapods-integration-specs
@
4ae6545a
Subproject commit
ea4f2366f53ed7e379b0bf04bb6690ac4676f350
Subproject commit
4ae6545aaa358a2ee8efc9b57787f2ac20aed346
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment