github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

We need a JDK, not a JVM

Browse Source 
For jarsigner, needed to sign an app for the Play Store
This commit is contained in:
Justin SB
2014-10-07 14:15:42 -07:00
parent b8df57c3a6
commit d83002cd64
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/commands-cordova.js
View File

@@ -1107,7 +1107,7 @@ var checkAgreePlatformTerms = function (platform, name) {
};
var checkPlatformRequirements = function (platform, options) {
options = _.extend({fix: false, log: false}, options);
options = _.extend({log: false, fix: false, fixConsole: false}, options);
if (platform == 'android') {
return Android.checkRequirements(options);
} else if (platform == 'ios') {
@@ -1893,6 +1893,16 @@ _.extend(Android.prototype, {
}
},
hasJdk: function () {
var self = this;
if (Host.isMac()) {
return files.statOrNull('/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK') != null;
} else {
return !!Host.which('jarsigner');
}
},
installJava: function () {
var self = this;
@@ -1944,6 +1954,12 @@ _.extend(Android.prototype, {
throw new Error("Cannot automatically install Java on host: " + Host.getName());
},
installJdk: function () {
var self = this;
throw new Error("Cannot automatically install JDK on host: " + Host.getName());
},
hasAndroidBundle: function () {
var self = this;
@@ -2038,13 +2054,13 @@ _.extend(Android.prototype, {
var result = { acceptable: true, missing: [] };
if (self.hasJava()) {
log && Console.info(Console.success("Java is installed"));
if (self.hasJdk()) {
log && Console.info(Console.success("A JDK is installed"));
} else {
log && Console.info(Console.fail("Java is not installed"));
log && Console.info(Console.fail("A JDK is not installed"));
if (fix) {
self.installJava();
self.installJdk();
} else {
result.missing.push("jdk");
result.acceptable = false;