fixing JDK lookup for Windows (resolves #667)

benfry · benfry · commit ecefb96a4972 · 2023-02-18T07:43:11.000-05:00
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
@@ -951,6 +951,7 @@ protected boolean exportApplication(File destFolder,
 
       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 @@ protected boolean exportApplication(File destFolder,
       }
       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) {
