diff options
| -rw-r--r-- | build.xml | 29 | ||||
| -rwxr-xr-x | scripts/make.jocl.all.linux-armv7-cross.sh | 45 |
2 files changed, 73 insertions, 1 deletions
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- JOCL's main build file--> -<project name="JOCL" default="default" basedir="."> +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir="." default="default" name="JOCL"> <description>Builds, tests, and runs the project JOCL.</description> @@ -660,6 +660,33 @@ </target> <!-- overwrites default target - watch out when build-impl.xml changes --> + <target name="-pre-test-run" depends="init" if="have.tests" > + <mkdir dir="${build.test.results.dir}"/> + </target> + + <target name="junit.run.local" unless="isCrosscompilation"> + <j2seproject3:junit testincludes="**/*Test.java"/> + </target> + + <target name="junit.run.remote.ssh" if="isCrosscompilation" unless="isAndroid"> + <copy todir="${build.test.results.dir}" file="${gluegen.root}/make/lib/TEST-com.jogamp.junit.DisabledTest.xml"/> + </target> + + <target name="junit.run.tests" depends="junit.run.local, junit.run.remote.ssh"/> + + <target name="junit.run.if.enabled" unless="junit.is.disabled"> + <antcall target="junit.run.tests" inheritRefs="true" inheritAll="true"/> + </target> + + <target name="junit.run.if.disabled" if="junit.is.disabled"> + <copy todir="${build.test.results.dir}" file="${gluegen.root}/make/lib/TEST-com.jogamp.junit.DisabledTest.xml"/> + </target> + + <!-- overwrites default target - watch out when build-impl.xml changes --> + <target name="-do-test-run" depends="init,compile-test,-pre-test-run,junit.run.if.enabled,junit.run.if.disabled" if="have.tests" > + </target> + + <!-- overwrites default target - watch out when build-impl.xml changes --> <target name="-post-test-run" depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests"> <zip destfile="${dist.dir}/${dist.zip.name}-test-results-${build.node.name}.zip"> <zipfileset dir="${build.test.results.dir}" prefix="${dist.zip.name}/test-results"/> diff --git a/scripts/make.jocl.all.linux-armv7-cross.sh b/scripts/make.jocl.all.linux-armv7-cross.sh new file mode 100755 index 00000000..1ded5ca5 --- /dev/null +++ b/scripts/make.jocl.all.linux-armv7-cross.sh @@ -0,0 +1,45 @@ +#! /bin/sh + +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 +fi + +PATH=`pwd`/../gluegen/make/lib/linux/arm-linux-gnueabi/bin:$PATH +export PATH + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxARMv7=true \ +# -DisX11=false \ + +export NODE_LABEL=. + +export HOST_UID=jogamp +export HOST_IP=jogamp02 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda01 +#export TARGET_IP=jautab02 +export TARGET_ROOT=/home/jogamp/projects-cross +export TARGET_ANT_HOME=/usr/share/ant + +export TARGET_PLATFORM_LIBS=/opt-linux-armv7-eabi/lib +export TARGET_JAVA_LIBS=/opt-linux-armv7-eabi/jre/lib/arm + +export GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv7.xml" + +#export JUNIT_DISABLED="true" +#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +ant \ + -Drootrel.build=build-linux-armv7 \ + $* 2>&1 | tee make.jocl.all.linux-armv7-cross.log + + + + |