From 5cba5388d10fa54971c61f0324d89d1dc614d52f Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 11 Jan 2017 11:51:24 -0500 Subject: [PATCH] LP#1646166 Hatch Linux supports openjdk Signed-off-by: Bill Erickson --- INSTALL.adoc | 19 ++++++++++++++++--- hatch.sh | 6 +++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/INSTALL.adoc b/INSTALL.adoc index b75d1ef..e63860f 100644 --- a/INSTALL.adoc +++ b/INSTALL.adoc @@ -15,7 +15,15 @@ accept the license, download the Windows installer. === Linux === -==== Download JDK 8 ==== +==== Install OpenJDK 8 and OpenJFX ==== + +[source,sh] +------------------------------------------------------------------------- +# Debian/Ubuntu version +$ sudo apt-get install openjdk-8-jdk openjfx +------------------------------------------------------------------------- + +==== Alternate: Install Oracle JDK 8 ==== 1. Go to http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html[oracle.com], @@ -29,8 +37,13 @@ $ tar -zxf jdk*tar.gz $ ln -s jdk1.8* jdk1.8 ------------------------------------------------------------------------- -NOTE: We may some day use openjdk, but its JavaFX libs are not ready -for prime time as of writing. +3. Update the JAVA_HOME environment variable in hatch.sh to point + to the local Java extract: + +[source,sh] +------------------------------------------------------------------------- +JAVA_HOME=jdk1.8 +------------------------------------------------------------------------- ==== Download org.json Java JSON Library ==== diff --git a/hatch.sh b/hatch.sh index 6f4777d..e90e8bd 100755 --- a/hatch.sh +++ b/hatch.sh @@ -2,7 +2,11 @@ # # Linux/Mac Hatch Execution Script -JAVA_HOME=jdk1.8 +# Use this for openjdk +JAVA_HOME=/usr +# Use this for local extract of Java libs +#JAVA_HOME=jdk1.8 + JAVA=$JAVA_HOME/bin/java JAVAC=$JAVA_HOME/bin/javac JAR=$JAVA_HOME/bin/jar -- 2.11.0