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

feat: CORDOVA_JAVA_HOME env variable (#1229)

Browse Source 
* feat: CORDOVA_JAVA_HOME env variable

* refactor: Improve CORDOVA_JAVA_HOME env test

* fix(test) path separator issue
This commit is contained in:
Norman Breau
2021-05-09 17:02:25 -03:00
committed by GitHub
parent a45804329b
commit ae4dba2bb8
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/cordova/lib/env/java.js
Vendored
+4 -2
View File
@@ -94,8 +94,10 @@ const java = {
}
const javacPath = utils.forgivingWhichSync('javac');
const hasJavaHome = !!environment.JAVA_HOME;
if (hasJavaHome) {
const javaHome = environment.CORDOVA_JAVA_HOME || environment.JAVA_HOME;
if (javaHome) {
// Ensure that CORDOVA_JAVA_HOME overrides
environment.JAVA_HOME = javaHome;
// Windows java installer doesn't add javac to PATH, nor set JAVA_HOME (ugh).
if (!javacPath) {
environment.PATH += path.delimiter + path.join(environment.JAVA_HOME, 'bin');