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/10/01 20:38:06 UTC
webworks commit: [CB-4913] Updates warnings to check for BBID token
Updated Branches:
refs/heads/master e57174595 -> 0924d911a
[CB-4913] Updates warnings to check for BBID token
Reviewed by Bryan Higgins <bh...@blackberry.com>
Tested by Jenny Gee <jg...@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/0924d911
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/0924d911
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/0924d911
Branch: refs/heads/master
Commit: 0924d911ae112816661d333953fa46d57bdc1de2
Parents: e571745
Author: Jeffrey Heifetz <jh...@blackberry.com>
Authored: Wed Sep 25 14:49:34 2013 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Tue Oct 1 14:41:00 2013 -0400
----------------------------------------------------------------------
.../project/cordova/lib/packager-validator.js | 17 ++++++++++-------
.../bin/templates/project/cordova/lib/session.js | 11 ++++++-----
.../project/cordova/lib/signing-helper.js | 14 --------------
3 files changed, 16 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/0924d911/blackberry10/bin/templates/project/cordova/lib/packager-validator.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/packager-validator.js b/blackberry10/bin/templates/project/cordova/lib/packager-validator.js
index 9fc7627..a04d818 100644
--- a/blackberry10/bin/templates/project/cordova/lib/packager-validator.js
+++ b/blackberry10/bin/templates/project/cordova/lib/packager-validator.js
@@ -17,7 +17,6 @@ var check = require('validator').check,
sanitize = require('validator').sanitize,
localize = require("./localize"),
logger = require("./logger"),
- signingHelper = require("./signing-helper"),
path = require("path"),
fs = require("fs"),
packagerUtils = require("./packager-utils"),
@@ -35,6 +34,7 @@ _self = {
var keysFound = session.keystore,
cskFound = session.keystoreCsk,//barsigner.csk
dbFound = session.keystoreDb,//barsigner.db
+ bbidFound = session.keystoreBBID,
keysPassword = session.storepass && typeof session.storepass === "string",
commandLinebuildId = session.buildId && typeof session.buildId === "string",//--buildId
buildId = widgetConfig.buildId && typeof widgetConfig.buildId === "string",//Finalized Build ID
@@ -43,6 +43,7 @@ _self = {
AUTHOR_P12 = "author.p12",
BARSIGNER_CSK = "barsigner.csk",
BARSIGNER_DB = "barsigner.db",
+ BARSIGNER_BBID = "bbidtoken.csk",
//Logging function
signingFileWarn = function (file) {
@@ -56,9 +57,10 @@ _self = {
if (keysPassword || commandLinebuildId) {
if (!keysFound) {
signingFileError(AUTHOR_P12);
- } else if (!cskFound) {
- signingFileError(BARSIGNER_CSK);
- } else if (!dbFound) {
+ } else if (!cskFound && !bbidFound) {
+ //Only warn about BBID since the old tokens are deprecated
+ signingFileError(BARSIGNER_BBID);
+ } else if (cskFound && !dbFound) {
signingFileError(BARSIGNER_DB);
}
@@ -66,9 +68,10 @@ _self = {
} else if (buildId) {
if (!keysFound) {
signingFileWarn(AUTHOR_P12);
- } else if (!cskFound) {
- signingFileWarn(BARSIGNER_CSK);
- } else if (!dbFound) {
+ } else if (!cskFound && !bbidFound) {
+ //Only warn about BBID since the old tokens are deprecated
+ signingFileWarn(BARSIGNER_BBID);
+ } else if (cskFound && !dbFound) {
signingFileWarn(BARSIGNER_DB);
}
}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/0924d911/blackberry10/bin/templates/project/cordova/lib/session.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/session.js b/blackberry10/bin/templates/project/cordova/lib/session.js
index d96c57d..d4c75be 100644
--- a/blackberry10/bin/templates/project/cordova/lib/session.js
+++ b/blackberry10/bin/templates/project/cordova/lib/session.js
@@ -19,7 +19,7 @@ var path = require("path"),
wrench = require("wrench"),
utils = require("./utils"),
logger = require("./logger"),
- signingHelper = require("./signing-helper"),
+ signingUtils = require("./signing-utils"),
barConf = require("./bar-conf"),
localize = require("./localize"),
params;
@@ -103,9 +103,10 @@ module.exports = {
"archiveName": archiveName,
"barPath": outputDir + "/%s/" + archiveName + ".bar",
"debug": !!cmdline.debug,
- "keystore": signingHelper.getKeyStorePath(),
- "keystoreCsk": signingHelper.getCskPath(),
- "keystoreDb": signingHelper.getDbPath(),
+ "keystore": signingUtils.getKeyStorePath(),
+ "keystoreCsk": signingUtils.getCskPath(),
+ "keystoreDb": signingUtils.getDbPath(),
+ "keystoreBBID": signingUtils.getKeyStorePathBBID(),
"storepass": signingPassword,
"buildId": buildId,
"appdesc" : appdesc,
@@ -113,7 +114,7 @@ module.exports = {
return getParams(cmdline, toolName);
},
isSigningRequired: function (config) {
- return signingHelper.getKeyStorePath() && signingPassword;
+ return signingUtils.getKeyStorePath() && signingPassword;
},
"targets": ["simulator", "device"]
};
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/0924d911/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 307a740..ea8ad1a 100644
--- a/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
@@ -22,7 +22,6 @@ var path = require('path'),
conf = require("./conf"),
pkgrUtils = require("./packager-utils"),
logger = require("./logger"),
- signingUtils = require("./signing-utils.js"),
_self;
function execSigner(session, target, callback) {
@@ -54,19 +53,6 @@ function execSigner(session, target, callback) {
}
_self = {
- getKeyStorePath : function () {
- // Todo: decide where to put sigtool.p12 which is genereated and used in WebWorks SDK for Tablet OS
- return signingUtils.getKeyStorePath();
- },
-
- getCskPath : function () {
- return signingUtils.getCskPath();
- },
-
- getDbPath : function () {
- return signingUtils.getDbPath();
- },
-
execSigner: execSigner
};