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

update for JDK 7u45 on OS X, and prevent hard-coding of JDK version in Base

Browse Source
This commit is contained in:
Ben Fry
2013-10-19 16:24:03 -04:00
parent 901a4bf1c1
commit 1efba6b431
2 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/Base.java
+10 -1
View File
@@ -2405,7 +2405,16 @@ public class Base {
static public String getJavaPath() {
if (isMacOS()) {
//return "Contents/PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/bin/java";
return getContentFile("../PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/bin/java").getAbsolutePath();
File[] plugins = getContentFile("../PlugIns").listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.endsWith(".jdk") && dir.isDirectory();
}
});
//PApplet.printArray(plugins);
File javaBinary = new File(plugins[0], "Contents/Home/jre/bin/java");
//return getContentFile(plugins[0].getAbsolutePath() + "/Contents/Home/jre/bin/java").getAbsolutePath();
//return getContentFile("../PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/bin/java").getAbsolutePath();
return javaBinary.getAbsolutePath();
} else if (isLinux()) {
return getContentFile("java/bin/java").getAbsolutePath();