From ecefb96a49727a9db7bfe9bda059df68331140c6 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Sat, 18 Feb 2023 07:43:11 -0500 Subject: [PATCH] fixing JDK lookup for Windows (resolves #667) --- java/src/processing/mode/java/JavaBuild.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java index 69588da71..7fa675282 100644 --- a/java/src/processing/mode/java/JavaBuild.java +++ b/java/src/processing/mode/java/JavaBuild.java @@ -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) {