incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject android commit: CB-937 fixing debug for windows
Date Fri, 29 Jun 2012 00:11:30 GMT
Updated Branches:
  refs/heads/master 17ff6be6a -> e069bbb80


CB-937 fixing debug for windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/e069bbb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/e069bbb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/e069bbb8

Branch: refs/heads/master
Commit: e069bbb800436e8748de29008c7632f901b52c95
Parents: 17ff6be
Author: Anis Kadri <anis.kadri@gmail.com>
Authored: Thu Jun 28 17:11:21 2012 -0700
Committer: Anis Kadri <anis.kadri@gmail.com>
Committed: Thu Jun 28 17:11:21 2012 -0700

----------------------------------------------------------------------
 bin/templates/cordova/cordova.js |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e069bbb8/bin/templates/cordova/cordova.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/cordova.js b/bin/templates/cordova/cordova.js
index b25ee6b..e0e9762 100644
--- a/bin/templates/cordova/cordova.js
+++ b/bin/templates/cordova/cordova.js
@@ -71,11 +71,14 @@ function clean() {
 }
 
 function debug() {
-    exec("%comspec% /c ant.bat debug -f "+ROOT+"\\build.xml 2>&1");
-}
-
-function debug_install() {
-    exec("%comspec% /c ant.bat debug install -f "+ROOT+"\\build.xml 2>&1");
+   if(emulator_running()) {
+        exec("%comspec% /c ant.bat debug install -f "+ROOT+"\\build.xml 2>&1");
+   } else {
+        exec("%comspec% /c ant.bat debug -f "+ROOT+"\\build.xml 2>&1");
+        WScript.Echo("##################################################################");
+        WScript.Echo("# Plug in your device or launch an emulator with cordova/emulate #");
+        WScript.Echo("##################################################################");
+   }
 }
 
 function log() {
@@ -90,15 +93,8 @@ function launch() {
 
 function BOOM() {
    clean();
-   if(emulator_running()) {
-        debug_install();
-        launch();
-   } else {
-        debug();
-        WScript.Echo("##################################################################");
-        WScript.Echo("# Plug in your device or launch an emulator with cordova/emulate #");
-        WScript.Echo("##################################################################");
-   }
+   debug();
+   launch();
 }
 var args = WScript.Arguments;
 if(args.count() != 1) {


Mime
View raw message