cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhigg...@apache.org
Subject webworks commit: CB-6058 - Options file removed from output bar. Now in build directory
Date Wed, 19 Feb 2014 12:43:52 GMT
Repository: cordova-blackberry
Updated Branches:
  refs/heads/master ca270a12c -> cf350f02b


CB-6058 - Options file removed from output bar. Now in build directory


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

Branch: refs/heads/master
Commit: cf350f02b835e893da2264e4e4c16df957e82d31
Parents: ca270a1
Author: jkeshavarzi <jkeshavarzi@blackberry.com>
Authored: Tue Feb 18 16:16:35 2014 -0500
Committer: Bryan Higgins <bryan@bryanhiggins.net>
Committed: Wed Feb 19 07:42:59 2014 -0500

----------------------------------------------------------------------
 .../bin/templates/project/cordova/lib/native-packager.js       | 4 ++--
 blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/cf350f02/blackberry10/bin/templates/project/cordova/lib/native-packager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/native-packager.js b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
index b6308dd..0ffc0b4 100644
--- a/blackberry10/bin/templates/project/cordova/lib/native-packager.js
+++ b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
@@ -256,7 +256,7 @@ function generateOptionsFile(session, target, config) {
         }
     });
 
-    fs.writeFileSync(path.normalize(session.sourceDir + "/options"), optionsStr);
+    fs.writeFileSync(path.normalize(session.sourceDir + "/../options"), optionsStr);
 }
 
 function execNativePackager(session, callback) {
@@ -268,7 +268,7 @@ function execNativePackager(session, callback) {
         script += ".bat";
     }
 
-    nativePkgr = childProcess.spawn(script, ["@options"], {
+    nativePkgr = childProcess.spawn(script, ["@../options"], {
         "cwd": cwd,
         "env": process.env
     });

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/cf350f02/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js b/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
index 6c4a7da..6f2359d 100644
--- a/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
+++ b/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
@@ -152,7 +152,7 @@ describe("Native packager", function () {
         nativePkgr.exec(session, target, testData.config, callback);
 
         expect(fs.writeFileSync).toHaveBeenCalledWith(jasmine.any(String), jasmine.any(String));
-        expect(childProcess.spawn).toHaveBeenCalledWith(cmd, ["@options"], {"cwd": session.sourceDir,
"env": process.env});
+        expect(childProcess.spawn).toHaveBeenCalledWith(cmd, ["@../options"], {"cwd": session.sourceDir,
"env": process.env});
         expect(callback).toHaveBeenCalledWith(0);
     });
 
@@ -344,14 +344,14 @@ describe("Native packager", function () {
 
         nativePkgr.exec(session, "simulator", testData.config, callback);
 
-        expect(fs.writeFileSync.mostRecentCall.args[0]).toBe(path.resolve(session.sourceDir,
"options"));
+        expect(fs.writeFileSync.mostRecentCall.args[0]).toBe(path.resolve(session.sourceDir
+ "/../", "options"));
         expect(fs.writeFileSync.mostRecentCall.args[1]).toContain("-package" + NL);
         expect(fs.writeFileSync.mostRecentCall.args[1]).toContain("-password" + NL);
         expect(fs.writeFileSync.mostRecentCall.args[1]).toContain("abc" + NL);
         expect(fs.writeFileSync.mostRecentCall.args[1]).toContain("-device" + NL);
         expect(fs.writeFileSync.mostRecentCall.args[1]).toContain("192.168.1.114" + NL);
         expect(fs.writeFileSync.mostRecentCall.args[1]).toContain("-installApp" + NL);
-        expect(childProcess.spawn).toHaveBeenCalledWith(cmd, ["@options"], {"cwd": session.sourceDir,
"env": process.env});
+        expect(childProcess.spawn).toHaveBeenCalledWith(cmd, ["@../options"], {"cwd": session.sourceDir,
"env": process.env});
         expect(callback).toHaveBeenCalledWith(0);
     });
 });


Mime
View raw message