Added fix to use commandline keystorepass Reviewed by: Bryan Higgins <[email protected]> Tested by: Tracy Li <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/94fa3ffd Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/94fa3ffd Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/94fa3ffd Branch: refs/heads/master Commit: 94fa3ffdb349e647faa9a3a555374d919a8d30e9 Parents: 5fdf5b0 Author: DanielAudino <[email protected]> Authored: Wed Apr 24 13:04:12 2013 -0400 Committer: Bryan Higgins <[email protected]> Committed: Fri May 3 10:13:32 2013 -0400 ---------------------------------------------------------------------- .../bin/templates/project/cordova/lib/build | 3 ++- .../project/cordova/lib/debugtoken-helper.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/94fa3ffd/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 81e7dd6..bee735c 100644 --- a/blackberry10/bin/templates/project/cordova/lib/build +++ b/blackberry10/bin/templates/project/cordova/lib/build @@ -45,9 +45,10 @@ function copyArgIfExists(arg) { } function createDebugtoken(previous, baton) { + var keystorepass = command["keystorepass"] ? command["keystorepass"] : projectProperties.keystorepass; baton.take(); logger.info(localize.translate("PROGRESS_WILL_CREATE_DEBUG_TOKEN")); - debugTokenHelper.createToken(projectProperties, getTarget(), function (code) { + debugTokenHelper.createToken(projectProperties, getTarget(), keystorepass, function (code) { if (code === 0) { debugtoken = true; } http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/94fa3ffd/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 8a936b1..791973c 100755 --- a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js +++ b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js @@ -130,7 +130,7 @@ function deployTokenToTargetsRecursively() { } } -self.createToken = function (projectProperties, target, callback) { +self.createToken = function (projectProperties, target, keystorepass, callback) { var pins = [], key; @@ -159,7 +159,7 @@ self.createToken = function (projectProperties, target, callback) { if (callback && typeof callback === "function") { callback(-1); } - } else if (!properties.keystorepass) { + } else if (!keystorepass) { logger.warn(localize.translate("WARN_NO_SIGNING_PASSWORD_PROVIDED")); if (callback && typeof callback === "function") { callback(-1); @@ -168,7 +168,7 @@ self.createToken = function (projectProperties, target, callback) { logger.info(localize.translate("PROGRESS_GENERATING_DEBUG_TOKEN")); // Call "blackberry-debugtokenrequest" to generate debug token execNativeScript("/bin/blackberry-debugtokenrequest", - generateCreateTokenOptions(pins, properties.keystorepass), + generateCreateTokenOptions(pins, keystorepass), callback ); }
