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 2014/04/07 20:19:10 UTC
[1/2] webworks commit: CB-6409 Allow detection of devices which have
not yet set password
Repository: cordova-blackberry
Updated Branches:
refs/heads/master fd2b1d4f8 -> 5a3f7695c
CB-6409 Allow detection of devices which have not yet set password
- remove requirement for 'devicepass' arg in run
- update validation check to accept 'null' as valid response for device
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/2939422a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/2939422a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/2939422a
Branch: refs/heads/master
Commit: 2939422a7adcd37e7d82eb5bed966ed1eadf47a6
Parents: fd2b1d4
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Mon Apr 7 10:13:13 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Mon Apr 7 10:13:13 2014 -0400
----------------------------------------------------------------------
.../bin/templates/project/cordova/lib/run-utils.js | 2 --
.../bin/templates/project/cordova/lib/target-utils.js | 13 ++++++-------
2 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2939422a/blackberry10/bin/templates/project/cordova/lib/run-utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/run-utils.js b/blackberry10/bin/templates/project/cordova/lib/run-utils.js
index 93c60f3..618b663 100644
--- a/blackberry10/bin/templates/project/cordova/lib/run-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/run-utils.js
@@ -53,8 +53,6 @@ function getTargetName(options, done) {
if (!options.devicepass && options.devicepass !== "") {
if (options.query) {
utils.prompt({description: getPasswordPrompt(targetType), hidden: true}, done);
- } else if (!options.emulator) {
- done("Please provide device password using --devicepass");
} else {
done("");
}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2939422a/blackberry10/bin/templates/project/cordova/lib/target-utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/target-utils.js b/blackberry10/bin/templates/project/cordova/lib/target-utils.js
index 752847b..ee1e2ac 100755
--- a/blackberry10/bin/templates/project/cordova/lib/target-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/target-utils.js
@@ -254,16 +254,15 @@ _self = {
};
bb10_utils.exec(script, args, options, function (error, stdout, stderr) {
- // error code 3 corresponds to a connected device, null or "Error: null" in stderr corresponds to connected emulator
- var isSimConnected = (type === "emulator" && (
+ // error code 3 corresponds to connected device with password
+ // null or "Error: null" in stderr corresponds to connected simulator or device without password
+ var connected =
error === null ||
+ (error && error.code === 3) ||
stderr.length === 0 ||
stderr.indexOf('Error: null') >= 0 ||
- stderr.indexOf('Error: Authentication failed') >= 0
- )),
- isDeviceConnected = (type === "device" && error && error.code === 3);
-
- callback(isSimConnected || isDeviceConnected, ip);
+ stderr.indexOf('Error: Authentication failed') >= 0;
+ callback(connected, ip);
});
},
[2/2] webworks commit: CB-6410 Allow deployment when debug token
cannot be generated
Posted by bh...@apache.org.
CB-6410 Allow deployment when debug token cannot be generated
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/5a3f7695
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/5a3f7695
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/5a3f7695
Branch: refs/heads/master
Commit: 5a3f7695ccf80e5ceac1346a5dd84f722797db0f
Parents: 2939422
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Mon Apr 7 11:07:58 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Mon Apr 7 11:07:58 2014 -0400
----------------------------------------------------------------------
blackberry10/bin/templates/project/cordova/lib/localize.js | 2 +-
blackberry10/bin/templates/project/cordova/lib/run-utils.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/5a3f7695/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 29f46e4..571304d 100755
--- a/blackberry10/bin/templates/project/cordova/lib/localize.js
+++ b/blackberry10/bin/templates/project/cordova/lib/localize.js
@@ -188,7 +188,7 @@ var Localize = require("localize"),
"en": "No device PIN found, will omit debug token generation"
},
"WARN_NO_SIGNING_PASSWORD_PROVIDED": {
- "en": "No signing password provided, debug token cannot be generated. Please enter a value for 'keystorepass' in $[1]/.cordova/blackberry10.json or use --keystorepass via command-line directly from the project cordova scripts."
+ "en": "No signing password provided, debug token cannot be generated. Please enter a value for 'keystorepass' in $[1]/.cordova/blackberry10.json or use --keystorepass via command-line."
},
"PROGRESS_GENERATING_DEBUG_TOKEN": {
"en": "Generating debug token"
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/5a3f7695/blackberry10/bin/templates/project/cordova/lib/run-utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/run-utils.js b/blackberry10/bin/templates/project/cordova/lib/run-utils.js
index 618b663..1dcfa92 100644
--- a/blackberry10/bin/templates/project/cordova/lib/run-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/run-utils.js
@@ -148,7 +148,7 @@ function handleDebugToken(options, deployTarget, allDone) {
if (!options.keystorepass && options.query) {
utils.prompt({description: "Please enter your keystore password: ", hidden: true}, function (err, result) {
options.keystorepass = result;
- done(err, result);
+ done(null, result);
});
} else {
done(null, options.keystorepass);
@@ -169,7 +169,7 @@ function handleDebugToken(options, deployTarget, allDone) {
allDone(code, deployTarget);
});
} else {
- allDone(err);
+ allDone(null, deployTarget);
}
}
);