github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-7536 Tweak error messages for missing JDK / SDK / AVDs

Browse Source
This commit is contained in:
Andrew Grieve
2014-09-12 14:19:13 -04:00
parent 2f7ffa3636
commit 525ce0e0ad
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/lib/check_reqs.js
+15 -7
View File
@@ -126,13 +126,15 @@ module.exports.check_java = function() {
}
}).then(function() {
var msg =
'Failed to run "java -version", make sure your java environment is set up\n' +
'including JDK and JRE.\n' +
'Your JAVA_HOME variable is: ' + process.env['JAVA_HOME'];
'Failed to run "java -version", make sure that you have a JDK installed.\n' +
'You can get it from: http://www.oracle.com/technetwork/java/javase/downloads.\n';
if (process.env['JAVA_HOME']) {
msg += 'Your JAVA_HOME is invalid: ' + process.env['JAVA_HOME'] + '\n';
}
return tryCommand('java -version', msg)
}).then(function() {
msg = 'Failed to run "javac -version", make sure you have a Java JDK (not just a JRE) installed.';
return tryCommand('javac -version', msg)
.then(function() {
return tryCommand('javac -version', msg);
});
});
}
@@ -192,6 +194,10 @@ module.exports.check_android = function() {
});
};
module.exports.getAbsoluteAndroidCmd = function() {
return forgivingWhichSync('android').replace(/([ \\])/g, '\\$1');
};
module.exports.check_android_target = function(valid_target) {
// valid_target can look like:
// android-19
@@ -202,8 +208,10 @@ module.exports.check_android_target = function(valid_target) {
return tryCommand('android list targets --compact', msg)
.then(function(output) {
if (output.split('\n').indexOf(valid_target) == -1) {
var androidCmd = module.exports.getAbsoluteAndroidCmd();
throw new Error('Please install Android target: "' + valid_target + '".\n' +
'Hint: Open the SDK manager by running: ' + forgivingWhichSync('android'));
'Hint: Open the SDK manager by running: ' + androidCmd + '\n' +
'Or install directly via: ' + androidCmd + ' update sdk --no-ui --all --filter "' + valid_target + '"');
}
});
};