eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixing JDK lookup for Windows (resolves #667)

Browse Source
This commit is contained in:
Ben Fry
2023-02-18 07:43:11 -05:00
parent 93fe201ee9
commit ecefb96a49
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src/processing/mode/java/JavaBuild.java
+7 -1
View File
@@ -951,6 +951,7 @@ public class JavaBuild {
XML config = new XML("launch4jConfig");
config.addChild("headerType").setContent("gui");
//config.addChild("headerType").setContent("console");
config.addChild("dontWrapJar").setContent("true");
config.addChild("downloadUrl").setContent(ExportPrompt.JAVA_DOWNLOAD_URL);
@@ -967,7 +968,12 @@ public class JavaBuild {
}
XML jre = config.addChild("jre");
if (embedJava) {
jre.addChild("path").setContent("java");
// also falling back to PATH if the "java" folder is later removed
jre.addChild("path").setContent("java;%PATH%");
} else {
// needed to make OpenJDK work properly
// https://github.com/processing/processing4/issues/667
jre.addChild("path").setContent("%PATH%");
}
jre.addChild("minVersion").setContent(MIN_JAVA_VERSION);
for (String opt : runOptions) {