Merge pull request #4858 from cb1kenobi/timob-15576

[TIMOB-15576] Moved around the ios run hook logic so that --sim-64bit wa...
tidev · Oct 28, 2013 · 4d57b24 · 4d57b24
2 parents b460803 + 61a3fef
commit 4d57b24
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/iphone/cli/hooks/run.js b/iphone/cli/hooks/run.js
@@ -31,7 +31,8 @@ exports.init = function (logger, config, cli) {
 
 			logger.info(__('Running application in iOS Simulator'));
 
-			var simulatorDir = afs.resolvePath('~/Library/Application Support/iPhone Simulator/' + build.iosSimVersion + '/Applications'),
+			var simulatorDir = afs.resolvePath('~/Library/Application Support/iPhone Simulator/' + build.iosSimVersion +
+					(appc.version.gte(build.iosSimVersion, '7.0.0') && cli.argv['sim-64bit'] ? '-64' : '') + '/Applications'),
 				logFile = build.tiapp.guid + '.log';
 
 			parallel([
@@ -80,11 +81,11 @@ exports.init = function (logger, config, cli) {
 					cmd.push('--retina');
 					if (appc.version.gte(build.iosSimVersion, '6.0.0') && build.iosSimType == 'iphone' && cli.argv.tall) {
 						cmd.push('--tall');
-						if (appc.version.gte(build.iosSimVersion, '7.0.0') && build.iosSimType == 'iphone' && cli.argv['sim-64bit']) {
-							cmd.push('--sim-64bit');
-						}
 					}
 				}
+				if (appc.version.gte(build.iosSimVersion, '7.0.0') && cli.argv['sim-64bit']) {
+					cmd.push('--sim-64bit');
+				}
 				cmd = cmd.join(' ');
 
 				logger.info(__('Launching application in iOS Simulator'));