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

don't use local JRE on Linux

Browse Source
This commit is contained in:
Ben Fry
2015-06-16 08:41:30 -04:00
parent 85bac36da6
commit 563ed559a7
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/linux/processing
+15 -17
View File
@@ -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"
core/todo.txt
+1
View File
@@ -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