diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 170fe5276..74bda230e 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -2401,6 +2401,10 @@ public class Base { } +// static public File getJavaHome() { +// } + + /** Get the path to the embedded Java executable. */ static public String getJavaPath() { if (isMacOS()) { diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java index 30ba1d126..5d944f4d7 100644 --- a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java +++ b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java @@ -495,8 +495,9 @@ public class AppBundlerTask extends Task { DirectoryScanner directoryScanner = runtime.getDirectoryScanner(getProject()); String[] includedFiles = directoryScanner.getIncludedFiles(); - for (int i = 0; i < includedFiles.length; i++) { - String includedFile = includedFiles[i]; + for (String includedFile : includedFiles) { + //for (int i = 0; i < includedFiles.length; i++) { + //String includedFile = includedFiles[i]; File source = new File(runtimeHomeDirectory, includedFile); File destination = new File(pluginHomeDirectory, includedFile); copy(source, destination); diff --git a/core/todo.txt b/core/todo.txt index 6ba9c3fa0..cb7346925 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -45,6 +45,12 @@ X SUBTRACT and DIFFERENCE blend modes are swapped X https://github.com/processing/processing/issues/2075 X throw an error for textureMode(REPEAT) [fry] X https://github.com/processing/processing/issues/2052 +X Updated to JOGL 2.1.0 +X https://github.com/processing/processing/issues/2136 +X vertex codes not being properly set in P2D/P3D +X https://github.com/processing/processing/issues/2131 +X some box normals are inverted +X https://github.com/processing/processing/issues/2151 _ insertRow() bug _ https://github.com/processing/processing/issues/2137 diff --git a/todo.txt b/todo.txt index 89c2446d5..5557df2eb 100644 --- a/todo.txt +++ b/todo.txt @@ -150,6 +150,7 @@ _ https://github.com/processing/processing/wiki/Build-Instructions _ "unable to locate tools.jar" (Windows) can be ignored _ JAVA_HOME warnings from Ant can also be ignored _ updates for macosx instructions +_ JDK 7u45 is needed (or whatever version currently in the build) _ to build appbundler, you'll need Xcode _ and the command line tools Preferences > Downloads > Command Line Tools _ appbundler will have an NPE if the osx binary isn't built