You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/09/12 22:18:23 UTC
[1/2] android commit: CB-7536 Tweak Android SDK not installed error
message.
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x 30e8b818f -> 18fda7ec6
CB-7536 Tweak Android SDK not installed error message.
We no longer require you to edit your PATH
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f2e8c00f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f2e8c00f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f2e8c00f
Branch: refs/heads/4.0.x
Commit: f2e8c00f49187d669043f56247b2ab623395e5c8
Parents: 525ce0e
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Sep 12 16:17:42 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 12 16:17:42 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f2e8c00f/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 4fa8b1d..358c73f 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -204,7 +204,7 @@ module.exports.check_android_target = function(valid_target) {
// android-L
// Google Inc.:Google APIs:20
// Google Inc.:Glass Development Kit Preview:20
- var msg = 'Failed to run "android". Make sure you have the latest Android SDK installed, and that the "android" command (inside the tools/ folder) is added to your PATH.';
+ var msg = 'Android SDK not found. Make sure that it is installed. If it is not at the default location, set the ANDROID_HOME environment variable.';
return tryCommand('android list targets --compact', msg)
.then(function(output) {
if (output.split('\n').indexOf(valid_target) == -1) {
[2/2] android commit: Merge branch 'master' into 4.0.x (more error
message)
Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (more error message)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/18fda7ec
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/18fda7ec
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/18fda7ec
Branch: refs/heads/4.0.x
Commit: 18fda7ec680ccee06b8cf65966f38ca8aac114eb
Parents: 30e8b81 f2e8c00
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Sep 12 16:18:12 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 12 16:18:12 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------