29 files changed, 321 insertions, 252 deletions
diff --git a/make/scripts/adb-install-all-x86.sh b/make/scripts/adb-install-all-x86.sh
new file mode 100755
index 00000000..bdb48e5e
--- /dev/null
+++ b/make/scripts/adb-install-all-x86.sh
@@ -0,0 +1,4 @@
+#adb $* install ../../gluegen/build-android-x86/jogamp-android-launcher.apk
+#adb $* install ../../gluegen/build-android-x86/gluegen-rt-android-x86.apk
+adb $* install ../build-android-x86/jar/jocl-android-x86.apk
+adb $* install ../build-android-x86/jar/jocl-test-android.apk
diff --git a/make/scripts/adb-reinstall-all-x86.sh b/make/scripts/adb-reinstall-all-x86.sh
new file mode 100755
index 00000000..7db988d5
--- /dev/null
+++ b/make/scripts/adb-reinstall-all-x86.sh
@@ -0,0 +1,5 @@
+sdir=`dirname $0`
+
+$sdir/adb-uninstall-all.sh $*
+$sdir/adb-install-all-x86.sh $*
+
diff --git a/make/scripts/make.jocl.all-host-linux.sh b/make/scripts/make.jocl.all-host-linux.sh
new file mode 100755
index 00000000..4e95117c
--- /dev/null
+++ b/make/scripts/make.jocl.all-host-linux.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+$SDIR/make.jocl.all.android-aarch64-cross.sh && \
+$SDIR/make.jocl.all.android-armv6-cross.sh && \
+$SDIR/make.jocl.all.android-x86-cross.sh && \
+$SDIR/make.jocl.all.linux-aarch64-cross.sh && \
+$SDIR/make.jocl.all.linux-armv6hf-cross.sh && \
+$SDIR/make.jocl.all.linux-x86.sh && \
+$SDIR/make.jocl.all.linux-x86_64.sh
+
+# $SDIR/make.jocl.all.macosx.sh
+# $SDIR/make.jocl.all.ios.amd64.sh
+# $SDIR/make.jocl.all.ios.arm64.sh
+# $SDIR/make.jocl.all.win32.bat
+# $SDIR/make.jocl.all.win64.bat
+# $SDIR/make.jocl.all.linux-armv6hf.sh
+# $SDIR/make.jocl.all.linux-aarch64.sh
+
diff --git a/make/scripts/make.jocl.all-host-macos.sh b/make/scripts/make.jocl.all-host-macos.sh
new file mode 100755
index 00000000..11f2d3c9
--- /dev/null
+++ b/make/scripts/make.jocl.all-host-macos.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+$SDIR/make.jocl.all.macosx.sh && \
+$SDIR/make.jocl.all.ios.amd64.sh && \
+$SDIR/make.jocl.all.ios.arm64.sh
+
+# $SDIR/make.jocl.all.macosx.sh
+# $SDIR/make.jocl.all.ios.amd64.sh
+# $SDIR/make.jocl.all.ios.arm64.sh
+# $SDIR/make.jocl.all.win32.bat
+# $SDIR/make.jocl.all.win64.bat
+# $SDIR/make.jocl.all.linux-ppc64le.sh
+# $SDIR/make.jocl.all.linux-armv6hf.sh
+# $SDIR/make.jocl.all.linux-aarch64.sh
diff --git a/make/scripts/make.jocl.all.android-aarch64-cross.sh b/make/scripts/make.jocl.all.android-aarch64-cross.sh
index 792c066b..9598e46d 100755
--- a/make/scripts/make.jocl.all.android-aarch64-cross.sh
+++ b/make/scripts/make.jocl.all.android-aarch64-cross.sh
@@ -1,63 +1,45 @@
 #! /bin/sh
 
-SDIR=`dirname $0`
+SDIR=$(readlink -f `dirname $0`)
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-android-tools.sh
-fi
-
-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 TARGET_UID=jogamp
-export TARGET_IP=panda02
-#export TARGET_IP=jautab03
-#export TARGET_IP=jauphone04
-export TARGET_ADB_PORT=5555
-# needs executable bit (probably su)
-export TARGET_ROOT=/data/projects
-export TARGET_ANT_HOME=/usr/share/ant
+LOGF=make.jocl.all.android-aarch64-cross.log
+rm -f ${LOGF}
 
-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_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64
+export ANDROID_API_LEVEL=24
+export ANDROID_HOST_TAG=linux-x86_64
+export ANDROID_ABI=arm64-v8a
 
-#export GCC_VERSION=4.4.3
-export GCC_VERSION=4.9
-HOST_ARCH=linux-x86_64
-export TARGET_TRIPLE=aarch64-linux-android
-
-export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
-export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm64
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh >> $LOGF 2>&1
+else
+    echo "${SDIR}/../../../setenv-android-tools.sh doesn't exist!" 2>&1 | tee -a ${LOGF}
+    exit 1
+fi
 
-# Need to add toolchain bins to the PATH. 
-# May need to create symbolic links within $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin
-#   cd $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin
-#   ln -s ../../bin/aarch64-linux-android-gcc gcc
-export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
+export GLUEGEN_CPPTASKS_FILE=${SDIR}/../../../gluegen/make/lib/gluegen-cpptasks-android-aarch64.xml
+export PATH_VANILLA=$PATH
+export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH}
+echo PATH ${PATH} 2>&1 | tee -a ${LOGF}
+echo clang `which clang` 2>&1 | tee -a ${LOGF}
 
-export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-aarch64.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 JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
-echo PATH $PATH 2>&1 | tee make.jocl.all.android-aarch64-cross.log
-echo gcc `which gcc` 2>&1 | tee -a make.jocl.all.android-aarch64-cross.log
-
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 
 # BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-aarch64 \
-    $* 2>&1 | tee -a make.jocl.all.android-aarch64-cross.log
+    -Dgcc.compat.compiler=clang \
+    $* 2>&1 | tee -a ${LOGF}
 
diff --git a/make/scripts/make.jocl.all.android-armv6-cross.sh b/make/scripts/make.jocl.all.android-armv6-cross.sh
index dcca619f..59a46dc0 100755
--- a/make/scripts/make.jocl.all.android-armv6-cross.sh
+++ b/make/scripts/make.jocl.all.android-armv6-cross.sh
@@ -1,47 +1,35 @@
 #! /bin/sh
 
-SDIR=`dirname $0`
+SDIR=$(readlink -f `dirname $0`)
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-android-tools.sh
-fi
-
-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
+LOGF=make.jocl.all.android-armv6-cross.log
+rm -f ${LOGF}
 
-export TARGET_UID=jogamp
-export TARGET_IP=panda02
-#export TARGET_IP=jautab03
-#export TARGET_IP=jauphone04
-export TARGET_ADB_PORT=5555
-# needs executable bit (probably su)
-export TARGET_ROOT=/data/projects
-export TARGET_ANT_HOME=/usr/share/ant
+export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64
+export ANDROID_API_LEVEL=24
+export ANDROID_HOST_TAG=linux-x86_64
+export ANDROID_ABI=armeabi-v7a
 
-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 GCC_VERSION=4.8
-HOST_ARCH=linux-x86_64
-export TARGET_TRIPLE=arm-linux-androideabi
-
-export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
-export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh >> $LOGF 2>&1
+else
+    echo "${SDIR}/../../../setenv-android-tools.sh doesn't exist!" 2>&1 | tee -a ${LOGF}
+    exit 1
+fi
 
-# Need to add toolchain bins to the PATH. 
-export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
+export GLUEGEN_CPPTASKS_FILE=${SDIR}/../../../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml
+export PATH_VANILLA=$PATH
+export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH}
+echo PATH ${PATH} 2>&1 | tee -a ${LOGF}
+echo clang `which clang` 2>&1 | tee -a ${LOGF}
 
-export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv6.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 JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
@@ -52,5 +40,6 @@ export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 # BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-armv6 \
-    $* 2>&1 | tee -a make.jocl.all.android-armv6-cross.log
+    -Dgcc.compat.compiler=clang \
+    $* 2>&1 | tee -a ${LOGF}
 
diff --git a/make/scripts/make.jocl.all.android-x86-cross.sh b/make/scripts/make.jocl.all.android-x86-cross.sh
new file mode 100755
index 00000000..5bc59e89
--- /dev/null
+++ b/make/scripts/make.jocl.all.android-x86-cross.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+
+SDIR=$(readlink -f `dirname $0`)
+
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
+fi
+
+LOGF=make.jocl.all.android-x86-cross.log
+rm -f ${LOGF}
+
+export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64
+export ANDROID_API_LEVEL=24
+export ANDROID_HOST_TAG=linux-x86_64
+export ANDROID_ABI=x86
+
+if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then
+    . ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh >> $LOGF 2>&1
+else
+    echo "${SDIR}/../../../setenv-android-tools.sh doesn't exist!" 2>&1 | tee -a ${LOGF}
+    exit 1
+fi
+
+export GLUEGEN_CPPTASKS_FILE=${SDIR}/../../../gluegen/make/lib/gluegen-cpptasks-android-x86.xml
+export PATH_VANILLA=$PATH
+export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH}
+echo PATH ${PATH} 2>&1 | tee -a ${LOGF}
+echo clang `which clang` 2>&1 | tee -a ${LOGF}
+
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
+
+#export JUNIT_DISABLED="true"
+#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+# BUILD_ARCHIVE=true \
+ant \
+    -Drootrel.build=build-android-x86 \
+    -Dgcc.compat.compiler=clang \
+    $* 2>&1 | tee -a ${LOGF}
+
diff --git a/make/scripts/make.jocl.all.ios.amd64.sh b/make/scripts/make.jocl.all.ios.amd64.sh
new file mode 100755
index 00000000..d8c964f9
--- /dev/null
+++ b/make/scripts/make.jocl.all.ios.amd64.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+
+if [ -e /usr/local/etc/profile.ant ] ; then
+    . /usr/local/etc/profile.ant
+fi
+
+#    -Dc.compiler.debug=true 
+
+# Force OSX SDK 10.6, if desired
+# export SDKROOT=macosx10.6
+
+export SDKROOT=iphonesimulator13.2
+xcrun --show-sdk-path
+
+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.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/usr/local/jre1.8.0_212/lib/rt.jar
+
+export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-ios-amd64.xml
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+ant \
+    -Drootrel.build=build-ios-amd64 \
+    $* 2>&1 | tee make.jocl.all.ios-amd64.log
diff --git a/make/scripts/make.jocl.all.ios.arm64.sh b/make/scripts/make.jocl.all.ios.arm64.sh
new file mode 100755
index 00000000..ed4a6887
--- /dev/null
+++ b/make/scripts/make.jocl.all.ios.arm64.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+
+if [ -e /usr/local/etc/profile.ant ] ; then
+    . /usr/local/etc/profile.ant
+fi
+
+#    -Dc.compiler.debug=true 
+
+# Force OSX SDK 10.6, if desired
+# export SDKROOT=macosx10.6
+
+export SDKROOT=iphoneos13.2
+xcrun --show-sdk-path
+
+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.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/usr/local/jre1.8.0_212/lib/rt.jar
+
+export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-ios-aarch64.xml
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+ant \
+    -Drootrel.build=build-ios-arm64 \
+    $* 2>&1 | tee make.jocl.all.ios-arm64.log
diff --git a/make/scripts/make.jocl.all.linux-aarch64-cross.sh b/make/scripts/make.jocl.all.linux-aarch64-cross.sh
index a3551634..42542425 100755
--- a/make/scripts/make.jocl.all.linux-aarch64-cross.sh
+++ b/make/scripts/make.jocl.all.linux-aarch64-cross.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 # aarch64-linux-gnueabi == aarch64 triplet
@@ -17,18 +17,19 @@ export PATH
 #    -DisLinuxARM64=true \
 #    -DisX11=true \
 
-export TARGET_PLATFORM_ROOT=/opt-linux-arm64
-export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib
-export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/aarch64
+export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot`
+export TARGET_PLATFORM_USRROOT=/opt-linux-arm64
+export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib
+export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/aarch64
 
 export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/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.jocl.all.linux-armv6-cross.sh b/make/scripts/make.jocl.all.linux-armv6-cross.sh
deleted file mode 100755
index d13d51b0..00000000
--- a/make/scripts/make.jocl.all.linux-armv6-cross.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-SDIR=`dirname $0`
-
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
-fi
-
-PATH=`pwd`/../../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH
-export PATH
-
-#    -Dc.compiler.debug=true 
-#    -Dgluegen.cpptasks.detected.os=true \
-#    -DisUnix=true \
-#    -DisLinux=true \
-#    -DisLinuxARMv7=true \
-#    -DisX11=false \
-
-export NODE_LABEL=.
-
-export HOST_UID=jogamp
-export HOST_IP=jogamp02
-export HOST_RSYNC_ROOT=PROJECTS/JOGL
-
-export TARGET_UID=jogamp
-export TARGET_IP=panda02
-#export TARGET_IP=jautab02
-export TARGET_ROOT=/home/jogamp/projects-cross
-export TARGET_ANT_HOME=/usr/share/ant
-
-export TARGET_PLATFORM_LIBS=/opt-linux-armv6-eabi/lib
-export TARGET_JAVA_LIBS=/opt-linux-armv6-eabi/jre/lib/arm
-
-export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6.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 JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
-export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
-
-ant \
-    -Drootrel.build=build-linux-armv6 \
-    $* 2>&1 | tee make.jocl.all.linux-armv6-cross.log
-
-
-
-
diff --git a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
index fe375c12..c3cd339e 100755
--- a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
+++ b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0`
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 PATH=`pwd`/../../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH
@@ -28,17 +28,19 @@ export TARGET_IP=panda02
 export TARGET_ROOT=/home/jogamp/projects-cross
 export TARGET_ANT_HOME=/usr/share/ant
 
-export TARGET_PLATFORM_LIBS=/opt-linux-armv6-armhf/lib
-export TARGET_JAVA_LIBS=/opt-linux-armv6-armhf/jre/lib/arm
+export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot`
+export TARGET_PLATFORM_USRROOT=/opt-linux-armv6-armhf
+export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib
+export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/arm
 
 export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/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.jocl.all.linux-x86-clang.sh b/make/scripts/make.jocl.all.linux-x86-clang.sh
index be694d1a..65de5b1d 100755
--- a/make/scripts/make.jocl.all.linux-x86-clang.sh
+++ b/make/scripts/make.jocl.all.linux-x86-clang.sh
@@ -2,13 +2,16 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+LOGF=make.jocl.all.linux-x86-clang.log
+rm -f $LOGF
+
+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="../../gluegen/make/lib/gluegen-clang.properties"
 # or -Dgcc.compat.compiler=clang
@@ -18,4 +21,4 @@ export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 
 ant  \
     -Drootrel.build=build-x86-clang \
-    $* 2>&1 | tee make.jocl.all.linux-x86-clang.log
+    $* 2>&1 | tee -a $LOGF
diff --git a/make/scripts/make.jocl.all.linux-x86.sh b/make/scripts/make.jocl.all.linux-x86.sh
index 010a6041..33d7bea9 100755
--- a/make/scripts/make.jocl.all.linux-x86.sh
+++ b/make/scripts/make.jocl.all.linux-x86.sh
@@ -2,17 +2,24 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
-export SOURCE_LEVEL=1.6
-export TARGET_LEVEL=1.6
-export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+LOGF=make.jocl.all.linux-x86.log
+rm -f $LOGF
+
+#    -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.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"
 
 ant  \
     -Drootrel.build=build-x86 \
-    $* 2>&1 | tee make.jocl.all.linux-x86.log
+    -Dos.arch=x86 \
+    $* 2>&1 | tee -a $LOGF
diff --git a/make/scripts/make.jocl.all.linux-x86_64-clang.sh b/make/scripts/make.jocl.all.linux-x86_64-clang.sh
index a30eb3c2..71decaff 100755
--- a/make/scripts/make.jocl.all.linux-x86_64-clang.sh
+++ b/make/scripts/make.jocl.all.linux-x86_64-clang.sh
@@ -2,15 +2,18 @@
 
 SDIR=`dirname $0`
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
+LOGF=make.jocl.all.linux-x86_64-clang.log
+rm -f $LOGF
+
 #    -Dbuild.archiveon=true \
 
-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="../../gluegen/make/lib/gluegen-clang.properties"
 # or -Dgcc.compat.compiler=clang
@@ -21,4 +24,4 @@ export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 BUILD_ARCHIVE=true \
 ant  \
     -Drootrel.build=build-x86_64-clang \
-    $* 2>&1 | tee make.jocl.all.linux-x86_64-clang.log
+    $* 2>&1 | tee -a $LOGF
diff --git a/make/scripts/make.jocl.all.linux-x86_64.sh b/make/scripts/make.jocl.all.linux-x86_64.sh
index 460af803..06c9e8e7 100755
--- a/make/scripts/make.jocl.all.linux-x86_64.sh
+++ b/make/scripts/make.jocl.all.linux-x86_64.sh
@@ -2,20 +2,24 @@
 
 SDIR=`dirname $0`
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
+LOGF=make.jocl.all.linux-x86_64.log
+rm -f $LOGF
+
 #    -Dbuild.archiveon=true \
 
-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"
 
-BUILD_ARCHIVE=true \
+# BUILD_ARCHIVE=true \
 ant  \
     -Drootrel.build=build-x86_64 \
-    $* 2>&1 | tee make.jocl.all.linux-x86_64.log
+    $* 2>&1 | tee -a $LOGF
+
diff --git a/make/scripts/make.jocl.all.macosx-java6.sh b/make/scripts/make.jocl.all.macosx-java6.sh
deleted file mode 100755
index 2d678ac3..00000000
--- a/make/scripts/make.jocl.all.macosx-java6.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-SDIR=`dirname $0` 
-
-if [ -e /opt-share/etc/profile.ant ] ; then
-    . /opt-share/etc/profile.ant
-fi
-
-#JAVA_HOME=`/usr/libexec/java_home -version 1.8`
-JAVA_HOME=`/usr/libexec/java_home -version 1.6`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-#    -Dc.compiler.debug=true 
-
-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.jocl.all.macosx-java6.log
diff --git a/make/scripts/make.jocl.all.macosx.sh b/make/scripts/make.jocl.all.macosx.sh
index 88e6bfe2..5077b794 100755
--- a/make/scripts/make.jocl.all.macosx.sh
+++ b/make/scripts/make.jocl.all.macosx.sh
@@ -2,20 +2,20 @@
 
 SDIR=`dirname $0` 
 
-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
 
 #    -Dc.compiler.debug=true 
 
-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.jocl.all.sh b/make/scripts/make.jocl.all.sh
deleted file mode 100755
index a137cea5..00000000
--- a/make/scripts/make.jocl.all.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-SDIR=`dirname $0` 
-
-$SDIR/make.jocl.all.linux-armv6-cross.sh \
-&& $SDIR/make.jocl.all.linux-armv6hf-cross.sh \
-&& $SDIR/make.jocl.all.linux-x86_64.sh \
-&& $SDIR/make.jocl.all.linux-x86.sh \
-&& $SDIR/make.jocl.all.android-armv6-cross.sh \
diff --git a/make/scripts/make.jocl.all.solaris-x86.sh b/make/scripts/make.jocl.all.solaris-x86.sh
index 6e643cb2..0220f47f 100755
--- a/make/scripts/make.jocl.all.solaris-x86.sh
+++ b/make/scripts/make.jocl.all.solaris-x86.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
 export SOURCE_LEVEL=1.6
diff --git a/make/scripts/make.jocl.all.solaris-x86_64.sh b/make/scripts/make.jocl.all.solaris-x86_64.sh
index abca7e2a..cfaa5aeb 100755
--- a/make/scripts/make.jocl.all.solaris-x86_64.sh
+++ b/make/scripts/make.jocl.all.solaris-x86_64.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
 export SOURCE_LEVEL=1.6
diff --git a/make/scripts/make.jocl.all.win32.bat b/make/scripts/make.jocl.all.win32.bat
index e6106fbc..4ab9e919 100755
--- a/make/scripts/make.jocl.all.win32.bat
+++ b/make/scripts/make.jocl.all.win32.bat
@@ -1,17 +1,22 @@
-set THISDIR="C:\JOGL"
+set THISDIR="C:\JogAmp"
 
-set J2RE_HOME=c:\jre1.8.0_66_x32
-set JAVA_HOME=c:\jdk1.8.0_66_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:\cygwin64\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-3.25.1-windows-x86_64
+set CMAKE_C_COMPILER=c:\mingw32\bin\gcc
 
-set LIB_GEN=%THISDIR%\lib
-set CLASSPATH=.;%THISDIR%\build-win32\classes
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
 
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+REM set LIB_GEN=%THISDIR%\lib
+REM set CLASSPATH=.;%THISDIR%\build-win32\classes
+
+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.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat
index b1928677..e7a594c9 100755
--- a/make/scripts/make.jocl.all.win64.bat
+++ b/make/scripts/make.jocl.all.win64.bat
@@ -1,17 +1,22 @@
-set THISDIR="C:\JOGL"
+REM set THISDIR="C:\JOGL"
 
-set J2RE_HOME=c:\jre1.8.0_66_x64
-set JAVA_HOME=c:\jdk1.8.0_66_x64
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jdk-17
+set JAVA_HOME=c:\jdk-17
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin64\bin
+set SEVENZIP=C:\Program Files\7-Zip
 
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
+set CMAKE_PATH=C:\cmake-3.25.1-windows-x86_64
+set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
 
-set LIB_GEN=%THISDIR%\lib
-set CLASSPATH=.;%THISDIR%\build-win64\classes
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
 
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+REM set LIB_GEN=%THISDIR%\lib
+REM set CLASSPATH=.;%THISDIR%\build-win64\classes
+
+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/tests-osx-x32.sh b/make/scripts/tests-osx-x32.sh
index e7f4f01e..090f0ad2 100755
--- a/make/scripts/tests-osx-x32.sh
+++ b/make/scripts/tests-osx-x32.sh
@@ -2,6 +2,6 @@
 
 spath=`dirname $0`
 
-. $spath/tests.sh /usr/bin/java -d32 ../build-macosx $*
+. $spath/tests.sh /usr/bin/java -DummyArg ../build-macosx $*
 
 
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh
index 5d9cd6f6..54528460 100755
--- a/make/scripts/tests-osx-x64.sh
+++ b/make/scripts/tests-osx-x64.sh
@@ -2,7 +2,7 @@
 
 export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH
 
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+JAVA_HOME=`/usr/libexec/java_home -version 11`
 #JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25`
 #JAVA_HOME=`/usr/libexec/java_home -version 1.6.0`
 PATH=$JAVA_HOME/bin:$PATH
@@ -10,5 +10,5 @@ export JAVA_HOME PATH
 
 spath=`dirname $0`
 
-. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx $*
+. $spath/tests.sh  $JAVA_HOME/bin/java -DummyArg ../build-macosx $*
 
diff --git a/make/scripts/tests-solx32.sh b/make/scripts/tests-solx32.sh
index 996dcc60..9d16cd0b 100755
--- a/make/scripts/tests-solx32.sh
+++ b/make/scripts/tests-solx32.sh
@@ -2,9 +2,9 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
-. $SDIR/tests.sh  `which java` -d32 ../build-solaris-x86 $*
+. $SDIR/tests.sh  `which java` -DummyArg ../build-solaris-x86 $*
 
diff --git a/make/scripts/tests-solx64.sh b/make/scripts/tests-solx64.sh
index 3500f1b1..d4d2eb7b 100755
--- a/make/scripts/tests-solx64.sh
+++ b/make/scripts/tests-solx64.sh
@@ -2,9 +2,9 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
-. $SDIR/tests.sh  `which java` -d64 ../build-solaris-x86_64 $*
+. $SDIR/tests.sh  `which java` -DummyArg ../build-solaris-x86_64 $*
 
diff --git a/make/scripts/tests-x32.sh b/make/scripts/tests-x32.sh
index 858ed5fd..32c7f0e1 100755
--- a/make/scripts/tests-x32.sh
+++ b/make/scripts/tests-x32.sh
@@ -2,12 +2,12 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh
 fi
 
 export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86/swt-debug.jar
 
-. $SDIR/tests.sh  `which java` -d32 ../build-x86 $*
+. $SDIR/tests.sh  `which java` -DummyArg ../build-x86 $*
 
 
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index fe2fc495..527cc3a6 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -6,14 +6,14 @@ SDIR=`dirname $0`
 #export LD_LIBRARY_PATH=/home/sven/ffmpeg-0.10/lib:$LD_LIBRARY_PATH
 
 #export LD_LIBRARY_PATH=/home/sven/libav-9.x/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/home/sven/ffmpeg-1.2/lib:$LD_LIBRARY_PATH
+#export LD_LIBRARY_PATH=/home/sven/ffmpeg-1.2/lib:$LD_LIBRARY_PATH
 
 #export LD_LIBRARY_PATH=/home/sven/libav-10.x/lib:$LD_LIBRARY_PATH
 #export LD_LIBRARY_PATH=/home/sven/ffmpeg-2.x/lib:$LD_LIBRARY_PATH
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh
 fi
 
-. $SDIR/tests.sh  `which java` -d64 ../build-x86_64 $*
+. $SDIR/tests.sh  `which java` -DummyArg ../build-x86_64 $*