You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2013/09/12 15:37:04 UTC

webworks commit: [CB-4785] Fixing --no-build flag for run command

Updated Branches:
  refs/heads/master 48a64755c -> 600130290


[CB-4785] Fixing --no-build flag for run command

Reviewed by Bryan Higgins <bh...@blackberry.com>
Tested by Tracy Li <tl...@blackberry.com>


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

Branch: refs/heads/master
Commit: 600130290eda5c3ab0933df1cf30f007e2ec7df7
Parents: 48a6475
Author: Jeffrey Heifetz <jh...@blackberry.com>
Authored: Tue Sep 10 17:03:54 2013 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Thu Sep 12 09:39:35 2013 -0400

----------------------------------------------------------------------
 .../bin/templates/project/cordova/lib/run        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/60013029/blackberry10/bin/templates/project/cordova/lib/run
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/run b/blackberry10/bin/templates/project/cordova/lib/run
index a2d1b45..3aa386d 100755
--- a/blackberry10/bin/templates/project/cordova/lib/run
+++ b/blackberry10/bin/templates/project/cordova/lib/run
@@ -286,16 +286,17 @@ function handleDebugToken(deployTarget, allDone) {
 function install(deployTarget, done) {
     var buildCmd = utils.isWindows() ? "build" : "./build",
         buildArgs = program.keystorepass ? ["-k", program.keystorepass] : [],
-        projectRootDir = path.normalize(path.join(__dirname, ".."));
+        projectRootDir = path.normalize(path.join(__dirname, "..")),
+        installTasks = [];
 
-    async.series(
-        [
-            utils.exec.bind(this, buildCmd, buildArgs, {"cwd": projectRootDir}),
-            uninstall.bind(this, deployTarget),
-            execNativeDeploy.bind(this, generateOptions(deployTarget))
-        ],
-        done
-    );
+    if (program.build) {
+        installTasks.push(utils.exec.bind(this, buildCmd, buildArgs, {"cwd": projectRootDir}));
+    }
+
+    installTasks.push(uninstall.bind(this, deployTarget),
+                      execNativeDeploy.bind(this, generateOptions(deployTarget)));
+
+    async.series(installTasks, done);
 }