diff options
Diffstat (limited to 'make')
23 files changed, 132 insertions, 56 deletions
diff --git a/make/build.xml b/make/build.xml index 0c50129f..0f796e3a 100644 --- a/make/build.xml +++ b/make/build.xml @@ -45,6 +45,7 @@ <!-- This is the version of JOCL you are building --> <mkdir dir="${build}" /> + <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false" output="${build}/localbranch.raw"> <arg line="branch --no-color"/> @@ -127,7 +128,7 @@ <property name="rootrel.src.c" value="resources" /> <property name="rootrel.src.generated" value="${rootrel.build}/gensrc" /> <property name="rootrel.generated.java" value="${rootrel.src.generated}/classes" /> - <property name="rootrel.generated.c.jocl" value="${rootrel.src.generated}/native" /> + <property name="rootrel.generated.c.jocl" value="${rootrel.src.generated}/native/jocl" /> <property name="rootrel.obj" value="${rootrel.build}/obj" /> <property name="rootrel.obj.jocl" value="${rootrel.obj}/jocl" /> @@ -287,7 +288,7 @@ <!-- Now check for the presence of one well-known file --> <uptodate property="java.generate.skip" - targetfile="${src.generated.java}/com/jogamp/opencl/llb/CL.java"> + targetfile="${src.generated.c}/CLAbstractImpl_JNI.c"> <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> @@ -298,7 +299,7 @@ <target name="java.generate.copy2temp"> <copy todir="${tempdir}"> <fileset dir="${build}" - includes="gensrc/classes/**" /> + includes="gensrc/java/**" /> </copy> </target> @@ -370,7 +371,12 @@ - from the C OpenCL headers. This involves setting the taskdef and creating - the classpath reference id then running the task on each header. --> - <target name="java.generate" depends="build.gluegen, generate.jdk6.autocloseable, generate.jdk7.autocloseable, java.generate.check, preprocess-opencl-headers" unless="java.generate.skip"> + <target name="java.generate" depends="build.gluegen, java.generate.check" unless="java.generate.skip"> + <antcall target="java.generate.impl" inheritRefs="true" /> + </target> + + <target name="java.generate.impl" depends="generate.jdk6.autocloseable, generate.jdk7.autocloseable, preprocess-opencl-headers"> + <!-- Add the GlueGen task to ANT --> <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask" classpathref="gluegen.classpath" /> @@ -500,6 +506,7 @@ </gluegen> <echo message="CL..."/> + <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-if.cfg" diff --git a/make/config/cl-common.cfg b/make/config/cl-common.cfg index d89643b9..8e1adf16 100644 --- a/make/config/cl-common.cfg +++ b/make/config/cl-common.cfg @@ -1,5 +1,5 @@ JavaOutputDir gensrc/java -NativeOutputDir gensrc/native +NativeOutputDir gensrc/native/jocl Package com.jogamp.opencl.llb diff --git a/make/config/cl-if.cfg b/make/config/cl-if.cfg index 2078123a..8b5322f7 100644 --- a/make/config/cl-if.cfg +++ b/make/config/cl-if.cfg @@ -19,17 +19,17 @@ Extends CL CLSamplerBinding Extends CL CLEventBinding Extends CL CLPlatformBinding -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLContextBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLProgramBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLKernelBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLCommandQueueBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLDeviceBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLMemObjBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLImageBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLBufferBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLSamplerBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLEventBinding.java -ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLPlatformBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLContextBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLProgramBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLKernelBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLCommandQueueBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLDeviceBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLMemObjBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLImageBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLBufferBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLSamplerBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLEventBinding.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLPlatformBinding.java #ignore cl-gl interoperability functions. Interface 'CL' is pure OpenCL. Ignore CL_GL_.*|cl.*GL.*|.*_GL_.* diff --git a/make/config/cl-impl.cfg b/make/config/cl-impl.cfg index 4beb22b3..a7b53950 100644 --- a/make/config/cl-impl.cfg +++ b/make/config/cl-impl.cfg @@ -16,10 +16,13 @@ ImplJavaClass CLAbstractImpl AccessControl CLAbstractImpl PUBLIC_ABSTRACT Implements CLAbstractImpl CLGL +LocalProcAddressCallingConvention __ALL__ CL_API_CALL + EmitProcAddressTable true ProcAddressTableClassName CLProcAddressTable GetProcAddressTableExpr addressTable ProcAddressNameExpr $UpperCase(arg) +ForceProcAddressGen __ALL__ #dynamic binding for OpenGL specific functions... #ForceProcAddressGen clGetGLContextInfoKHR diff --git a/make/config/clImplCustomCode.c b/make/config/clImplCustomCode.c index 751f819b..6a5da4f0 100644 --- a/make/config/clImplCustomCode.c +++ b/make/config/clImplCustomCode.c @@ -116,7 +116,7 @@ CL_CALLBACK void memObjDestructorCallback(cl_mem mem, void * object) { JNIEXPORT jlong JNICALL Java_com_jogamp_opencl_llb_impl_CLAbstractImpl_dispatch_1clGetExtensionFunctionAddressStatic(JNIEnv *env, jclass _unused, jstring fname, jlong procAddress) { - typedef void* (CL_API_ENTRY*_local_LPCLGETPROCADDRESS)(const char * fname); + typedef void* (CL_API_CALL * _local_LPCLGETPROCADDRESS)(const char * fname); _local_LPCLGETPROCADDRESS ptr_clGetExtensionFunctionAddress; const char* _strchars_fname = NULL; void* _res; @@ -130,7 +130,7 @@ Java_com_jogamp_opencl_llb_impl_CLAbstractImpl_dispatch_1clGetExtensionFunctionA } ptr_clGetExtensionFunctionAddress = (_local_LPCLGETPROCADDRESS) (intptr_t) procAddress; assert(ptr_clGetExtensionFunctionAddress != NULL); - _res = (* ptr_clGetExtensionFunctionAddress) ((char *) _strchars_fname); + _res = (* ptr_clGetExtensionFunctionAddress) (_strchars_fname); if ( NULL != fname ) { (*env)->ReleaseStringUTFChars(env, fname, _strchars_fname); } @@ -210,7 +210,7 @@ Java_com_jogamp_opencl_llb_impl_CLImpl_clCreateContext0(JNIEnv *env, jobject _un cccallback _pfn_notify = NULL; jobject globalCB = NULL; - typedef cl_context (*function)(cl_context_properties *, cl_uint, const cl_device_id *, void (*pfn_notify)(const char *, const void *, size_t, void *), void *, cl_int *); + typedef cl_context (CL_API_CALL * function)(cl_context_properties *, cl_uint, const cl_device_id *, void (*pfn_notify)(const char *, const void *, size_t, void *), void *, cl_int *); function clCreateContext = (function)(intptr_t) procAddress; if (props != NULL) { @@ -286,7 +286,7 @@ Java_com_jogamp_opencl_llb_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unu bpcallback _pfn_notify = NULL; jobject globalCB = NULL; - typedef cl_int (*function)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK *)(cl_program, void *), void *); + typedef cl_int (CL_API_CALL * function)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK *)(cl_program, void *), void *); function clBuildProgram = (function)(intptr_t)procAddress; if (options != NULL) { 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 $* |