aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-12-31 16:31:47 +0100
committerSven Gothel <[email protected]>2019-12-31 16:31:47 +0100
commitf486f88f5c86e3981b669275d7250856d8f03f11 (patch)
tree2ae59a5102f0783956f7d5802bc6adf059eee61d /scripts
parent056e8808a5ab3076c5a48c75b1ec7f811122caf9 (diff)
build scripts: use source/target level 1.8 on java11HEADv2.5.0v2.4.0master
Diffstat (limited to 'scripts')
-rw-r--r--scripts/make.jocl.all.linux-x86_64.sh (renamed from scripts/make.jogl.all.linux-x86_64.sh)13
-rw-r--r--scripts/run.sh2
2 files changed, 4 insertions, 11 deletions
diff --git a/scripts/make.jogl.all.linux-x86_64.sh b/scripts/make.jocl.all.linux-x86_64.sh
index 2726dc6..11d2a64 100644
--- a/scripts/make.jogl.all.linux-x86_64.sh
+++ b/scripts/make.jocl.all.linux-x86_64.sh
@@ -4,18 +4,11 @@
# $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 \
+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 \
- -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