summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmake/scripts/make.jocl.all.linux-armv6-cross.sh10
-rwxr-xr-xmake/scripts/make.jocl.all.linux-armv6hf-cross.sh10
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.linux-x86-clang.sh6
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.linux-x86.sh4
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.linux-x86_64-clang.sh8
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.linux-x86_64.sh6
-rwxr-xr-xmake/scripts/make.jocl.all.macosx-clang.sh2
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.macosx.sh0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.solaris-x86.sh4
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.solaris-x86_64.sh4
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.win32.bat0
-rwxr-xr-x[-rw-r--r--]make/scripts/make.jocl.all.win64.bat0
-rwxr-xr-x[-rw-r--r--]make/scripts/tests.sh4
13 files changed, 29 insertions, 29 deletions
diff --git a/make/scripts/make.jocl.all.linux-armv6-cross.sh b/make/scripts/make.jocl.all.linux-armv6-cross.sh
index 97f3c1f..d13d51b 100755
--- a/make/scripts/make.jocl.all.linux-armv6-cross.sh
+++ b/make/scripts/make.jocl.all.linux-armv6-cross.sh
@@ -1,12 +1,12 @@
#! /bin/sh
-SDIR=`dirname $0`
+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-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
+PATH=`pwd`/../../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH
export PATH
# -Dc.compiler.debug=true
@@ -31,7 +31,7 @@ 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 GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6.xml"
#export JUNIT_DISABLED="true"
#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
diff --git a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
index 36343d2..fe375c1 100755
--- a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
+++ b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh
@@ -1,12 +1,12 @@
#! /bin/sh
-SDIR=`dirname $0`
+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-jogl-x86_64.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
fi
-PATH=`pwd`/../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH
+PATH=`pwd`/../../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH
export PATH
# -Dc.compiler.debug=true
@@ -31,7 +31,7 @@ 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 GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml"
+export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml"
#export JUNIT_DISABLED="true"
#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
diff --git a/make/scripts/make.jocl.all.linux-x86-clang.sh b/make/scripts/make.jocl.all.linux-x86-clang.sh
index ca9c8ab..be694d1 100644..100755
--- a/make/scripts/make.jocl.all.linux-x86-clang.sh
+++ b/make/scripts/make.jocl.all.linux-x86-clang.sh
@@ -2,15 +2,15 @@
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-jogl-x86.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-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
-export GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-clang.properties"
+export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties"
# or -Dgcc.compat.compiler=clang
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
diff --git a/make/scripts/make.jocl.all.linux-x86.sh b/make/scripts/make.jocl.all.linux-x86.sh
index 04494b2..010a604 100644..100755
--- a/make/scripts/make.jocl.all.linux-x86.sh
+++ b/make/scripts/make.jocl.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-jogl-x86.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
fi
export SOURCE_LEVEL=1.6
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 1d2a2a0..a30eb3c 100644..100755
--- a/make/scripts/make.jocl.all.linux-x86_64-clang.sh
+++ b/make/scripts/make.jocl.all.linux-x86_64-clang.sh
@@ -1,9 +1,9 @@
#! /bin/sh
-SDIR=`dirname $0`
+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-jogl-x86_64.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
fi
# -Dbuild.archiveon=true \
@@ -12,7 +12,7 @@ export SOURCE_LEVEL=1.6
export TARGET_LEVEL=1.6
export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
-export GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-clang.properties"
+export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties"
# or -Dgcc.compat.compiler=clang
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
diff --git a/make/scripts/make.jocl.all.linux-x86_64.sh b/make/scripts/make.jocl.all.linux-x86_64.sh
index 8e50868..460af80 100644..100755
--- a/make/scripts/make.jocl.all.linux-x86_64.sh
+++ b/make/scripts/make.jocl.all.linux-x86_64.sh
@@ -1,9 +1,9 @@
#! /bin/sh
-SDIR=`dirname $0`
+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-jogl-x86_64.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
fi
# -Dbuild.archiveon=true \
diff --git a/make/scripts/make.jocl.all.macosx-clang.sh b/make/scripts/make.jocl.all.macosx-clang.sh
index fc16ed1..6e5552d 100755
--- a/make/scripts/make.jocl.all.macosx-clang.sh
+++ b/make/scripts/make.jocl.all.macosx-clang.sh
@@ -14,7 +14,7 @@ export SOURCE_LEVEL=1.6
export TARGET_LEVEL=1.6
export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
-export GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-xcode_clang.properties"
+export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-xcode_clang.properties"
# or -Dgcc.compat.compiler=xcode.clang
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
diff --git a/make/scripts/make.jocl.all.macosx.sh b/make/scripts/make.jocl.all.macosx.sh
index 20f65b9..20f65b9 100644..100755
--- a/make/scripts/make.jocl.all.macosx.sh
+++ b/make/scripts/make.jocl.all.macosx.sh
diff --git a/make/scripts/make.jocl.all.solaris-x86.sh b/make/scripts/make.jocl.all.solaris-x86.sh
index a59f756..6e643cb 100644..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-jogl-x86.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-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 2a207ab..abca7e2 100644..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-jogl-x86_64.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-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 bb4418b..bb4418b 100644..100755
--- a/make/scripts/make.jocl.all.win32.bat
+++ b/make/scripts/make.jocl.all.win32.bat
diff --git a/make/scripts/make.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat
index a174e71..a174e71 100644..100755
--- a/make/scripts/make.jocl.all.win64.bat
+++ b/make/scripts/make.jocl.all.win64.bat
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 6337b62..3b69eac 100644..100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -107,7 +107,7 @@ function testawt() {
#
# Version
#
-#testnoawt com.jogamp.opencl.JoclVersion $*
+testnoawt com.jogamp.opencl.JoclVersion $*
#
#
@@ -120,7 +120,7 @@ function testawt() {
#testnoawt com.jogamp.opencl.LowLevelBindingTest $*
#testnoawt com.jogamp.opencl.TestJoclVersion $*
#testnoawt com.jogamp.opencl.TestUtils $*
-testnoawt com.jogamp.opencl.gl.CLGLTest $*
+#testnoawt com.jogamp.opencl.gl.CLGLTest $*
#testnoawt com.jogamp.opencl.util.concurrent.CLMultiContextTest $*