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/06/18 01:31:20 UTC
[5/5] webworks commit: [CB-3830] Removed dependency on BBDNK
[Packaging, deploying, signing, debugTokens]
[CB-3830] Removed dependency on BBDNK [Packaging, deploying, signing, debugTokens]
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/ad8ac3d9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/ad8ac3d9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/ad8ac3d9
Branch: refs/heads/master
Commit: ad8ac3d915bb05d64f71b7e153e3cb509abdfe11
Parents: d7b32c9
Author: jkeshavarzi <jk...@blackberry.com>
Authored: Mon Jun 17 18:04:17 2013 -0400
Committer: jkeshavarzi <jk...@blackberry.com>
Committed: Mon Jun 17 18:04:17 2013 -0400
----------------------------------------------------------------------
blackberry10/bin/check_reqs.bat | 6 +-
.../project/cordova/lib/debugtoken-helper.js | 48 ++++++---------
.../project/cordova/lib/native-packager.js | 28 ++++-----
.../bin/templates/project/cordova/lib/run | 64 +++++++++-----------
.../project/cordova/lib/signing-helper.js | 5 --
.../cordova/unit/spec/lib/native-packager.js | 4 +-
.../cordova/unit/spec/lib/signing-helper.js | 8 ---
7 files changed, 66 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/check_reqs.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/check_reqs.bat b/blackberry10/bin/check_reqs.bat
index aef7171..b7173f7 100755
--- a/blackberry10/bin/check_reqs.bat
+++ b/blackberry10/bin/check_reqs.bat
@@ -35,21 +35,21 @@ for %%X in (npm) do (
)
set FOUNDPACKAGER=
-for %%X in (blackberry-nativepackager) do (
+for %%X in (blackberry-nativepackager.bat) do (
if not defined FOUNDPACKAGER (
set FOUNDPACKAGER=%%~$PATH:X
)
)
set FOUNDDEPLOYER=
-for %%X in (blackberry-deploy) do (
+for %%X in (blackberry-deploy.bat) do (
if not defined FOUNDDEPLOYER (
set FOUNDDEPLOYER=%%~$PATH:X
)
)
set FOUNDSIGNER=
-for %%X in (blackberry-signer) do (
+for %%X in (blackberry-signer.bat) do (
if not defined FOUNDSIGNER (
set FOUNDSIGNER=%%~$PATH:X
)
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
index 6d8c838..09324d7 100755
--- a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
@@ -105,24 +105,20 @@ function execNativeScript(script, options, callback) {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- process = childProcess.spawn(path.normalize(conf.DEPENDENCIES_TOOLS + script), options, {
- "cwd" : workingDir,
- "env" : process ? process.env : undefined
- });
+ process = childProcess.spawn(script, options, {
+ "cwd" : workingDir,
+ "env" : process ? process.env : undefined
+ });
- process.stdout.on("data", pkgrUtils.handleProcessOutput);
+ process.stdout.on("data", pkgrUtils.handleProcessOutput);
- process.stderr.on("data", pkgrUtils.handleProcessOutput);
+ process.stderr.on("data", pkgrUtils.handleProcessOutput);
- process.on("exit", function (code) {
- if (callback && typeof callback === "function") {
- callback(code);
- }
- });
- } else {
- throw localize.translate("EXCEPTION_MISSING_TOOLS");
- }
+ process.on("exit", function (code) {
+ if (callback && typeof callback === "function") {
+ callback(code);
+ }
+ });
}
function checkTarget(target) {
@@ -154,7 +150,7 @@ function deployTokenToTargetsRecursively() {
logger.info(localize.translate("PROGRESS_DEPLOYING_DEBUG_TOKEN", target));
if (checkTarget(target)) {
- execNativeScript("/bin/blackberry-deploy",
+ execNativeScript("blackberry-deploy",
generateDeployTokenOptions(target),
deployTokenToTargetsRecursively
);
@@ -205,7 +201,7 @@ self.createToken = function (projectProperties, target, keystorepass, callback)
} else {
logger.info(localize.translate("PROGRESS_GENERATING_DEBUG_TOKEN"));
// Call "blackberry-debugtokenrequest" to generate debug token
- execNativeScript("/bin/blackberry-debugtokenrequest",
+ execNativeScript("blackberry-debugtokenrequest",
generateCreateTokenOptions(pins, keystorepass),
callback
);
@@ -248,7 +244,7 @@ self.deployToken = function (projectProperties, target, callback) {
self.checkDebugToken = function (pin, callback) {
var process,
- script = "/bin/blackberry-nativepackager",
+ script = "blackberry-nativepackager",
nativePackager;
if (!callback || typeof callback !== "function") {
@@ -264,16 +260,12 @@ self.checkDebugToken = function (pin, callback) {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- nativePackager = childProcess.exec(path.normalize(conf.DEPENDENCIES_TOOLS + script +" -listManifest " + debugTokenDir), {
- "cwd": workingDir,
- "env": process ? process.env : undefined
- }, function (error, stdout, stderr) {
- callback(isDebugTokenValid(pin, stdout));
- });
- } else {
- throw localize.translate("EXCEPTION_MISSING_TOOLS");
- }
+ nativePackager = childProcess.exec(path.normalize(script +" -listManifest " + debugTokenDir), {
+ "cwd": workingDir,
+ "env": process ? process.env : undefined
+ }, function (error, stdout, stderr) {
+ callback(isDebugTokenValid(pin, stdout));
+ });
return;
};
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/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 162cbbd..a35b5ba 100644
--- a/blackberry10/bin/templates/project/cordova/lib/native-packager.js
+++ b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
@@ -246,7 +246,7 @@ function generateOptionsFile(session, target, config) {
}
function execNativePackager(session, callback) {
- var script = "/bin/blackberry-nativepackager",
+ var script = "blackberry-nativepackager",
cwd = session.sourceDir,
nativePkgr;
@@ -254,24 +254,20 @@ function execNativePackager(session, callback) {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- nativePkgr = childProcess.spawn(path.normalize(conf.DEPENDENCIES_TOOLS + script), ["@options"], {
- "cwd": cwd,
- "env": process.env
- });
+ nativePkgr = childProcess.spawn(script, ["@options"], {
+ "cwd": cwd,
+ "env": process.env
+ });
- nativePkgr.stdout.on("data", pkgrUtils.handleProcessOutput);
+ nativePkgr.stdout.on("data", pkgrUtils.handleProcessOutput);
- nativePkgr.stderr.on("data", pkgrUtils.handleProcessOutput);
+ nativePkgr.stderr.on("data", pkgrUtils.handleProcessOutput);
- nativePkgr.on("exit", function (code) {
- if (callback && typeof callback === "function") {
- callback(code);
- }
- });
- } else {
- throw localize.translate("EXCEPTION_MISSING_TOOLS");
- }
+ nativePkgr.on("exit", function (code) {
+ if (callback && typeof callback === "function") {
+ callback(code);
+ }
+ });
}
module.exports = {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/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 3bcfeb6..fc98542 100755
--- a/blackberry10/bin/templates/project/cordova/lib/run
+++ b/blackberry10/bin/templates/project/cordova/lib/run
@@ -77,7 +77,7 @@ function generateOptions(uninstall) {
}
function execNativeDeploy(optionsArray, callback) {
- var script = "/bin/blackberry-deploy",
+ var script = "blackberry-deploy",
nativeDeploy;
options = optionsArray.join(" ");
@@ -85,24 +85,20 @@ function execNativeDeploy(optionsArray, callback) {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- nativeDeploy = childProcess.exec(path.normalize(conf.DEPENDENCIES_TOOLS + script +" "+ options), {
- "cwd": workingdir,
- "env": process.env
- });
+ nativeDeploy = childProcess.exec(path.normalize(script +" "+ options), {
+ "cwd": workingdir,
+ "env": process.env
+ });
- nativeDeploy.stdout.on("data", pkgrUtils.handleProcessOutput);
+ nativeDeploy.stdout.on("data", pkgrUtils.handleProcessOutput);
- nativeDeploy.stderr.on("data", pkgrUtils.handleProcessOutput);
+ nativeDeploy.stderr.on("data", pkgrUtils.handleProcessOutput);
- nativeDeploy.on("exit", function (code) {
- if (callback && typeof callback === "function") {
- callback(code);
- }
- });
- } else {
- throw localize.translate("EXCEPTION_MISSING_TOOLS");
- }
+ nativeDeploy.on("exit", function (code) {
+ if (callback && typeof callback === "function") {
+ callback(code);
+ }
+ });
}
function checkTarget() {
@@ -137,27 +133,25 @@ function uninstall() {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- nativeDeploy = childProcess.exec(path.normalize(conf.DEPENDENCIES_TOOLS + script +" -listInstalledApps -device " +ip+ " -password " +password), {
- "cwd": workingdir,
- "env": process.env
- }, function (error, stdout, stderr) {
- var parser = new xml2js.Parser();
- fs.readFile(path.join(__dirname + "/../../www/", "config.xml"), function(err, data) {
- parser.parseString(data, function (err, result) {
- if (stdout.indexOf(result['@'].id) != -1) {
- var options = generateOptions(true);
- execNativeDeploy(options,
- function(){
- deploy();
- });
- } else {
- deploy();
- }
- });
+ nativeDeploy = childProcess.exec(script +" -listInstalledApps -device " +ip+ " -password " +password, {
+ "cwd": workingdir,
+ "env": process.env
+ }, function (error, stdout, stderr) {
+ var parser = new xml2js.Parser();
+ fs.readFile(path.join(__dirname + "/../../www/", "config.xml"), function(err, data) {
+ parser.parseString(data, function (err, result) {
+ if (stdout.indexOf(result['@'].id) != -1) {
+ var options = generateOptions(true);
+ execNativeDeploy(options,
+ function(){
+ deploy();
+ });
+ } else {
+ deploy();
+ }
});
});
- }
+ });
}
function deploy() {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/signing-helper.js b/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
index d0daafd..b7cdd9b 100644
--- a/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
@@ -62,16 +62,12 @@ function getDefaultPath(file) {
function execSigner(session, target, callback) {
var script = "blackberry-signer",
- cwd = path.normalize(conf.DEPENDENCIES_TOOLS + "/bin/"),
signer,
params = session.getParams("blackberry-signer"),
args = [];
if (pkgrUtils.isWindows()) {
script += ".bat";
- } else {
- // add path to executable to work around issue with node
- script = cwd + script;
}
args.push("-keystore");
@@ -92,7 +88,6 @@ function execSigner(session, target, callback) {
args.push(path.resolve(util.format(session.barPath, target)));
signer = childProcess.spawn(script, args, {
- "cwd": cwd,
"env": process.env
});
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/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 a4ab63e..bcbe5d8 100644
--- a/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
+++ b/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
@@ -128,7 +128,7 @@ describe("Native packager", function () {
"<permission system=\"false\">access_internet</permission>" +
"<name>" + config.name['default'] + "</name>" +
"<description>" + config.description['default'] + "</description></qnx>",
- cmd = path.normalize(session.conf.DEPENDENCIES_TOOLS + "/bin/blackberry-nativepackager" + (pkgrUtils.isWindows() ? ".bat" : ""));
+ cmd = "blackberry-nativepackager" + (pkgrUtils.isWindows() ? ".bat" : "");
spyOn(pkgrUtils, "writeFile").andCallFake(function (sourceDir, outputDir, data) {
expect(sourceDir).toEqual(session.sourceDir);
@@ -323,7 +323,7 @@ describe("Native packager", function () {
});
it("exec blackberry-nativepackager with additional params", function () {
- var cmd = path.normalize(session.conf.DEPENDENCIES_TOOLS + "/bin/blackberry-nativepackager" + (pkgrUtils.isWindows() ? ".bat" : ""));
+ var cmd = "blackberry-nativepackager" + (pkgrUtils.isWindows() ? ".bat" : "");
spyOn(pkgrUtils, "writeFile");
session.getParams = jasmine.createSpy("session getParams").andReturn({
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js b/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js
index ad91726..8aa37fd 100644
--- a/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js
+++ b/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js
@@ -376,10 +376,6 @@ describe("signing-helper", function () {
var callback = jasmine.createSpy("callback"),
cmd = "blackberry-signer" + (pkgrUtils.isWindows() ? ".bat" : "");
- if (!pkgrUtils.isWindows()) {
- cmd = path.normalize(conf.DEPENDENCIES_TOOLS + "/bin/") + cmd;
- }
-
session.getParams = jasmine.createSpy("session getParams").andReturn(null);
signingHelper.execSigner(session, "device", callback);
expect(childProcess.spawn).toHaveBeenCalledWith(cmd, ["-keystore", session.keystore, "-storepass", session.storepass, path.resolve("c:/device/Demo.bar")], jasmine.any(Object));
@@ -392,10 +388,6 @@ describe("signing-helper", function () {
var callback = jasmine.createSpy("callback"),
cmd = "blackberry-signer" + (pkgrUtils.isWindows() ? ".bat" : "");
- if (!pkgrUtils.isWindows()) {
- cmd = path.normalize(conf.DEPENDENCIES_TOOLS + "/bin/") + cmd;
- }
-
session.getParams = jasmine.createSpy("session getParams").andReturn({
"-proxyhost": "abc.com",
"-proxyport": "80"