From: Michael Zucchi <notzed@gmail.com>
Date: Sat, 26 Oct 2019 01:14:26 +0000 (+1030)
Subject: Bump to JDK 13
X-Git-Url: https://code.zedzone.au/cvs?a=commitdiff_plain;h=adbedfb1476db84baab8e5a7c0bcd1b20f95877a;p=jjmpeg

Bump to JDK 13
---

diff --git a/README b/README
index 1e313ff..95d6c6f 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ Compile
 
 jdk (javac, jar) and native compiler tools (GNU make, cc, cpp, perl)
 must be in path.  In addition the program cproto must be installed.
-JDK 11 is required (JDK 9+ may work?).
+JDK 13 is the baseline but JDK 9+ may work.
 
 The prequisitve project notzed.nativez must also have previously been
 compiled and will be automatically used if it is present in the
@@ -174,6 +174,9 @@ This version is compatible with at least version 4.0 of FFmpeg.
 No deprecated functions or fields have been made accessible from Java
 or are used in the native code.
 
+To support contrib/octave the main source-code (sans the module-info
+files) is limited to Java 8.
+
 Links
 -----
 
diff --git a/config.make.in b/config.make.in
index 2c4201a..b0c9b24 100644
--- a/config.make.in
+++ b/config.make.in
@@ -1,15 +1,15 @@
 
 TARGET ?= linux-amd64
 
-JAVA_HOME ?= /usr/local/jdk-11.0.2
-JAVAFX_HOME ?= /usr/local/javafx-sdk-11.0.2
+JAVA_HOME ?= /usr/local/jdk-13+33
+JAVAFX_HOME ?= /usr/local/javafx-sdk-13
 FFMPEG_HOME ?= /opt/ffmpeg/4.0
 
 # See also JAVACFLAGS --module-path
 NATIVEZ_HOME=../nativez/bin/$(TARGET)
 
 JAVAMODPATH = $(JAVAFX_HOME)/lib $(NATIVEZ_HOME)/lib
-JAVACFLAGS += -source 11
+JAVACFLAGS += -source 13
 
 JAVAC ?= javac
 JAR ?= jar
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 7b849cf..d7de40b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -36,9 +36,9 @@ dist.jlink.dir=${dist.dir}/jlink
 dist.jlink.output=${dist.jlink.dir}/notzed.jjmpeg
 endorsed.classpath=
 excludes=
-file.reference.javafx.base.jar=/data/linux-amd64/javafx-sdk-11.0.2/lib/javafx.base.jar
-file.reference.javafx.controls.jar=/data/linux-amd64/javafx-sdk-11.0.2/lib/javafx.controls.jar
-file.reference.javafx.graphics.jar=/data/linux-amd64/javafx-sdk-11.0.2/lib/javafx.graphics.jar
+file.reference.javafx.base.jar=/data/linux-amd64/javafx-sdk-13/lib/javafx.base.jar
+file.reference.javafx.controls.jar=/data/linux-amd64/javafx-sdk-13/lib/javafx.controls.jar
+file.reference.javafx.graphics.jar=/data/linux-amd64/javafx-sdk-13/lib/javafx.graphics.jar
 includes=**
 jar.compress=false
 javac.classpath=
@@ -54,8 +54,8 @@ javac.modulepath=\
 javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
-javac.source=11
-javac.target=11
+javac.source=13
+javac.target=13
 javac.test.classpath=\
     ${javac.classpath}
 javac.test.modulepath=\