You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/09/16 22:03:02 UTC
ios commit: [CB-4829] Xcode 5 simulated device names are different
(and includes a new 64-bit device)
Updated Branches:
refs/heads/master 5ee272ef6 -> cace58008
[CB-4829] Xcode 5 simulated device names are different (and includes a new 64-bit device)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/cace5800
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/cace5800
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/cace5800
Branch: refs/heads/master
Commit: cace580085c28841e1b4b4d887aa172caa31849a
Parents: 5ee272e
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Sep 16 13:03:06 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Sep 16 13:03:06 2013 -0700
----------------------------------------------------------------------
.../scripts/cordova/lib/install-emulator | 11 +++++++----
.../scripts/cordova/lib/list-emulator-images | 18 ++++++++++++------
bin/templates/scripts/cordova/lib/start-emulator | 2 +-
3 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/cace5800/bin/templates/scripts/cordova/lib/install-emulator
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/install-emulator b/bin/templates/scripts/cordova/lib/install-emulator
index 70b5d2e..a928c62 100755
--- a/bin/templates/scripts/cordova/lib/install-emulator
+++ b/bin/templates/scripts/cordova/lib/install-emulator
@@ -25,7 +25,7 @@
# "iPad (Retina)"
OPTION_RESULT=()
-TARGET="iPhone (Retina 3.5-inch)"
+TARGET="iPhone Retina (3.5-inch)"
TARGET_FLAG='--family iphone --retina'
# separates "key=value", sets an array with 0th index as key, 1st index as value
@@ -65,19 +65,22 @@ TARGET_LC=`echo $TARGET | tr '[:upper:]' '[:lower:]'`
# remember the comparison is lowercase
case "$TARGET_LC" in
- "iphone (retina 3.5-inch)")
+ "iphone retina (3.5-inch)")
TARGET_FLAG="--family iphone --retina"
;;
- "iphone (retina 4-inch)")
+ "iphone retina (4-inch)")
TARGET_FLAG="--family iphone --retina --tall"
;;
+ "iphone retina (4-inch 64-bit)")
+ TARGET_FLAG="--family iphone --retina --tall --64bit"
+ ;;
"iphone")
TARGET_FLAG="--family iphone"
;;
"ipad")
TARGET_FLAG="--family ipad"
;;
- "ipad (retina)")
+ "ipad retina")
TARGET_FLAG="--family ipad --retina"
;;
esac
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/cace5800/bin/templates/scripts/cordova/lib/list-emulator-images
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/list-emulator-images b/bin/templates/scripts/cordova/lib/list-emulator-images
index 4df5315..df2586b 100755
--- a/bin/templates/scripts/cordova/lib/list-emulator-images
+++ b/bin/templates/scripts/cordova/lib/list-emulator-images
@@ -18,17 +18,23 @@
# under the License.
#
# Valid values for "--target" (case insensitive):
-# "iPhone (Retina 3.5-inch)" (default)
-# "iPhone (Retina 4-inch)"
+# "iPhone Retina (3.5-inch)" (default)
+# "iPhone Retina (4-inch)"
# "iPhone"
# "iPad"
-# "iPad (Retina)"
+# "iPad Retina"
set -e
-echo \""iPhone (Retina 3.5-inch)"\"
-echo \""iPhone (Retina 4-inch)"\"
+echo \""iPhone Retina (3.5-inch)"\"
+echo \""iPhone Retina (4-inch)"\"
+
+# this assumes Xcode 5 minimum
+echo \""iPhone Retina (4-inch 64-bit)"\"
+
echo \""iPhone"\"
echo \""iPad"\"
-echo \""iPad (Retina)"\"
+echo \""iPad Retina"\"
+
+
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/cace5800/bin/templates/scripts/cordova/lib/start-emulator
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/start-emulator b/bin/templates/scripts/cordova/lib/start-emulator
index 16eb3ce..95028dd 100755
--- a/bin/templates/scripts/cordova/lib/start-emulator
+++ b/bin/templates/scripts/cordova/lib/start-emulator
@@ -27,7 +27,7 @@
set -e
-DEFAULT_TARGET="iPhone (Retina 3.5-inch)"
+DEFAULT_TARGET="iPhone Retina (3.5-inch)"
TARGET=${1:-$DEFAULT_TARGET}
LIB_PATH=$( cd "$( dirname "$0" )" && pwd -P)