diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 10 | ||||
| -rwxr-xr-x | make/scripts/check-junit.sh | 27 | ||||
| -rwxr-xr-x | make/scripts/java-win32.bat | 16 | ||||
| -rwxr-xr-x | make/scripts/java-win64.bat | 17 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.linux-armv7l_eabi.sh | 12 | ||||
| -rwxr-xr-x | make/scripts/runtest-x32.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/runtest-x64.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 4 |
8 files changed, 87 insertions, 7 deletions
diff --git a/make/build.xml b/make/build.xml index d27b801..870c537 100644 --- a/make/build.xml +++ b/make/build.xml @@ -291,13 +291,13 @@ <property name="linker.cfg.id" value="linker.cfg.linux" /> </target> - <target name="declare.linux.arm7" if="isLinuxARM7"> - <echo message="Linux.arm7" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux.arm7" /> - <property name="linker.cfg.id" value="linker.cfg.linux.arm7" /> + <target name="declare.linux.armv7" if="isLinuxARMv7"> + <echo message="Linux.armv7" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7" /> + <property name="linker.cfg.id" value="linker.cfg.linux.armv7" /> </target> - <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.arm7" if="isLinux" > + <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.armv7" if="isLinux" > <property name="c.src.dir.os" value="unix" /> <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> diff --git a/make/scripts/check-junit.sh b/make/scripts/check-junit.sh new file mode 100755 index 0000000..1b1ba78 --- /dev/null +++ b/make/scripts/check-junit.sh @@ -0,0 +1,27 @@ +#! /bin/bash + +builddir=$1 +shift + +echo number of junit classes +grep failures $builddir/test/results/* | wc +echo +echo number of passed junit classes - failures +grep failures $builddir/test/results/* | grep "failures=\"0\"" | wc +echo +echo number of passed junit classes - errors +grep failures $builddir/test/results/* | grep "errors=\"0\"" | wc +echo +echo number of failed junit classes - failures +grep failures $builddir/test/results/* | grep -v "failures=\"0\"" | wc +echo +echo number of failed junit classes - errors +grep failures $builddir/test/results/* | grep -v "errors=\"0\"" | wc +echo +echo failed junit classes - failures +grep failures $builddir/test/results/* | grep -v "failures=\"0\"" +echo +echo failed junit classes - errors +grep failures $builddir/test/results/* | grep -v "errors=\"0\"" +echo + diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat new file mode 100755 index 0000000..1e2c0f2 --- /dev/null +++ b/make/scripts/java-win32.bat @@ -0,0 +1,16 @@ +
+set BLD_SUB=build-win32
+set J2RE_HOME=c:\jre1.6.0_26_x32
+set JAVA_HOME=c:\jdk1.6.0_26_x32
+set ANT_PATH=C:\apache-ant-1.8.2
+
+set BLD_DIR=..\%BLD_SUB%
+set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH%
+
+set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\test\build\gluegen-test.jar;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar
+
+echo CP_ALL %CP_ALL%
+
+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat new file mode 100755 index 0000000..d518073 --- /dev/null +++ b/make/scripts/java-win64.bat @@ -0,0 +1,17 @@ +
+set BLD_SUB=build-win64
+set J2RE_HOME=c:\jre1.6.0_26_x64
+set JAVA_HOME=c:\jdk1.6.0_26_x64
+set ANT_PATH=C:\apache-ant-1.8.2
+
+set BLD_DIR=..\%BLD_SUB%
+set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH%
+
+set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\test\build\gluegen-test.jar;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar
+
+echo CP_ALL %CP_ALL%
+
+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1
+
diff --git a/make/scripts/make.gluegen.all.linux-armv7l_eabi.sh b/make/scripts/make.gluegen.all.linux-armv7l_eabi.sh new file mode 100755 index 0000000..9d1975c --- /dev/null +++ b/make/scripts/make.gluegen.all.linux-armv7l_eabi.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxX86=true \ +# -DisX11=true \ + +ant \ + -Drootrel.build=build-armv7l_eabi \ + $* 2>&1 | tee make.gluegen.all.linux-armv7l_eabi.log diff --git a/make/scripts/runtest-x32.bat b/make/scripts/runtest-x32.bat new file mode 100755 index 0000000..b09ce73 --- /dev/null +++ b/make/scripts/runtest-x32.bat @@ -0,0 +1,4 @@ +REM scripts\java-win32.bat com.jogamp.common.GlueGenVersion +REM scripts\java-win32.bat com.jogamp.common.util.TestVersionInfo +scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter + diff --git a/make/scripts/runtest-x64.bat b/make/scripts/runtest-x64.bat new file mode 100755 index 0000000..f437ef7 --- /dev/null +++ b/make/scripts/runtest-x64.bat @@ -0,0 +1,4 @@ +REM scripts\java-win64.bat com.jogamp.common.GlueGenVersion +REM scripts\java-win64.bat com.jogamp.common.util.TestVersionInfo +scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter + diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 6468d61..33f5510 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -50,7 +50,7 @@ function onetest() { #onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.TestPointerBufferEndian 2>&1 | tee -a $LOG -#onetest com.jogamp.gluegen.test.TestStructAccessorEndian 2>&1 | tee -a $LOG -onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG +onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG +#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG |