CB-5317 Move signing warn logic to build/run scripts

- Moved to warn function in signing-utils
- Removed duplicate copy of that module

blackberry10/.gitignore

@@ -19,6 +19,7 @@ dist/
 bin/node_modules
 bin/templates/project/lib
 bin/templates/project/cordova/lib/utils.js
+bin/templates/project/cordova/lib/signing-utils.js
 example/
 node_modules/
 .tmp

blackberry10/bin/check_reqs.js

@@ -34,17 +34,6 @@ if (!isNodeNewerThanMin()) {
     exit(ERROR_VALUE);
 }
 
-if (!signingUtils.getKeyStorePath()) {
-    console.log("WARNING: Cannot sign applications. Author.p12 file cannot be found at default location: " + signingUtils.getDefaultPath("author.p12"));
-}
-
-if (!signingUtils.getKeyStorePathBBID()) {
 
-    if (signingUtils.getCskPath() && signingUtils.getDbPath()) {
-        console.log('NOTE: BlackBerry ID tokens can now be used in place of your old signing keys. For more information on linking old signing keys with a BlackBerry ID token, please log in at http://developer.blackberry.com and click on Code Signing in the top menu bar.');
-    } else {
-        console.log('WARNING: Cannot sign applications. bbidtoken.csk file cannot be found at default location: ' + signingUtils.getDefaultPath("bbidtoken.csk"));
-    }
-}
 
 exit(0);

blackberry10/bin/lib/signing-utils.js

@@ -11,6 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 var fs = require('fs'),
     path = require('path'),
     os = require('os'),
@@ -58,7 +59,7 @@ _self = {
     getDefaultPath: getDefaultPath,
 
     getKeyStorePath : function () {
-        // Todo: decide where to put sigtool.p12 which is genereated and used in WebWorks SDK for Tablet OS
+        // Todo: decide where to put sigtool.p12 which is generated and used in WebWorks SDK for Tablet OS
         return getDefaultPathIfExists(AUTHOR_P12);
     },
 
@@ -72,6 +73,30 @@ _self = {
 
     getDbPath : function () {
         return getDefaultPathIfExists(DB);
+    },
+
+    warn: function () {
+        if (!this.getKeyStorePath()) {
+            console.error(
+                "WARNING: Cannot sign applications. Author.p12 file cannot be found at default location: " +
+                getDefaultPath("author.p12")
+            );
+        }
+
+        if (!this.getKeyStorePathBBID()) {
+
+            if (this.getCskPath() && this.getDbPath()) {
+                console.error(
+                    "WARNING: BlackBerry ID tokens can now be used in place of your old signing keys.\n" +
+                    "For more information log in at http://developer.blackberry.com and click on Code Signing"
+                );
+            } else {
+                console.error(
+                    "WARNING: Cannot sign applications. bbidtoken.csk file cannot be found at default location: " +
+                    getDefaultPath("bbidtoken.csk")
+                );
+            }
+        }
     }
 };
 

blackberry10/bin/templates/project/cordova/lib/build.js

@@ -21,6 +21,7 @@ var path = require("path"),
     command = require("commander"),
     os = require("os"),
     utils = require("./utils"),
+    signingUtils = require("./signing-utils"),
     bbProperties = utils.getProperties(),
     bbwpArgv = [
         process.argv[0],
@@ -63,6 +64,8 @@ try {
         exit(ERROR_VALUE);
     }
 
+    signingUtils.warn();
+
     utils.series(
         [
             function clean (done) {

blackberry10/bin/templates/project/cordova/lib/run.js

@@ -21,6 +21,7 @@ var path = require("path"),
     utils = require("./utils"),
     options = require('commander'),
     runUtils = require("./run-utils"),
+    signingUtils = require("./signing-utils");
     async = require("async");
 
 function install(deployTarget, done) {
@@ -68,6 +69,8 @@ process.argv.forEach(function (argument, index, args) {
 
 options.parse(process.argv);
 
+signingUtils.warn();
+
 utils.waterfall(
     [
         runUtils.getValidatedTarget.bind(this, options),