You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by js...@apache.org on 2014/06/09 20:44:49 UTC
[1/2] webworks commit: CB-6757 Provide useful hint when simulator
does not seem to know its IP
Repository: cordova-blackberry
Updated Branches:
refs/heads/master e31ab3fa5 -> 552882553
CB-6757 Provide useful hint when simulator does not seem to know its IP
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/f69c7110
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/f69c7110
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/f69c7110
Branch: refs/heads/master
Commit: f69c7110dfd83059ccdbad06372216bf2aa41224
Parents: e31ab3f
Author: Josh Soref <js...@blackberry.com>
Authored: Fri May 16 17:39:46 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Mon Jun 9 14:37:55 2014 -0400
----------------------------------------------------------------------
blackberry10/framework/lib/framework.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/f69c7110/blackberry10/framework/lib/framework.js
----------------------------------------------------------------------
diff --git a/blackberry10/framework/lib/framework.js b/blackberry10/framework/lib/framework.js
index a32b06d..85732dd 100644
--- a/blackberry10/framework/lib/framework.js
+++ b/blackberry10/framework/lib/framework.js
@@ -68,7 +68,7 @@ function showWebInspectorInfo() {
if (connectedInterface) {
messageObj.htmlmessage = "\n ip4: " + connectedInterface.ipv4Address + ":" + port + "<br/> ip6: " + connectedInterface.ipv6Address + ":" + port;
} else {
- messageObj.message = "";
+ messageObj.message = "Connect to the simulator's IP on port: " + port;
}
messageObj.dialogType = 'JavaScriptAlert';
overlayWebView.showDialog(messageObj);
[2/2] webworks commit: CB-6850 use path.join() for
blackberry10debugtoken.bar warning
Posted by js...@apache.org.
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 <js...@blackberry.com>
Authored: Mon Jun 2 17:53:51 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
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;
}