CB-6850 use path.join() for blackberry10debugtoken.bar warning
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/55288255 Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/55288255 Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/55288255 Branch: refs/heads/master Commit: 5528825536ebf6226e66734ff0be22da9319b288 Parents: f69c711 Author: Josh Soref <[email protected]> Authored: Mon Jun 2 17:53:51 2014 -0400 Committer: Josh Soref <[email protected]> Committed: Mon Jun 9 14:42:57 2014 -0400 ---------------------------------------------------------------------- blackberry10/bin/templates/project/cordova/lib/localize.js | 2 +- blackberry10/bin/templates/project/cordova/lib/native-packager.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/55288255/blackberry10/bin/templates/project/cordova/lib/localize.js ---------------------------------------------------------------------- diff --git a/blackberry10/bin/templates/project/cordova/lib/localize.js b/blackberry10/bin/templates/project/cordova/lib/localize.js index 571304d..a6fe900 100755 --- a/blackberry10/bin/templates/project/cordova/lib/localize.js +++ b/blackberry10/bin/templates/project/cordova/lib/localize.js @@ -35,7 +35,7 @@ var Localize = require("localize"), "en": "Build ID set in config.xml [version], but no signing password was provided [-g]. Bar will be unsigned" }, "EXCEPTION_DEBUG_TOKEN_NOT_FOUND": { - "en": "Failed to find debug token. If you have an existing debug token, please copy it to $[1]/.cordova/blackberry10debugtoken.bar. To generate a new debug token, execute the 'run' command." + "en": "Failed to find debug token. If you have an existing debug token, please copy it to $[1]. To generate a new debug token, execute the 'run' command." }, "EXCEPTION_DEBUG_TOKEN_WRONG_FILE_EXTENSION": { "en": "Specified debug token not a .bar extension" http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/55288255/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 0ffc0b4..9f53779 100644 --- a/blackberry10/bin/templates/project/cordova/lib/native-packager.js +++ b/blackberry10/bin/templates/project/cordova/lib/native-packager.js @@ -218,7 +218,7 @@ function generateOptionsFile(session, target, config) { optionsStr += "-debugToken" + NL; optionsStr += conf.DEBUG_TOKEN + NL; } else { - logger.warn(localize.translate("EXCEPTION_DEBUG_TOKEN_NOT_FOUND", pkgrUtils.homedir())); + logger.warn(localize.translate("EXCEPTION_DEBUG_TOKEN_NOT_FOUND", path.join(pkgrUtils.homedir(), '.cordova', 'blackberry10debugtoken.bar'))); } optionsStr += "-devMode" + NL; }
