summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2020-01-04 21:30:49 +0100
committerSven Gothel <[email protected]>2020-01-04 21:30:49 +0100
commit2cb7f6af4813041bfff6c8a631e329ed5a63dba3 (patch)
treec765850afdcb1dfa2f2ad6d02549e35cdf7362e8
parentc9e85c8effac97d679891219cae6918ff561c368 (diff)
scripts: use gluegen's renamed setenv-build-jogl-* -> setenv-build-jogamp-*
-rwxr-xr-xmake/scripts/junit-linux-armv6hf-console.sh4
-rwxr-xr-xmake/scripts/junit-linux-x86_64-console.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.android-aarch64-cross.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.android-armv6-cross.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.android-x86-cross.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.linux-aarch64-cross.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.linux-armv6hf-cross.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86-clang.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86_64-clang.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.linux-x86_64.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.solaris-x86.sh4
-rwxr-xr-xmake/scripts/make.jogl.all.solaris-x86_64.sh4
-rwxr-xr-xmake/scripts/make.jogl.doc.all.x86_64.sh4
-rwxr-xr-xmake/scripts/make.jogl.doc.x86_64.sh4
-rwxr-xr-xmake/scripts/tests-solx32.sh4
-rwxr-xr-xmake/scripts/tests-solx64.sh4
-rwxr-xr-xmake/scripts/tests-x32.sh4
-rwxr-xr-xmake/scripts/tests-x64-custom.sh4
-rwxr-xr-xmake/scripts/tests-x64.sh4
20 files changed, 40 insertions, 40 deletions
diff --git a/make/scripts/junit-linux-armv6hf-console.sh b/make/scripts/junit-linux-armv6hf-console.sh
index e9379e9f9..2c825e527 100755
--- a/make/scripts/junit-linux-armv6hf-console.sh
+++ b/make/scripts/junit-linux-armv6hf-console.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
LOGF=junit.jogl.all.linux-armv6hf-console.log
diff --git a/make/scripts/junit-linux-x86_64-console.sh b/make/scripts/junit-linux-x86_64-console.sh
index 076c3a088..2ef6a50d5 100755
--- a/make/scripts/junit-linux-x86_64-console.sh
+++ b/make/scripts/junit-linux-x86_64-console.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
LOGF=junit.jogl.all.linux-x86_64-console.log
diff --git a/make/scripts/make.jogl.all.android-aarch64-cross.sh b/make/scripts/make.jogl.all.android-aarch64-cross.sh
index fab266cb9..826a4b4cc 100755
--- a/make/scripts/make.jogl.all.android-aarch64-cross.sh
+++ b/make/scripts/make.jogl.all.android-aarch64-cross.sh
@@ -2,8 +2,8 @@
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
LOGF=make.jogl.all.android-aarch64-cross.log
diff --git a/make/scripts/make.jogl.all.android-armv6-cross.sh b/make/scripts/make.jogl.all.android-armv6-cross.sh
index ffdf5ca5f..fcef20736 100755
--- a/make/scripts/make.jogl.all.android-armv6-cross.sh
+++ b/make/scripts/make.jogl.all.android-armv6-cross.sh
@@ -2,8 +2,8 @@
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
LOGF=make.jogl.all.android-armv6-cross.log
diff --git a/make/scripts/make.jogl.all.android-x86-cross.sh b/make/scripts/make.jogl.all.android-x86-cross.sh
index 9487459ca..f9584aa1a 100755
--- a/make/scripts/make.jogl.all.android-x86-cross.sh
+++ b/make/scripts/make.jogl.all.android-x86-cross.sh
@@ -2,8 +2,8 @@
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
LOGF=make.jogl.all.android-x86-cross.log
diff --git a/make/scripts/make.jogl.all.linux-aarch64-cross.sh b/make/scripts/make.jogl.all.linux-aarch64-cross.sh
index 1b808d679..370ed5081 100755
--- a/make/scripts/make.jogl.all.linux-aarch64-cross.sh
+++ b/make/scripts/make.jogl.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
diff --git a/make/scripts/make.jogl.all.linux-armv6hf-cross.sh b/make/scripts/make.jogl.all.linux-armv6hf-cross.sh
index 10cbf3f79..37ab16a3a 100755
--- a/make/scripts/make.jogl.all.linux-armv6hf-cross.sh
+++ b/make/scripts/make.jogl.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
# arm-linux-gnueabihf == armel triplet
diff --git a/make/scripts/make.jogl.all.linux-x86-clang.sh b/make/scripts/make.jogl.all.linux-x86-clang.sh
index aaf9029db..49c6af4c9 100755
--- a/make/scripts/make.jogl.all.linux-x86-clang.sh
+++ b/make/scripts/make.jogl.all.linux-x86-clang.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
if [ "$1" = "-libdir" ] ; then
diff --git a/make/scripts/make.jogl.all.linux-x86.sh b/make/scripts/make.jogl.all.linux-x86.sh
index 984accde6..d5950bfd8 100755
--- a/make/scripts/make.jogl.all.linux-x86.sh
+++ b/make/scripts/make.jogl.all.linux-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
if [ "$1" = "-libdir" ] ; then
diff --git a/make/scripts/make.jogl.all.linux-x86_64-clang.sh b/make/scripts/make.jogl.all.linux-x86_64-clang.sh
index cd23b7654..256220999 100755
--- a/make/scripts/make.jogl.all.linux-x86_64-clang.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64-clang.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
if [ "$1" = "-libdir" ] ; then
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index 82484ddb3..f4f9e97cc 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-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
if [ "$1" = "-libdir" ] ; then
diff --git a/make/scripts/make.jogl.all.solaris-x86.sh b/make/scripts/make.jogl.all.solaris-x86.sh
index a43205146..724d236b4 100755
--- a/make/scripts/make.jogl.all.solaris-x86.sh
+++ b/make/scripts/make.jogl.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
if [ "$1" = "-libdir" ] ; then
diff --git a/make/scripts/make.jogl.all.solaris-x86_64.sh b/make/scripts/make.jogl.all.solaris-x86_64.sh
index 42f155460..fe209f3f2 100755
--- a/make/scripts/make.jogl.all.solaris-x86_64.sh
+++ b/make/scripts/make.jogl.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
if [ "$1" = "-libdir" ] ; then
diff --git a/make/scripts/make.jogl.doc.all.x86_64.sh b/make/scripts/make.jogl.doc.all.x86_64.sh
index d75f5b0e4..71b9ace7a 100755
--- a/make/scripts/make.jogl.doc.all.x86_64.sh
+++ b/make/scripts/make.jogl.doc.all.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
ant -v \
diff --git a/make/scripts/make.jogl.doc.x86_64.sh b/make/scripts/make.jogl.doc.x86_64.sh
index 028a5d995..d6751b6a1 100755
--- a/make/scripts/make.jogl.doc.x86_64.sh
+++ b/make/scripts/make.jogl.doc.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
ant -v \
diff --git a/make/scripts/tests-solx32.sh b/make/scripts/tests-solx32.sh
index b95a612c3..9d16cd0bb 100755
--- a/make/scripts/tests-solx32.sh
+++ b/make/scripts/tests-solx32.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
. $SDIR/tests.sh `which java` -DummyArg ../build-solaris-x86 $*
diff --git a/make/scripts/tests-solx64.sh b/make/scripts/tests-solx64.sh
index 9f20e6a47..d4d2eb7b9 100755
--- a/make/scripts/tests-solx64.sh
+++ b/make/scripts/tests-solx64.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
. $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 84d49257e..312dac698 100755
--- a/make/scripts/tests-x32.sh
+++ b/make/scripts/tests-x32.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 SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86/swt.jar
diff --git a/make/scripts/tests-x64-custom.sh b/make/scripts/tests-x64-custom.sh
index cc5c31efb..1784b2acf 100755
--- a/make/scripts/tests-x64-custom.sh
+++ b/make/scripts/tests-x64-custom.sh
@@ -4,8 +4,8 @@ SDIR=`dirname $0`
#export LD_LIBRARY_PATH=$HOME/libav/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` -DummyArg ../build-x86_64 $*
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index 19dd95221..ec2fd69b2 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -25,8 +25,8 @@ SDIR=`dirname $0`
#JAVA_HOME=/opt-linux-x86_64/j2se7
#export J2RE_HOME JAVA_HOME
-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 SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86_64/swt.jar