From: Michael Zucchi Date: Sat, 26 Oct 2019 01:14:49 +0000 (+1030) Subject: Bump to JDK 13 X-Git-Url: https://code.zedzone.au/cvs?a=commitdiff_plain;h=08c0dea5a5426be2b4a5b7484337a0bb995dd1f3;p=zcl Bump to JDK 13 --- diff --git a/README b/README index dd052c9..a51ca98 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ INTRODUCTION ------------ -This is a direct Java binding for OpenCL 2.1 and Java 11. +This is a direct Java binding for OpenCL 2.1 and Java 13. I originally wrote it over a few days mostly just to pass the time and the goals were: @@ -66,7 +66,7 @@ COMPILING Standard GNU development tools and a Java JDK are required in order to compile zcl (ant is not used). perl and cproto are also required. -Java 11 is probably required. +Java 13 is the baseline used 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 diff --git a/config.make.in b/config.make.in index b9b97cf..f0186c5 100644 --- a/config.make.in +++ b/config.make.in @@ -1,13 +1,13 @@ TARGET ?= linux-amd64 -JAVA_HOME ?= /usr/local/jdk-11.0.2 +JAVA_HOME ?= /usr/local/jdk-13+33 # See also JAVACFLAGS --module-path NATIVEZ_HOME=../nativez/bin/$(TARGET) JAVAMODPATH = $(NATIVEZ_HOME)/lib -JAVACFLAGS += -source 11 +JAVACFLAGS += -source 13 JAVAC ?= javac JAR ?= jar diff --git a/nbproject/project.properties b/nbproject/project.properties index 09e9e7c..f1aaa57 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -48,8 +48,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=\