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
1160056e
Commit
1160056e
authored
Mar 07, 2016
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4940 from seaders/master
parents
b45fcf1b
a0757651
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
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 @
1160056e
...
@@ -28,6 +28,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -28,6 +28,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#4955
](
https://github.com/CocoaPods/CocoaPods/issues/4955
)
[
#4955
](
https://github.com/CocoaPods/CocoaPods/issues/4955
)
*
Move
`${TARGET_DEVICE_ARGS}`
out of the quotations for
`--sdk`
in the
`Copy Pods Resources`
build phase.
[
seaders
](
https://github.com/seaders
)
[
#4940
]
(https://github.com/CocoaPods/CocoaPods/issues/4940)
## 1.0.0.beta.4 (2016-02-24)
## 1.0.0.beta.4 (2016-02-24)
...
...
lib/cocoapods/generator/copy_resources_script.rb
View file @
1160056e
...
@@ -143,7 +143,7 @@ EOM
...
@@ -143,7 +143,7 @@ EOM
case $RESOURCE_PATH in
case $RESOURCE_PATH in
*
\.
storyboard)
*
\.
storyboard)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}
${TARGET_DEVICE_ARGS}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}
" ${TARGET_DEVICE_ARGS}
;;
;;
*
\.
xib)
*
\.
xib)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
...
...
cocoapods-integration-specs
@
2f865615
Subproject commit
37012367ef73dee7c403b4b56157ef81fca00741
Subproject commit
2f865615edb0fe42f6257f9838cd3d85a0fbd593
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