diff --git a/app/src/processing/mode/java/runner/Runner.java b/app/src/processing/mode/java/runner/Runner.java index 3a4d32dfe..76d182afb 100644 --- a/app/src/processing/mode/java/runner/Runner.java +++ b/app/src/processing/mode/java/runner/Runner.java @@ -160,22 +160,30 @@ public class Runner implements MessageConsumer { // OS X at this point, because we require 10.6.8 and higher. That also // means we don't need to check for any other OS versions, the user is // a douchebag and modifies Info.plist to get around the restriction. - if (System.getProperty("os.version").startsWith("10.6")) { - commandArgs = new String[] { - "/usr/libexec/java_home", - "--version", "1.6", - "--exec", "java", - "-d" + Base.getNativeBits(), - jdwpArg - }; - } else { // for 10.7, 10.8, etc - commandArgs = new String[] { - "/usr/libexec/java_home", - "--request", // install on-demand - "--version", "1.6", - "--exec", "java", - "-d" + Base.getNativeBits(), + if (true) { + if (System.getProperty("os.version").startsWith("10.6")) { + commandArgs = new String[] { + "/usr/libexec/java_home", + "--version", "1.6", + "--exec", "java", + "-d" + Base.getNativeBits(), + jdwpArg + }; + } else { // for 10.7, 10.8, etc + commandArgs = new String[] { + "/usr/libexec/java_home", + "--request", // install on-demand + "--version", "1.6", + "--exec", "java", + "-d" + Base.getNativeBits(), // debugArg, + jdwpArg + }; + } + } else { + // testing jdk-7u40 + commandArgs = new String[] { + "/Library/Java/JavaVirtualMachines/jdk1.7.0_40.jdk/Contents/Home/bin/java", jdwpArg }; } diff --git a/core/todo.txt b/core/todo.txt index c7c672762..f0307606c 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -18,6 +18,8 @@ _ retain blendMode() between frames (get bug #) andres X pixels[] array not updated with Capture and P2D/P3D X https://github.com/processing/processing/issues/1852 +_ Unable to get TAB key event with P2D/P3D renderer +_ https://github.com/processing/processing/issues/1967 table _ implement version of Table that takes a dictionary file diff --git a/todo.txt b/todo.txt index adeba6b1b..caaa6a41f 100644 --- a/todo.txt +++ b/todo.txt @@ -10,13 +10,26 @@ X https://github.com/processing/processing/issues/1959 X waiting on retina support for JDK 7 o b86 supposed to have some support (not available yet) o http://jdk8.java.net/download.html +X code with a NUL character causes an error +X https://github.com/processing/processing/issues/1973 _ check to see if manager items from the download can be updated _ oops, probably not, because they're part of the distribution _ and folks won't be able to write to those directories -_ code with a NUL character causes an error -_ https://github.com/processing/processing/issues/1973 +_ appbundler fixes/changes +_ icon location uses path, even when embedded +_ add indents to the Info.plist output file +_ inside writeInfoPlist from AppBundlerTask.java +_ use Contents/Resources/Java instead of Contents/Java? +_ this is in main.m. why the change? +_ any missing args from our app (copyrights/versions?) +_ make sure it's only running on 64-bit machines? +_ add MinimumSystemVersion? +_ the "Classes" folder is included +_ appears to be line 138 of main.m +_ maybe this is a holdover from OS X Java? +_ bring back the splash screen? high _ libraries need to support multiple categories