cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhigg...@apache.org
Subject webworks commit: [CB-3613] Format paths passed to childProcess.exec for windows
Date Wed, 05 Jun 2013 16:18:51 GMT
Updated Branches:
  refs/heads/master b093a0cfb -> 57544404e


[CB-3613] Format paths passed to childProcess.exec for windows

Revewied by Jeffrey Heifetz <jheifetz@blackberry.com>
Tested by Jeffrey Heifetz <jheifetz@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/57544404
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/57544404
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/57544404

Branch: refs/heads/master
Commit: 57544404e928654177665a12b802c282ef6b3685
Parents: b093a0c
Author: Bryan Higgins <bhiggins@blackberry.com>
Authored: Wed Jun 5 11:54:31 2013 -0400
Committer: Bryan Higgins <bhiggins@blackberry.com>
Committed: Wed Jun 5 12:21:35 2013 -0400

----------------------------------------------------------------------
 .../bin/templates/project/cordova/lib/build        |    9 +++++++--
 blackberry10/bin/templates/project/cordova/lib/run |    9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/57544404/blackberry10/bin/templates/project/cordova/lib/build
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/build b/blackberry10/bin/templates/project/cordova/lib/build
index 561b016..5e15425 100755
--- a/blackberry10/bin/templates/project/cordova/lib/build
+++ b/blackberry10/bin/templates/project/cordova/lib/build
@@ -87,11 +87,16 @@ function postClean() {
 }
 
 function clean(previous, baton) {
-    var cleanScript;
+    var cleanScript,
+        execName = "./clean";
+
+    if (pkgrUtils.isWindows()) {
+        execName = "clean";
+    } 
 
     baton.take();
 
-    cleanScript = childProcess.exec("./clean", {
+    cleanScript = childProcess.exec(execName, {
         "cwd": path.normalize(__dirname + "/.."),
         "env": process.env
     });

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/57544404/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 f130dae..d4430f9 100755
--- a/blackberry10/bin/templates/project/cordova/lib/run
+++ b/blackberry10/bin/templates/project/cordova/lib/run
@@ -223,11 +223,16 @@ function handleBuildOutput(data) {
 }
 
 function build(previous, baton) {
-    var nativeDeploy;
+    var nativeDeploy,
+        execName = "./build";
 
     baton.take();
 
-    nativeDeploy = childProcess.exec("./build", {
+    if (pkgrUtils.isWindows()) {
+        execName = "build";
+    } 
+
+    nativeDeploy = childProcess.exec(execName, {
         "cwd": path.normalize(__dirname + "/.."),
         "env": process.env
     });


Mime
View raw message