From 18cf75125b736bc5a206ae0b978b236e52da8336 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 31 Dec 2019 16:27:45 +0100 Subject: build scripts: use source/target level 1.8 on java11 --- make/scripts/make.jogl.all.macosx.sh | 14 +++++++------- make/scripts/make.jogl.all.x86.sh | 7 ++++--- make/scripts/make.jogl.all.x86_64.sh | 7 ++++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index ad048c3..7fb8728 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -1,11 +1,11 @@ #! /bin/sh -if [ -e /opt-share/etc/profile.ant ] ; then - . /opt-share/etc/profile.ant +if [ -e /usr/local/etc/profile.ant ] ; then + . /usr/local/etc/profile.ant fi -JAVA_HOME=`/usr/libexec/java_home -version 1.8` -#JAVA_HOME=`/usr/libexec/java_home -version 1.6` +JAVA_HOME=`/usr/libexec/java_home -version 11` +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH @@ -15,9 +15,9 @@ export JAVA_HOME PATH # -Djavacdebuglevel="source,lines,vars" \ # -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_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=/usr/local/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.jogl.all.x86.sh b/make/scripts/make.jogl.all.x86.sh index 4a4874f..3d9ef31 100755 --- a/make/scripts/make.jogl.all.x86.sh +++ b/make/scripts/make.jogl.all.x86.sh @@ -8,12 +8,13 @@ fi . $SDIR/../../../jogl/etc/profile.jogl JOGL_ALL $SDIR/../../../jogl/build-x86 +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar + # -Dc.compiler.debug=true ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Djogl.cg=1 \ -Duser.swt.jar=$SWT_CLASSPATH \ -Drootrel.build=build-x86 \ diff --git a/make/scripts/make.jogl.all.x86_64.sh b/make/scripts/make.jogl.all.x86_64.sh index b25ffb5..de4ba08 100755 --- a/make/scripts/make.jogl.all.x86_64.sh +++ b/make/scripts/make.jogl.all.x86_64.sh @@ -12,14 +12,15 @@ fi # -Djogl.cg=1 \ # -Djogl.redbook=true \ +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar + #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" # BUILD_ARCHIVE=true \ ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Djogl.cg=1 \ -Duser.swt.jar=$SWT_CLASSPATH \ -Drootrel.build=build-x86_64 \ -- cgit v1.2.3