From f486f88f5c86e3981b669275d7250856d8f03f11 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 31 Dec 2019 16:31:47 +0100 Subject: build scripts: use source/target level 1.8 on java11 --- scripts/make.jocl.all.linux-x86_64.sh | 14 ++++++++++++++ scripts/make.jogl.all.linux-x86_64.sh | 21 --------------------- scripts/run.sh | 2 +- 3 files changed, 15 insertions(+), 22 deletions(-) create mode 100644 scripts/make.jocl.all.linux-x86_64.sh delete mode 100644 scripts/make.jogl.all.linux-x86_64.sh diff --git a/scripts/make.jocl.all.linux-x86_64.sh b/scripts/make.jocl.all.linux-x86_64.sh new file mode 100644 index 0000000..11d2a64 --- /dev/null +++ b/scripts/make.jocl.all.linux-x86_64.sh @@ -0,0 +1,14 @@ +#! /bin/sh + +# $0 -Dmain.class=com.jogamp.opencl.demos.bitonicsort.BitonicSort run +# $0 -Dmain.class=com.jogamp.opencl.demos.julia3d.Julia3d run +# $0 -Dmain.class=com.jogamp.opencl.demos.joglinterop.GLCLInteroperabilityDemo run + +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar + +BUILD_ARCHIVE=true \ +ant \ + -Drootrel.build=build-x86_64 \ + $* 2>&1 | tee make.jogl.all.linux-x86_64.log diff --git a/scripts/make.jogl.all.linux-x86_64.sh b/scripts/make.jogl.all.linux-x86_64.sh deleted file mode 100644 index 2726dc6..0000000 --- a/scripts/make.jogl.all.linux-x86_64.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh - -# $0 -Dmain.class=com.jogamp.opencl.demos.bitonicsort.BitonicSort run -# $0 -Dmain.class=com.jogamp.opencl.demos.julia3d.Julia3d run -# $0 -Dmain.class=com.jogamp.opencl.demos.joglinterop.GLCLInteroperabilityDemo run - -if [ -e ../setenv-build-jogl-x86_64.sh ] ; then - . ../setenv-build-jogl-x86_64.sh -fi - -# -Dtarget.sourcelevel=1.6 \ -# -Dtarget.targetlevel=1.6 \ -# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ - -BUILD_ARCHIVE=true \ -ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ - -Drootrel.build=build-x86_64 \ - $* 2>&1 | tee make.jogl.all.linux-x86_64.log diff --git a/scripts/run.sh b/scripts/run.sh index 1daac5c..df905df 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -1,5 +1,5 @@ -CP=/usr/local/projects/JOGL/jocl/build-x86_64/jar/jocl.jar:/usr/local/projects/JOGL/jogl/build-x86_64/jar/jogl-all.jar:/usr/local/projects/JOGL/gluegen/build-x86_64/gluegen-rt.jar:/usr/local/projects/JOGL/jocl-demos/build-x86_64/classes +CP=/usr/local/projects/JogAmp/jocl/build-x86_64/jar/jocl.jar:/usr/local/projects/JogAmp/jogl/build-x86_64/jar/jogl-all.jar:/usr/local/projects/JogAmp/gluegen/build-x86_64/gluegen-rt.jar:/usr/local/projects/JogAmp/jocl-demos/build-x86_64/classes #TEST=com.jogamp.opencl.demos.bitonicsort.BitonicSort TEST=com.jogamp.opencl.demos.joglinterop.GLCLInteroperabilityDemo -- cgit v1.2.3