diff options
Diffstat (limited to 'make')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 32 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-linux-armv7.xml | 2 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-linux-armv7hf.xml | 35 | ||||
| l--------- | make/lib/linux/arm-linux-gnueabihf/bin/gcc | 1 | ||||
| l--------- | make/lib/linux/arm-linux-gnueabihf/bin/ld | 1 | ||||
| l--------- | make/lib/linux/arm-linux-gnueabihf/bin/objdump | 1 | ||||
| l--------- | make/lib/linux/arm-linux-gnueabihf/bin/strip | 1 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.linux-armv7hf-cross.sh | 44 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 9 |
9 files changed, 120 insertions, 6 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 7f5c30b..a6f3db5 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -30,6 +30,8 @@ - isLinuxIA64 - isLinuxX86 - isLinuxARMv7 + - isAbiEabiGnuArmel (implicit if isAndroidARMv7 or isLinuxARMv7) + - isAbiEabiGnuArmhf (shall be declared explicit) - isLinuxAlpha - isLinuxHppa - isLinuxMips @@ -304,6 +306,12 @@ </or> </and> </condition> + <condition property="isAbiEabiGnuArmel"> + <or> + <os arch="isAndroidARMv7" /> + <os arch="isLinuxARMv7" /> + </or> + </condition> <condition property="isLinuxAlpha"> <and> <istrue value="${isLinux}" /> @@ -495,6 +503,8 @@ <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" /> <echo message="HPUX=${isHPUX}" /> <echo message="IA64=${isIA64}" /> + <echo message="isAbiEabiGnuArmel=${isAbiEabiGnuArmel}" /> + <echo message="isAbiEabiGnuArmhf=${isAbiEabiGnuArmhf}" /> <echo message="Android=${isAndroid}" /> <echo message="AndroidARMv7=${isAndroidARMv7}" /> <echo message="Linux=${isLinux}" /> @@ -555,10 +565,19 @@ <property name="os.and.arch" value="linux-i586" /> </target> - <target name="gluegen.cpptasks.detect.os.linux.armv7" unless="gluegen.cpptasks.detected.os.2" if="isLinuxARMv7"> + <target name="gluegen.cpptasks.detect.os.linux.armv7.armel" unless="gluegen.cpptasks.detected.os.2" if="isAbiEabiGnuArmel"> <property name="os.and.arch" value="linux-armv7" /> </target> + <target name="gluegen.cpptasks.detect.os.linux.armv7.armhf" unless="gluegen.cpptasks.detected.os.2" if="isAbiEabiGnuArmhf"> + <property name="os.and.arch" value="linux-armv7hf" /> + </target> + + <target name="gluegen.cpptasks.detect.os.linux.armv7" + depends="gluegen.cpptasks.detect.os.linux.armv7.armel, gluegen.cpptasks.detect.os.linux.armv7.armhf" + unless="gluegen.cpptasks.detected.os.2" + if="isLinuxARMv7"/> + <target name="gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAlpha"> <property name="os.and.arch" value="linux-alpha" /> </target> @@ -592,10 +611,19 @@ </target> - <target name="gluegen.cpptasks.detect.os.android.armv7" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv7"> + <target name="gluegen.cpptasks.detect.os.android.armv7.armel" unless="gluegen.cpptasks.detected.os.2" if="isAbiEabiGnuArmel"> <property name="os.and.arch" value="android-armv7" /> </target> + <target name="gluegen.cpptasks.detect.os.android.armv7.armhf" unless="gluegen.cpptasks.detected.os.2" if="isAbiEabiGnuArmhf"> + <property name="os.and.arch" value="android-armv7hf" /> + </target> + + <target name="gluegen.cpptasks.detect.os.android.armv7" + depends="gluegen.cpptasks.detect.os.android.armv7.armel, gluegen.cpptasks.detect.os.android.armv7.armhf" + unless="gluegen.cpptasks.detected.os.2" + if="isAndroidARMv7"/> + <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv7,gluegen.cpptasks.detect.os.android.armv7,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" /> <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX"> diff --git a/make/lib/gluegen-cpptasks-linux-armv7.xml b/make/lib/gluegen-cpptasks-linux-armv7.xml index fad15af..e07d58e 100644 --- a/make/lib/gluegen-cpptasks-linux-armv7.xml +++ b/make/lib/gluegen-cpptasks-linux-armv7.xml @@ -24,7 +24,7 @@ <property name="isX11" value="true" /> <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> <property name="isCrosscompilation" value="true" /> - + <property name="isAbiEabiGnuArmel" value="true" /> <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv7' done"/> </target> diff --git a/make/lib/gluegen-cpptasks-linux-armv7hf.xml b/make/lib/gluegen-cpptasks-linux-armv7hf.xml new file mode 100644 index 0000000..7e20f24 --- /dev/null +++ b/make/lib/gluegen-cpptasks-linux-armv7hf.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + This is an example of how to add custom compiler/linker + arguments for a crosscompiler. + + You can use such files with setting the property 'gluegen-cpptasks.file', ie: + + -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml + + In case you want to compile for 32bit on a 64bit machine, + you might also need to set the 'os.arch' to 'x86'. + Example: gluegen/make/make.gluegen.all.linux-x86.sh + --> + +<project name="GlueGen-cpptasks-linux-armv7hf" basedir="." > + +<!-- Set OS and ARCH for crosscompilation compiler configuration --> +<target name="gluegen.cpptasks.detect.os.custom"> + <property name="gluegen.cpptasks.detected.os" value="true" /> + <property name="isUnix" value="true" /> + <property name="isLinux" value="true" /> + <property name="isLinuxARMv7" value="true" /> + <property name="isX11" value="true" /> + <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> + <property name="isCrosscompilation" value="true" /> + <property name="isAbiEabiGnuArmhf" value="true" /> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv7hf' done"/> +</target> + +<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> + +</project> + + diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/gcc b/make/lib/linux/arm-linux-gnueabihf/bin/gcc new file mode 120000 index 0000000..dca59c0 --- /dev/null +++ b/make/lib/linux/arm-linux-gnueabihf/bin/gcc @@ -0,0 +1 @@ +/usr/bin/arm-linux-gnueabihf-gcc
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/ld b/make/lib/linux/arm-linux-gnueabihf/bin/ld new file mode 120000 index 0000000..bce9f7f --- /dev/null +++ b/make/lib/linux/arm-linux-gnueabihf/bin/ld @@ -0,0 +1 @@ +/usr/bin/arm-linux-gnueabihf-ld
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/objdump b/make/lib/linux/arm-linux-gnueabihf/bin/objdump new file mode 120000 index 0000000..ded739c --- /dev/null +++ b/make/lib/linux/arm-linux-gnueabihf/bin/objdump @@ -0,0 +1 @@ +/usr/bin/arm-linux-gnueabihf-objdump
\ No newline at end of file diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/strip b/make/lib/linux/arm-linux-gnueabihf/bin/strip new file mode 120000 index 0000000..c941465 --- /dev/null +++ b/make/lib/linux/arm-linux-gnueabihf/bin/strip @@ -0,0 +1 @@ +/usr/bin/arm-linux-gnueabihf-strip
\ No newline at end of file diff --git a/make/scripts/make.gluegen.all.linux-armv7hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv7hf-cross.sh new file mode 100755 index 0000000..f9b1b54 --- /dev/null +++ b/make/scripts/make.gluegen.all.linux-armv7hf-cross.sh @@ -0,0 +1,44 @@ +#! /bin/sh + +SDIR=`dirname $0` + +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh +fi + +# arm-linux-gnueabihf == armhf triplet +PATH=`pwd`/lib/linux/arm-linux-gnueabihf/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_ROOT=/home/jogamp/projects-cross +export TARGET_ANT_HOME=/usr/share/ant + +export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armhf +export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib +export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm + +export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv7hf.xml" + +#export JUNIT_DISABLED="true" +export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +ant \ + -Drootrel.build=build-linux-armv7hf \ + $* 2>&1 | tee make.gluegen.all.linux-armv7hf-cross.log + + diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 3037d8a..a0034d6 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -42,6 +42,7 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true" #D_ARGS="-Djogamp.debug.TraceLock" #D_ARGS="-Djogamp.debug.JarUtil" +#D_ARGS="-Djogamp.debug.TempJarCache" #D_ARGS="-Djogamp.debug.TempFileCache" #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil" #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.gluegen.UseTempJarCache=false" @@ -49,7 +50,8 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.Lock" #D_ARGS="-Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" #D_ARGS="-Djogamp.debug.Lock.TraceLock" -D_ARGS="-Djogamp.debug.IOUtil" +#D_ARGS="-Djogamp.debug.IOUtil" +#D_ARGS="-Djogamp.debug=all" function onetest() { clazz=$1 @@ -66,7 +68,8 @@ function onetest() { echo } -#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestSystemProperties 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG @@ -80,7 +83,7 @@ function onetest() { #onetest com.jogamp.common.nio.TestPointerBufferEndian 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.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG +#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG |