mirror of
https://github.com/processing/processing4.git
synced 2026-01-29 11:21:06 +01:00
c14695476e
Moves to Java11 and OpenJDK via AdoptOpenJDK within the processing4 train using a squash of sampottinger processing fork's java11 branch. **Primary required changes:** Some changes directly support OpenJFX / OpenJDK 11: - Response to image loading changes caused by [JEP 320](https://openjdk.java.net/jeps/320) - Use of jmodules as necessitated by [JEP 261](https://openjdk.java.net/jeps/261) - Reponse to largely changed file paths caused by [JEP 220](https://openjdk.java.net/jeps/220). - Modifications in build system related to AdoptOpenJDK and Java 11 which have a different naming structure for downloads. - Allowing use of non-Oracle Java within internal Processing checks. **Secondary required changes:** There were some secondary required changes that impacted the usability of Processing after having moved to OpenJFX / OpenJDK 11: - Removal of com.apple.eawt calls related to [JEP 272](http://openjdk.java.net/jeps/272) - Response to HiDPI support on Windows and Linux in [JEP 263](https://openjdk.java.net/jeps/263) - Removal of `java.ext.dirs`. Would be forced by [JEP 220](http://openjdk.java.net/jeps/220). - Due to bugs on Windows, updated the JNA jars. - Changes in downloader build tasks to support AdoptOpenJDK and OpenJFX. - Updated org.eclipse.* / equinox jars. - Some optimization around size of distribution. - Update of AppBundler. - Some changes in formulation of classpath and modifications in PreprocessingService given [JEP 261](https://openjdk.java.net/jeps/261). **Incidental changes:** This was (ahem) a bit of a larger PR with the above modifications. So, I wanted to introduce automated tests when possible and convenient along with a few changes for platform sustainability in order to support development: - Addition of cross-building capability (!) made possible by AdoptOpenJDK. - Addition of mockito for testing. - Upgrade of junit. - Addition of ant-contrib. - Standardized nomenclature around JRE / JDK in `build/build.xml` - Deduplication of code in `jre/build.xml`. - Addition of JavaDoc in a few places. - Some refactoring of PImage / Shape to support increased testing and readability in image manipulation code.
120 lines
3.0 KiB
Bash
Executable File
120 lines
3.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# This script runs Processing, using the JRE in the Processing
|
|
# installation 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]
|
|
|
|
|
|
# JARs required from JDK (anywhere in/below the JDK home directory)
|
|
JDKLIBS="rt.jar"
|
|
|
|
# Set this to non-zero for logging
|
|
LOGGING=0
|
|
|
|
# Logs name and value of a variable to stdout if LOGGING is non-zero.
|
|
# Expects the variable name as parameter $1.
|
|
log() {
|
|
if [ $LOGGING -ne 0 ]; then
|
|
eval echo $1=\$$1
|
|
fi
|
|
}
|
|
|
|
|
|
# Locates JDKLIBS in a directory and its subdirectories and saves their
|
|
# absolute paths as list to JDKCP. Expects the directory as parameter $1.
|
|
# Sets SUCCESS to 1 if all libraries were found, to 0 otherwise.
|
|
make_jdkcp() {
|
|
# Back out of JRE directory if apparently located inside a JDK
|
|
if [ -f "$1/../bin/java" ]; then
|
|
DIR="$1/.."
|
|
else
|
|
DIR="$1"
|
|
fi
|
|
log DIR
|
|
|
|
JDKCP=
|
|
SUCCESS=1
|
|
|
|
# Locate JDKLIBS
|
|
for L in $JDKLIBS; do
|
|
# Locate only the first library with a matching name
|
|
LIB=`find "$DIR" -name $L 2>/dev/null | head -n 1`
|
|
log L
|
|
log LIB
|
|
|
|
# Library found?
|
|
if [ -n "$LIB" ]; then
|
|
JDKCP="$JDKCP"${JDKCP:+:}"$LIB"
|
|
else
|
|
SUCCESS=0
|
|
fi
|
|
done
|
|
|
|
log JDKCP
|
|
}
|
|
|
|
|
|
# Get absolute path of directory where this script is located
|
|
APPDIR=`readlink -f "$0"`
|
|
APPDIR=`dirname "$APPDIR"`
|
|
log APPDIR
|
|
|
|
# Try using a local JDK from the same directory as this script
|
|
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
|
|
|
|
# Add all required JARs to CLASSPATH
|
|
CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$JDKCP"
|
|
for LIB in "$APPDIR"/lib/*.jar; do
|
|
CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB"
|
|
done
|
|
for LIB in "$APPDIR"/core/library/*.jar; do
|
|
CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB"
|
|
done
|
|
for LIB in "$APPDIR"/modes/java/mode/*.jar; do
|
|
CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB"
|
|
done
|
|
export CLASSPATH
|
|
log CLASSPATH
|
|
|
|
# Make all JDK binaries available in PATH
|
|
export PATH="$JDKDIR/bin":"$PATH"
|
|
log PATH
|
|
|
|
current_name=`basename $0`
|
|
cmd_name='processing-java'
|
|
|
|
if [ $current_name = $cmd_name ]
|
|
then
|
|
java -Djna.nosys=true -Xmx256m processing.mode.java.Commander "$@"
|
|
exit $?
|
|
else
|
|
# Start Processing in the same directory as this script
|
|
if [ "$1" ]; then
|
|
SKETCH=`readlink -f "$1"`
|
|
else
|
|
SKETCH=
|
|
fi
|
|
cd "$APPDIR"
|
|
|
|
java -splash:lib/about-1x.png -Djna.nosys=true -Xmx256m processing.app.Base "$SKETCH" &
|
|
fi
|