diff options
Diffstat (limited to 'make/scripts')
29 files changed, 137 insertions, 195 deletions
diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh index aebbaed..5032146 100644 --- a/make/scripts/adb-launch-main.sh +++ b/make/scripts/adb-launch-main.sh @@ -4,7 +4,7 @@ export HOST_UID=jogamp # jogamp02 - 10.1.0.122 export HOST_IP=10.1.0.122 #export HOST_IP=10.1.0.52 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp #export TARGET_IP=panda02 diff --git a/make/scripts/crosstest-java-android-armv6-rel.sh b/make/scripts/crosstest-java-android-armv6-rel.sh index b6d3f4b..e9055ff 100644 --- a/make/scripts/crosstest-java-android-armv6-rel.sh +++ b/make/scripts/crosstest-java-android-armv6-rel.sh @@ -2,7 +2,7 @@ export HOST_UID=jogamp export HOST_IP=10.1.0.122 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp export TARGET_IP=jautab03 diff --git a/make/scripts/crosstest-java-linux-armv6-rel.sh b/make/scripts/crosstest-java-linux-armv6-rel.sh index 92cd2d2..84649d2 100644 --- a/make/scripts/crosstest-java-linux-armv6-rel.sh +++ b/make/scripts/crosstest-java-linux-armv6-rel.sh @@ -1,6 +1,6 @@ export HOST_UID=sven export HOST_IP=jogamp02 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp export TARGET_IP=panda01 diff --git a/make/scripts/crosstest-java-linux-armv6hf-rel.sh b/make/scripts/crosstest-java-linux-armv6hf-rel.sh index 9c40ede..85a3765 100644 --- a/make/scripts/crosstest-java-linux-armv6hf-rel.sh +++ b/make/scripts/crosstest-java-linux-armv6hf-rel.sh @@ -1,6 +1,6 @@ export HOST_UID=sven export HOST_IP=jogamp02 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp export TARGET_IP=panda02 diff --git a/make/scripts/crosstest-junit-linux-armv7-rel.sh b/make/scripts/crosstest-junit-linux-armv7-rel.sh index 6b46b06..01b43fd 100644 --- a/make/scripts/crosstest-junit-linux-armv7-rel.sh +++ b/make/scripts/crosstest-junit-linux-armv7-rel.sh @@ -1,6 +1,6 @@ export HOST_UID=sven export HOST_IP=192.168.0.52 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp export TARGET_IP=beagle01 diff --git a/make/scripts/make.gluegen.all.android-aarch64-cross.sh b/make/scripts/make.gluegen.all.android-aarch64-cross.sh index 189fae3..32fea6d 100755 --- a/make/scripts/make.gluegen.all.android-aarch64-cross.sh +++ b/make/scripts/make.gluegen.all.android-aarch64-cross.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/setenv-build-jogamp-x86_64.sh fi if [ -e $SDIR/setenv-android-tools.sh ] ; then @@ -15,7 +15,7 @@ export NODE_LABEL=. export HOST_UID=jogamp # jogamp02 - 10.1.0.122 export HOST_IP=10.1.0.122 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp export TARGET_IP=panda02 @@ -26,12 +26,11 @@ export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects export TARGET_ANT_HOME=/usr/share/ant -export ANDROID_VERSION=21 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export ANDROID_VERSION=24 +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar -#export GCC_VERSION=4.4.3 export GCC_VERSION=4.9 HOST_ARCH=linux-x86_64 export TARGET_TRIPLE=aarch64-linux-android diff --git a/make/scripts/make.gluegen.all.android-armv6-cross.sh b/make/scripts/make.gluegen.all.android-armv6-cross.sh index 81bd8a1..89161c6 100755 --- a/make/scripts/make.gluegen.all.android-armv6-cross.sh +++ b/make/scripts/make.gluegen.all.android-armv6-cross.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/setenv-build-jogamp-x86_64.sh fi if [ -e $SDIR/setenv-android-tools.sh ] ; then @@ -15,7 +15,7 @@ export NODE_LABEL=. export HOST_UID=jogamp # jogamp02 - 10.1.0.122 export HOST_IP=10.1.0.122 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp export TARGET_IP=panda02 @@ -26,13 +26,12 @@ export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects export TARGET_ANT_HOME=/usr/share/ant -export ANDROID_VERSION=9 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export ANDROID_VERSION=24 +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar -#export GCC_VERSION=4.4.3 -export GCC_VERSION=4.8 +export GCC_VERSION=4.9 HOST_ARCH=linux-x86_64 export TARGET_TRIPLE=arm-linux-androideabi diff --git a/make/scripts/make.gluegen.all.android-x86-cross.sh b/make/scripts/make.gluegen.all.android-x86-cross.sh index 4c12c2f..d90bc2c 100755 --- a/make/scripts/make.gluegen.all.android-x86-cross.sh +++ b/make/scripts/make.gluegen.all.android-x86-cross.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/setenv-build-jogamp-x86_64.sh fi if [ -e $SDIR/setenv-android-tools.sh ] ; then @@ -15,7 +15,7 @@ export NODE_LABEL=. export HOST_UID=jogamp # jogamp02 - 10.1.0.122 export HOST_IP=10.1.0.122 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp export TARGET_IP=panda02 @@ -26,13 +26,12 @@ export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects export TARGET_ANT_HOME=/usr/share/ant -export ANDROID_VERSION=15 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export ANDROID_VERSION=24 +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar -#export GCC_VERSION=4.4.3 -export GCC_VERSION=4.8 +export GCC_VERSION=4.9 HOST_ARCH=linux-x86_64 export TARGET_TRIPLE=i686-linux-android export TOOLCHAIN_NAME=x86 diff --git a/make/scripts/make.gluegen.all.generic.sh b/make/scripts/make.gluegen.all.generic.sh index d212a8b..3094842 100755 --- a/make/scripts/make.gluegen.all.generic.sh +++ b/make/scripts/make.gluegen.all.generic.sh @@ -14,9 +14,9 @@ # -Dc.compiler.debug=true \ # -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=/opt-share/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.gluegen.all.ios.amd64.sh b/make/scripts/make.gluegen.all.ios.amd64.sh index 67831d3..dc652ff 100755 --- a/make/scripts/make.gluegen.all.ios.amd64.sh +++ b/make/scripts/make.gluegen.all.ios.amd64.sh @@ -16,15 +16,15 @@ fi export SDKROOT=iphonesimulator12.2 xcrun --show-sdk-path -JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH which java java -version -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=/opt-share/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.gluegen.all.ios.arm64.sh b/make/scripts/make.gluegen.all.ios.arm64.sh index 77cc1e9..8f45b35 100755 --- a/make/scripts/make.gluegen.all.ios.arm64.sh +++ b/make/scripts/make.gluegen.all.ios.arm64.sh @@ -16,15 +16,15 @@ fi export SDKROOT=iphoneos12.2 xcrun --show-sdk-path -JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH which java java -version -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=/opt-share/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.gluegen.all.linux-aarch64-cross.sh b/make/scripts/make.gluegen.all.linux-aarch64-cross.sh index 1b39bd3..1d1f8b5 100755 --- a/make/scripts/make.gluegen.all.linux-aarch64-cross.sh +++ b/make/scripts/make.gluegen.all.linux-aarch64-cross.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/setenv-build-jogamp-x86_64.sh fi # aarch64-linux-gnueabi == aarch64 triplet @@ -27,9 +27,9 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-aarch64.xml" #export JUNIT_DISABLED="true" export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" -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=/opt-share/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.gluegen.all.linux-aarch64.sh b/make/scripts/make.gluegen.all.linux-aarch64.sh index e537fde..6f1bae0 100755 --- a/make/scripts/make.gluegen.all.linux-aarch64.sh +++ b/make/scripts/make.gluegen.all.linux-aarch64.sh @@ -10,10 +10,14 @@ # aarch64-linux-gnue == aarch64 triplet export TARGET_PLATFORM_USRROOT= export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib/aarch64-linux-gnu -export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/usr/lib/jvm/java-8-openjdk-aarch64/jre/lib/aarch64 +export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/usr/lib/jvm/java-11-openjdk-aarch64/jre/lib/aarch64 export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-aarch64-ontarget.xml" +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" diff --git a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh index 6b26153..de69749 100755 --- a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/setenv-build-jogamp-x86_64.sh fi # arm-linux-gnueabihf == armhf triplet @@ -21,7 +21,7 @@ export NODE_LABEL=. export HOST_UID=jogamp export HOST_IP=jogamp02 -export HOST_RSYNC_ROOT=PROJECTS/JOGL +export HOST_RSYNC_ROOT=PROJECTS/JogAmp export TARGET_UID=jogamp export TARGET_IP=panda02 @@ -38,9 +38,9 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml" #export JUNIT_DISABLED="true" export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" -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=/opt-share/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.gluegen.all.linux-armv6hf.sh b/make/scripts/make.gluegen.all.linux-armv6hf.sh index 8f0cca5..200fe87 100755 --- a/make/scripts/make.gluegen.all.linux-armv6hf.sh +++ b/make/scripts/make.gluegen.all.linux-armv6hf.sh @@ -10,10 +10,14 @@ # arm-linux-gnueabihf == armhf triplet export TARGET_PLATFORM_USRROOT= export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib/arm-linux-gnueabihf -export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/usr/lib/jvm/java-8-openjdk-armhf/jre/lib/arm +export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/usr/lib/jvm/java-11-openjdk-armhf/jre/lib/arm export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf-ontarget.xml" +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" diff --git a/make/scripts/make.gluegen.all.linux-ppc64le.sh b/make/scripts/make.gluegen.all.linux-ppc64le.sh index b5243cb..f921eda 100644 --- a/make/scripts/make.gluegen.all.linux-ppc64le.sh +++ b/make/scripts/make.gluegen.all.linux-ppc64le.sh @@ -16,6 +16,10 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml" +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" diff --git a/make/scripts/make.gluegen.all.linux-x86-clang.sh b/make/scripts/make.gluegen.all.linux-x86-clang.sh index 2e56da1..46938b7 100755 --- a/make/scripts/make.gluegen.all.linux-x86-clang.sh +++ b/make/scripts/make.gluegen.all.linux-x86-clang.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86.sh ] ; then - . $SDIR/setenv-build-jogl-x86.sh +if [ -e $SDIR/setenv-build-jogamp-x86.sh ] ; then + . $SDIR/setenv-build-jogamp-x86.sh fi # -Dc.compiler.debug=true @@ -15,9 +15,9 @@ fi # -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml \ # -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=/opt-share/jre1.8.0_212/lib/rt.jar export GLUEGEN_PROPERTIES_FILE="lib/gluegen-clang.properties" # or -Dgcc.compat.compiler=clang diff --git a/make/scripts/make.gluegen.all.linux-x86.sh b/make/scripts/make.gluegen.all.linux-x86.sh index 6130e13..aa5ffd9 100755 --- a/make/scripts/make.gluegen.all.linux-x86.sh +++ b/make/scripts/make.gluegen.all.linux-x86.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86.sh ] ; then - . $SDIR/setenv-build-jogl-x86.sh +if [ -e $SDIR/setenv-build-jogamp-x86.sh ] ; then + . $SDIR/setenv-build-jogamp-x86.sh fi # -Dc.compiler.debug=true @@ -15,9 +15,9 @@ fi # -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml \ # -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=/opt-share/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.gluegen.all.linux-x86_64-clang.sh b/make/scripts/make.gluegen.all.linux-x86_64-clang.sh index 99aec47..487305e 100755 --- a/make/scripts/make.gluegen.all.linux-x86_64-clang.sh +++ b/make/scripts/make.gluegen.all.linux-x86_64-clang.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/setenv-build-jogamp-x86_64.sh fi # -Dc.compiler.debug=true @@ -20,9 +20,9 @@ fi # -Dc.compiler.debug=true \ # -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=/opt-share/jre1.8.0_212/lib/rt.jar export GLUEGEN_PROPERTIES_FILE="lib/gluegen-clang.properties" # or -Dgcc.compat.compiler=clang diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh index 225aa8d..4d3ca6d 100755 --- a/make/scripts/make.gluegen.all.linux-x86_64.sh +++ b/make/scripts/make.gluegen.all.linux-x86_64.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/setenv-build-jogamp-x86_64.sh fi # -Dc.compiler.debug=true diff --git a/make/scripts/make.gluegen.all.macosx-java6.sh b/make/scripts/make.gluegen.all.macosx-java6.sh deleted file mode 100755 index 55dd48a..0000000 --- a/make/scripts/make.gluegen.all.macosx-java6.sh +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh - -if [ -e /opt-share/etc/profile.ant ] ; then - . /opt-share/etc/profile.ant -fi - -# -Dc.compiler.debug=true -# -# -Dtarget.sourcelevel=1.6 \ -# -Dtarget.targetlevel=1.6 \ -# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ - -# Force OSX SDK 10.6, if desired -# export SDKROOT=macosx10.6 - -JAVA_HOME=`/usr/libexec/java_home -version 1.6` -PATH=$JAVA_HOME/bin:$PATH -export JAVA_HOME PATH - -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -ant \ - -Drootrel.build=build-macosx-java6 \ - $* 2>&1 | tee make.gluegen.all.macosx-java6.log diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh index 808afac..a3bf986 100755 --- a/make/scripts/make.gluegen.all.macosx.sh +++ b/make/scripts/make.gluegen.all.macosx.sh @@ -13,13 +13,13 @@ fi # Force OSX SDK 10.6, if desired # export SDKROOT=macosx10.6 -JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH -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=/opt-share/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.gluegen.all.solaris-x86.sh b/make/scripts/make.gluegen.all.solaris-x86.sh index d791a3c..86aa617 100755 --- a/make/scripts/make.gluegen.all.solaris-x86.sh +++ b/make/scripts/make.gluegen.all.solaris-x86.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86.sh ] ; then - . $SDIR/setenv-build-jogl-x86.sh +if [ -e $SDIR/setenv-build-jogamp-x86.sh ] ; then + . $SDIR/setenv-build-jogamp-x86.sh fi # -Dc.compiler.debug=true diff --git a/make/scripts/make.gluegen.all.solaris-x86_64.sh b/make/scripts/make.gluegen.all.solaris-x86_64.sh index dfd40dc..b74fae2 100755 --- a/make/scripts/make.gluegen.all.solaris-x86_64.sh +++ b/make/scripts/make.gluegen.all.solaris-x86_64.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/setenv-build-jogamp-x86_64.sh fi # -Dc.compiler.debug=true diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat index 69ba4c3..54a6bca 100755 --- a/make/scripts/make.gluegen.all.win32.bat +++ b/make/scripts/make.gluegen.all.win32.bat @@ -1,10 +1,15 @@ -set THISDIR="C:\JOGL"
+set THISDIR="C:\JogAmp"
-set J2RE_HOME=c:\jre8u202-b08_x32
-set JAVA_HOME=c:\jdk8u202-b08_x32
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x32
+set JAVA_HOME=c:\jdk-11.0.4+11_x32
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
+set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set CMAKE_C_COMPILER=c:\mingw\bin\gcc
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
set LIB_GEN=%THISDIR%\lib
set CLASSPATH=.;%THISDIR%\build-win32\classes
@@ -13,9 +18,9 @@ REM -DuseOpenMAX=true REM -DuseKD=true
REM -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat index 41ed3d8..1fea6c4 100755 --- a/make/scripts/make.gluegen.all.win64.bat +++ b/make/scripts/make.gluegen.all.win64.bat @@ -1,12 +1,15 @@ -set THISDIR="C:\JOGL"
+set THISDIR="C:\JogAmp"
-set J2RE_HOME=c:\jre8u202-b08_x64
-set JAVA_HOME=c:\jdk8u202-b08_x64
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x64
+set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set ANT_PATH=C:\apache-ant-1.10.5
set GIT_PATH=C:\cygwin\bin
set SEVENZIP=C:\Program Files\7-Zip
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
+set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
+
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
set LIB_GEN=%THISDIR%\lib
set CLASSPATH=.;%THISDIR%\build-win64\classes
@@ -15,9 +18,9 @@ REM -DuseOpenMAX=true REM -DuseKD=true
REM -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
diff --git a/make/scripts/setenv-android-tools.sh b/make/scripts/setenv-android-tools.sh index c178e4e..a6384fa 100644 --- a/make/scripts/setenv-android-tools.sh +++ b/make/scripts/setenv-android-tools.sh @@ -43,8 +43,12 @@ export NDK_ROOT if [ -z "$ANDROID_HOME" ] ; then if [ -e /usr/local/android-sdk-linux_x86 ] ; then ANDROID_HOME=/usr/local/android-sdk-linux_x86 + elif [ -e /opt-linux-x86_64/android-sdk-linux_x86_64 ] ; then + ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86 elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86 + elif [ -e /opt/android-sdk-linux_x86_64 ] ; then + ANDROID_HOME=/opt/android-sdk-linux_x86_64 elif [ -e /opt/android-sdk-linux_x86 ] ; then ANDROID_HOME=/opt/android-sdk-linux_x86 else diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogamp-x86.sh index 61ad2e3..5c7ba06 100644 --- a/make/scripts/setenv-build-jogl-x86.sh +++ b/make/scripts/setenv-build-jogamp-x86.sh @@ -28,39 +28,19 @@ if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then fi if [ -z "$FOUND_JAVA" ] ; then - if [ -e /usr/lib/jvm/java-8-openjdk-i386 -a -e /usr/lib/jvm/java-8-openjdk-i386/jre ] ; then - J2RE_HOME=/usr/lib/jvm/java-8-openjdk-i386/jre - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-i386 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH - export J2RE_HOME JAVA_HOME - FOUND_JAVA=1 - fi -fi - -if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-linux-x86/jre8 -a -e /opt-linux-x86/j2se8 ] ; then - J2RE_HOME=/opt-linux-x86/jre8 - JAVA_HOME=/opt-linux-x86/j2se8 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH - export J2RE_HOME JAVA_HOME - FOUND_JAVA=1 - fi -fi - -if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-linux-x86/jre7 -a -e /opt-linux-x86/j2se7 ] ; then - J2RE_HOME=/opt-linux-x86/jre7 - JAVA_HOME=/opt-linux-x86/j2se7 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + if [ -e /usr/lib/jvm/java-11-openjdk-i386 ] ; then + J2RE_HOME=/usr/lib/jvm/java-11-openjdk-i386 + JAVA_HOME=/usr/lib/jvm/java-11-openjdk-i386 + PATH=$JAVA_HOME/bin:$PATH export J2RE_HOME JAVA_HOME FOUND_JAVA=1 fi fi if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-linux-x86/jre6 -a -e /opt-linux-x86/j2se6 ] ; then - J2RE_HOME=/opt-linux-x86/jre6 - JAVA_HOME=/opt-linux-x86/j2se6 + if [ -e /opt-linux-x86/jre11 -a -e /opt-linux-x86/jdk11 ] ; then + J2RE_HOME=/opt-linux-x86/jre11 + JAVA_HOME=/opt-linux-x86/jdk11 PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH export J2RE_HOME JAVA_HOME FOUND_JAVA=1 @@ -79,19 +59,9 @@ if [ -z "$FOUND_JAVA" ] ; then fi fi if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-solaris-x86/jre7 -a -e /opt-solaris-x86/j2se7 ] ; then - J2RE_HOME=/opt-solaris-x86/jre7 - JAVA_HOME=/opt-solaris-x86/j2se7 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH - export J2RE_HOME JAVA_HOME - FOUND_JAVA=1 - fi -fi - -if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-solaris-x86/jre6 -a -e /opt-solaris-x86/j2se6 ] ; then - J2RE_HOME=/opt-solaris-x86/jre6 - JAVA_HOME=/opt-solaris-x86/j2se6 + if [ -e /opt-solaris-x86/jre11 -a -e /opt-solaris-x86/jdk11 ] ; then + J2RE_HOME=/opt-solaris-x86/jre11 + JAVA_HOME=/opt-solaris-x86/jdk11 PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH export J2RE_HOME JAVA_HOME FOUND_JAVA=1 diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogamp-x86_64.sh index 8578cba..e9bf313 100644 --- a/make/scripts/setenv-build-jogl-x86_64.sh +++ b/make/scripts/setenv-build-jogamp-x86_64.sh @@ -28,39 +28,19 @@ if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then fi if [ -z "$FOUND_JAVA" ] ; then - if [ -e /usr/lib/jvm/java-8-openjdk-amd64 -a -e /usr/lib/jvm/java-8-openjdk-amd64/jre ] ; then - J2RE_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH - export J2RE_HOME JAVA_HOME - FOUND_JAVA=1 - fi -fi - -if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-linux-x86_64/jre8 -a -e /opt-linux-x86_64/j2se8 ] ; then - J2RE_HOME=/opt-linux-x86_64/jre8 - JAVA_HOME=/opt-linux-x86_64/j2se8 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH - export J2RE_HOME JAVA_HOME - FOUND_JAVA=1 - fi -fi - -if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-linux-x86_64/jre7 -a -e /opt-linux-x86_64/j2se7 ] ; then - J2RE_HOME=/opt-linux-x86_64/jre7 - JAVA_HOME=/opt-linux-x86_64/j2se7 - PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + if [ -e /usr/lib/jvm/java-11-openjdk-amd64 ] ; then + J2RE_HOME=/usr/lib/jvm/java-11-openjdk-amd64 + JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 + PATH=$JAVA_HOME/bin:$PATH export J2RE_HOME JAVA_HOME FOUND_JAVA=1 fi fi if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then - J2RE_HOME=/opt-linux-x86_64/jre6 - JAVA_HOME=/opt-linux-x86_64/j2se6 + if [ -e /opt-linux-x86_64/jre11 -a -e /opt-linux-x86_64/jdk11 ] ; then + J2RE_HOME=/opt-linux-x86_64/jre11 + JAVA_HOME=/opt-linux-x86_64/jdk11 PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH export J2RE_HOME JAVA_HOME FOUND_JAVA=1 @@ -81,11 +61,11 @@ if [ -z "$FOUND_JAVA" ] ; then fi fi if [ -z "$FOUND_JAVA" ] ; then - if [ -e /opt-solaris-x86_64/jre7 -a -e /opt-solaris-x86_64/j2se7 ] ; then + if [ -e /opt-solaris-x86_64/jre11 -a -e /opt-solaris-x86_64/jdk11 ] ; then # make a symbolic link: /opt-solaris-x86_64/jre7/bin/amd64/bin$ ln -s . bin # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM - J2RE_HOME=/opt-solaris-x86_64/jre7/bin/amd64 - JAVA_HOME=/opt-solaris-x86_64/j2se7/bin/amd64 + J2RE_HOME=/opt-solaris-x86_64/jre11/bin/amd64 + JAVA_HOME=/opt-solaris-x86_64/jdk11/bin/amd64 PATH=$J2RE_HOME:$JAVA_HOME:$PATH export J2RE_HOME JAVA_HOME FOUND_JAVA=1 |