Repository: cordova-ios Updated Branches: refs/heads/master 1733e64e7 -> 0fd957a55
CB-6217 iOS simulator targets not consistent across scripts Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/0fd957a5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/0fd957a5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/0fd957a5 Branch: refs/heads/master Commit: 0fd957a559014e1f59290db69376d9ccb0cf0678 Parents: 1733e64 Author: Carlos Santana <[email protected]> Authored: Tue Mar 11 11:51:55 2014 -0400 Committer: Carlos Santana <[email protected]> Committed: Tue Mar 11 11:51:55 2014 -0400 ---------------------------------------------------------------------- bin/templates/scripts/cordova/lib/install-emulator | 15 ++++++++------- .../scripts/cordova/lib/list-emulator-images | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/0fd957a5/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 a928c62..ae2c47a 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,22 +65,23 @@ 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" - ;; + # --64bit not supportted by ios-sim yet + #"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/0fd957a5/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 df2586b..a73de7b 100755 --- a/bin/templates/scripts/cordova/lib/list-emulator-images +++ b/bin/templates/scripts/cordova/lib/list-emulator-images @@ -26,15 +26,15 @@ 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)"\" +# this assumes Xcode 5 minimum not supported by ios-sim yet +# echo \""iPhone (Retina 4-inch 64-bit)"\" echo \""iPhone"\" echo \""iPad"\" -echo \""iPad Retina"\" +echo \""iPad (Retina)"\"
