GeezerVison is showing github.com — fixing JDK lookup for Windows (resolves #667) · D-I-R-M/processing4@ecefb96
File tree
Expand file treeCollapse file tree
Open diff view settings
java/src/processing/mode/java
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: java/src/processing/mode/java/JavaBuild.java +7-1Lines changed: 7 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -951,6 +951,7 @@ protected boolean exportApplication(File destFolder, |
951 | 951 |
|
952 | 952 | XML config = new XML("launch4jConfig"); |
953 | 953 | config.addChild("headerType").setContent("gui"); |
| 954 | + //config.addChild("headerType").setContent("console"); |
954 | 955 | config.addChild("dontWrapJar").setContent("true"); |
955 | 956 | config.addChild("downloadUrl").setContent(ExportPrompt.JAVA_DOWNLOAD_URL); |
956 | 957 |
|
@@ -967,7 +968,12 @@ protected boolean exportApplication(File destFolder, |
967 | 968 | } |
968 | 969 | XML jre = config.addChild("jre"); |
969 | 970 | if (embedJava) { |
970 | | - jre.addChild("path").setContent("java"); |
| 971 | + // also falling back to PATH if the "java" folder is later removed |
| 972 | + jre.addChild("path").setContent("java;%PATH%"); |
| 973 | + } else { |
| 974 | + // needed to make OpenJDK work properly |
| 975 | + // https://github.com/processing/processing4/issues/667 |
| 976 | + jre.addChild("path").setContent("%PATH%"); |
971 | 977 | } |
972 | 978 | jre.addChild("minVersion").setContent(MIN_JAVA_VERSION); |
973 | 979 | for (String opt : runOptions) { |
|