diff options
Diffstat (limited to 'make/scripts')
18 files changed, 102 insertions, 36 deletions
diff --git a/make/scripts/check-junit.sh b/make/scripts/check-junit.sh new file mode 100755 index 00000000..232b3c6a --- /dev/null +++ b/make/scripts/check-junit.sh @@ -0,0 +1,39 @@ +#! /bin/bash + +builddir=$1 +shift + +function checkresult() { + resdir=$1 + shift + if [ -e $builddir/test/$resdir ] ; then + echo + echo Results of $builddir/test/$resdir + echo + echo number of junit classes + grep failures $builddir/test/$resdir/* | wc + echo + echo number of passed junit classes - failures + grep failures $builddir/test/$resdir/* | grep "failures=\"0\"" | wc + echo + echo number of passed junit classes - errors + grep failures $builddir/test/$resdir/* | grep "errors=\"0\"" | wc + echo + echo number of failed junit classes - failures + grep failures $builddir/test/$resdir/* | grep -v "failures=\"0\"" | wc + echo + echo number of failed junit classes - errors + grep failures $builddir/test/$resdir/* | grep -v "errors=\"0\"" | wc + echo + echo failed junit classes - failures + grep failures $builddir/test/$resdir/* | grep -v "failures=\"0\"" + echo + echo failed junit classes - errors + grep failures $builddir/test/$resdir/* | grep -v "errors=\"0\"" + echo + fi +} + +checkresult results +checkresult results-java7 +checkresult results-x32 diff --git a/make/scripts/install-ati-stream.sh b/make/scripts/install-ati-stream.sh index 94d3eca6..94d3eca6 100644..100755 --- a/make/scripts/install-ati-stream.sh +++ b/make/scripts/install-ati-stream.sh diff --git a/make/scripts/make.jocl.all.linux-armv6-cross.sh b/make/scripts/make.jocl.all.linux-armv6-cross.sh index 97f3c1f9..d13d51b0 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 36343d27..fe375c12 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 ca9c8abc..be694d1a 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 04494b21..010a6041 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 1d2a2a05..a30eb3c2 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 8e508684..460af803 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 fc16ed15..6e5552d9 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 20f65b92..20f65b92 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 a59f756b..6e643cb2 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 2a207ab5..abca7e2a 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 bb4418bd..d75d5e70 100644..100755 --- a/make/scripts/make.jocl.all.win32.bat +++ b/make/scripts/make.jocl.all.win32.bat @@ -2,7 +2,7 @@ set THISDIR="C:\JOGL" set J2RE_HOME=c:\jre1.7.0_45_x32
set JAVA_HOME=c:\jdk1.7.0_45_x32
-set ANT_PATH=C:\apache-ant-1.8.0
+set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/make.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat index a174e710..56e200a0 100644..100755 --- a/make/scripts/make.jocl.all.win64.bat +++ b/make/scripts/make.jocl.all.win64.bat @@ -2,7 +2,7 @@ set THISDIR="C:\JOGL" set J2RE_HOME=c:\jre1.7.0_45_x64
set JAVA_HOME=c:\jdk1.7.0_45_x64
-set ANT_PATH=C:\apache-ant-1.8.0
+set ANT_PATH=C:\apache-ant-1.8.2
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 583b5cde..ad4daf9a 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -1 +1,13 @@ -scripts\java-win.bat com.jogamp.opencl.JoclVersion %* +REM scripts\java-win.bat com.jogamp.opencl.JoclVersion %* + +scripts\java-win.bat com.jogamp.opencl.CLBufferTest %* +REM scripts\java-win.bat com.jogamp.opencl.CLCommandQueueTest %* +REM scripts\java-win.bat com.jogamp.opencl.CLExceptionTest %* +REM scripts\java-win.bat com.jogamp.opencl.CLImageTest %* +REM scripts\java-win.bat com.jogamp.opencl.CLProgramTest %* +REM scripts\java-win.bat com.jogamp.opencl.HighLevelBindingTest %* +REM scripts\java-win.bat com.jogamp.opencl.LowLevelBindingTest %* +REM scripts\java-win.bat com.jogamp.opencl.TestJoclVersion %* +REM scripts\java-win.bat com.jogamp.opencl.TestUtils %* +REM scripts\java-win.bat com.jogamp.opencl.gl.CLGLTest %* +REM scripts\java-win.bat com.jogamp.opencl.util.concurrent.CLMultiContextTest %* diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat index c8ead0ad..6aebd5a7 100755 --- a/make/scripts/tests-x32.bat +++ b/make/scripts/tests-x32.bat @@ -21,8 +21,14 @@ set BLD_DIR=..\%BLD_SUB% REM set LIB_DIR=..\..\gluegen\%BLD_SUB%\obj;%BLD_DIR%\lib
set LIB_DIR=
-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt-debug.jar
+set CP_ALL=.;%BLD_DIR%\jar\jocl.jar;%BLD_DIR%\jar\jocl-test.jar;..\..\jogl\%BLD_SUB%\jar\jogl-all.jar;..\..\joal\%BLD_SUB%\jar\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt-debug.jar
echo CP_ALL %CP_ALL%
+REM set D_ARGS="-Djogamp.debug=all" "-Djocl.debug=all"
+REM set D_ARGS="-Djogamp.debug.ProcAddressHelper" "-Djogamp.debug.NativeLibrary" "-Djogamp.debug.NativeLibrary.Lookup" "-Djogamp.debug.JNILibLoader" "-Djogamp.debug.TempJarCache" "-Djogamp.debug.JarUtil" "-Djocl.debug=all"
+set D_ARGS="-Djogamp.debug.ProcAddressHelper" "-Djogamp.debug.NativeLibrary" "-Djogamp.debug.NativeLibrary.Lookup" "-Djogamp.debug.JNILibLoader"
+
+REM set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"
+
scripts\tests-win.bat %*
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index ac74f4c9..2a480d9a 100755 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -16,10 +16,15 @@ set BLD_DIR=..\%BLD_SUB% REM set LIB_DIR=%BLD_DIR%\lib;..\..\gluegen\%BLD_SUB%\obj
set LIB_DIR=
-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\joal\%BLD_SUB%\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt-debug.jar
+set CP_ALL=.;%BLD_DIR%\jar\jocl.jar;%BLD_DIR%\jar\jocl-test.jar;..\..\jogl\%BLD_SUB%\jar\jogl-all.jar;..\..\joal\%BLD_SUB%\jar\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt-debug.jar
+
echo CP_ALL %CP_ALL%
-set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"
+REM set D_ARGS="-Djogamp.debug=all" "-Djocl.debug=all"
+REM set D_ARGS="-Djogamp.debug.ProcAddressHelper" "-Djogamp.debug.NativeLibrary" "-Djogamp.debug.NativeLibrary.Lookup" "-Djogamp.debug.JNILibLoader" "-Djogamp.debug.TempJarCache" "-Djogamp.debug.JarUtil" "-Djocl.debug=all"
+set D_ARGS="-Djogamp.debug.ProcAddressHelper" "-Djogamp.debug.NativeLibrary" "-Djogamp.debug.NativeLibrary.Lookup" "-Djogamp.debug.JNILibLoader"
+
+REM set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"
scripts\tests-win.bat %*
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 6337b623..bc718c4f 100644..100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -60,8 +60,12 @@ function jrun() { #D_ARGS="-Dnativewindow.debug=all" #D_ARGS="-Djogl.debug=all" #D_ARGS="-Dnewt.debug=all" - #D_ARGS="-Djocl=all" + #D_ARGS="-Djocl.debug=all" + #D_ARGS="-Djogamp.debug=all -Djocl.debug=all" + #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djocl.debug=all" + D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader" + #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.awt.noerasebackground=true" #X_ARGS="-verbose:jni" #X_ARGS="-Xrs" @@ -111,7 +115,7 @@ function testawt() { # # -#testnoawt com.jogamp.opencl.CLBufferTest $* +testnoawt com.jogamp.opencl.CLBufferTest $* #testnoawt com.jogamp.opencl.CLCommandQueueTest $* #testnoawt com.jogamp.opencl.CLExceptionTest $* #testnoawt com.jogamp.opencl.CLImageTest $* @@ -120,7 +124,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 $* |