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
e91c4af2
Commit
e91c4af2
authored
May 12, 2016
by
Juan Pablo Civile
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CopyResourcesScript] Add --target-device to ibtool invocation for XIBs #5282
parent
20bb1ea3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
CHANGELOG.md
CHANGELOG.md
+4
-0
copy_resources_script.rb
lib/cocoapods/generator/copy_resources_script.rb
+2
-2
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
No files found.
CHANGELOG.md
View file @
e91c4af2
...
@@ -16,6 +16,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -16,6 +16,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#5287
](
https://github.com/CocoaPods/CocoaPods/issues/5287
)
[
#5287
](
https://github.com/CocoaPods/CocoaPods/issues/5287
)
*
Add --target-device to ibtool invocation for XIBs
[
Juan Civile
](
https://github.com/champo
)
[
#5282
](
https://github.com/CocoaPods/CocoaPods/issues/5282
)
## 1.0.0 (2016-05-10)
## 1.0.0 (2016-05-10)
...
...
lib/cocoapods/generator/copy_resources_script.rb
View file @
e91c4af2
...
@@ -144,8 +144,8 @@ EOM
...
@@ -144,8 +144,8 @@ EOM
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_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 "${TARGET_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 ${TARGET_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 ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .xib`.nib $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 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename
\\
"$RESOURCE_PATH
\\
" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
${TARGET_DEVICE_ARGS}
;;
;;
*.framework)
*.framework)
echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
...
...
cocoapods-integration-specs
@
9c3a66b4
Subproject commit
4560c5c5bbc2fe7d6efe055b41b5fae622640826
Subproject commit
9c3a66b49d8202051f6c1042ab7057c9e54cf05e
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