diff --git a/build/linux/processing b/build/linux/processing index 3a6aabf78..3d5d59a41 100755 --- a/build/linux/processing +++ b/build/linux/processing @@ -1,17 +1,14 @@ #!/bin/sh -# This script runs Processing, using the JDK in the Processing -# installation directory if possible. +# This script runs Processing, using the JRE in the Processing +# installation directory. -# If no JDK was installed with Processing then the script tries to use -# the preferred Java version of the machine, i.e. what is executed -# by the "java" console command. This must be a Sun JDK (for details, see -# http://processing.org/reference/environment/platforms.html#java). - -# In order to run Processing with an already installed JDK that is *not* -# the preferred Java version of the machine, create a symlink named "java" -# in the Processing installation directory that points to the JDK home -# directory. +# If your system needs a different version of Java than what's included +# in the download, replace the 'java' folder with the contents of a new +# Oracle JRE (Java 8 only), or create a symlink named "java" in the +# Processing installation directory that points to the JRE home directory. +# This must be a Sun/Oracle JDK. For more details, see here: +# https://github.com/processing/processing/wiki/Supported-Platforms # Thanks to Ferdinand Kasper for this build script. [fry] @@ -75,13 +72,14 @@ JDKDIR=`readlink -f "$APPDIR/java"` make_jdkcp "$JDKDIR" log SUCCESS +# Don't use the installed JDK, because it's not supported. # Local JDK found? -if [ $SUCCESS -ne 1 ]; then - # No, try using the preferred system JRE/JDK (if any) - JDKDIR=`which java` && JDKDIR=`readlink -e "$JDKDIR"` && JDKDIR=`dirname "$JDKDIR"`/.. - make_jdkcp "$JDKDIR" - log SUCCESS -fi +#if [ $SUCCESS -ne 1 ]; then +# # No, try using the preferred system JRE/JDK (if any) +# JDKDIR=`which java` && JDKDIR=`readlink -e "$JDKDIR"` && JDKDIR=`dirname "$JDKDIR"`/.. +# make_jdkcp "$JDKDIR" +# log SUCCESS +#fi # Add all required JARs to CLASSPATH CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$JDKCP" diff --git a/core/todo.txt b/core/todo.txt index 6afc9cd57..e7392abe6 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -5,6 +5,7 @@ X https://github.com/processing/processing/issues/3347 X show warning when display spanning is turned off with fullScreen(SPAN) X defaults read com.apple.spaces spans-displays X https://github.com/processing/processing/issues/3381 +X add javaPlatform variable (i.e. 7 or 8) _ note that full screen and present are now different _ on Export to Application, this has an impact