From 422d7a5eb53fca6642ebf4e8910d8b0311bb2597 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 16 Aug 2012 14:39:30 +0200 Subject: Change/Lower ARM Requierements for GNU/Linux & Android-GNU/Linux ARM: ARMv7hf -> ARMv6hf, ARMv7-soft -> ARMv5te/ARMV6 (soft) platform build config files: lib/gluegen-cpptasks-linux-armv7.xml -> lib/gluegen-cpptasks-linux-armv6.xml lib/gluegen-cpptasks-linux-armv7hf.xml -> lib/gluegen-cpptasks-linux-armv6hf.xml properties: isLinuxARMv7 -> isLinuxARMv6 isLinuxARMv7Armel -> isLinuxARMv6Armel isLinuxARMv7Armhf -> isLinuxARMv6Armhf isAndroidARMv7 -> isAndroidARMv6 isAndroidARMv7Armel -> isAndroidARMv6Armel isAndroidARMv7Armhf -> isAndroidARMv6Armhf targets: compiler.cfg.linux.armv7 -> compiler.cfg.linux.armv6 linker.cfg.linux.armv7 -> linker.cfg.linux.armv6 compiler.cfg.linux.armv6: compiler.cfg.linux.armv6hf: gluegen-cpptasks-android-armv6.xml: --- make/build-test.xml | 5 +- make/build.xml | 10 +- make/gluegen-cpptasks-base.xml | 100 +++++++++-------- make/lib/gluegen-cpptasks-android-armv6.xml | 118 +++++++++++++++++++++ make/lib/gluegen-cpptasks-android-armv7.xml | 12 +-- make/lib/gluegen-cpptasks-linux-armv4.xml | 63 ----------- make/lib/gluegen-cpptasks-linux-armv6.xml | 62 +++++++++++ make/lib/gluegen-cpptasks-linux-armv6hf.xml | 10 +- make/lib/gluegen-cpptasks-linux-armv7.xml | 35 ------ make/lib/gluegen-cpptasks-linux-armv7hf.xml | 35 ------ make/scripts/adb-install-all-armv6.sh | 2 + make/scripts/adb-reinstall-all-armv6.sh | 5 + .../make.gluegen.all.android-armv6-cross.sh | 93 ++++++++++++++++ make/scripts/make.gluegen.all.linux-armv6-cross.sh | 44 ++++++++ make/scripts/make.gluegen.all.linux-armv6.sh | 18 ++++ .../make.gluegen.all.linux-armv6hf-cross.sh | 44 ++++++++ make/scripts/make.gluegen.all.linux-armv6hf.sh | 18 ++++ make/scripts/make.gluegen.all.linux-armv7-cross.sh | 44 -------- make/scripts/make.gluegen.all.linux-armv7.sh | 18 ---- .../make.gluegen.all.linux-armv7hf-cross.sh | 44 -------- make/scripts/make.gluegen.all.linux-armv7hf.sh | 18 ---- src/java/com/jogamp/gluegen/package.html | 2 +- src/java/jogamp/common/os/PlatformPropsImpl.java | 12 +-- 23 files changed, 485 insertions(+), 327 deletions(-) create mode 100644 make/lib/gluegen-cpptasks-android-armv6.xml delete mode 100644 make/lib/gluegen-cpptasks-linux-armv4.xml create mode 100644 make/lib/gluegen-cpptasks-linux-armv6.xml delete mode 100644 make/lib/gluegen-cpptasks-linux-armv7.xml delete mode 100644 make/lib/gluegen-cpptasks-linux-armv7hf.xml create mode 100755 make/scripts/adb-install-all-armv6.sh create mode 100755 make/scripts/adb-reinstall-all-armv6.sh create mode 100755 make/scripts/make.gluegen.all.android-armv6-cross.sh create mode 100755 make/scripts/make.gluegen.all.linux-armv6-cross.sh create mode 100755 make/scripts/make.gluegen.all.linux-armv6.sh create mode 100755 make/scripts/make.gluegen.all.linux-armv6hf-cross.sh create mode 100755 make/scripts/make.gluegen.all.linux-armv6hf.sh delete mode 100755 make/scripts/make.gluegen.all.linux-armv7-cross.sh delete mode 100755 make/scripts/make.gluegen.all.linux-armv7.sh delete mode 100755 make/scripts/make.gluegen.all.linux-armv7hf-cross.sh delete mode 100755 make/scripts/make.gluegen.all.linux-armv7hf.sh diff --git a/make/build-test.xml b/make/build-test.xml index a5417b6..9810f06 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -81,11 +81,12 @@ + - - + + diff --git a/make/build.xml b/make/build.xml index 671e3c3..3f7c4da 100644 --- a/make/build.xml +++ b/make/build.xml @@ -310,10 +310,10 @@ - - - - + + + + @@ -364,7 +364,7 @@ - + diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 0a895fc..8891695 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -16,7 +16,7 @@ - configuration is exactly as specified. - - is64Bit - - isAbiEabiGnuArmel (implicit if isAndroidARMv7 or isLinuxARMv7) + - isAbiEabiGnuArmel (implicit if isAndroidARMv6 or isLinuxARMv6) - isAbiEabiGnuArmhf (shall be declared explicit) - isUnix - isX11 @@ -26,16 +26,16 @@ - isHPUX - isIA64 - isAndroid - - isAndroidARMv7 - - isAndroidARMv7Armel (set in gluegen.cpptasks.detected.os.2) - - isAndroidARMv7Armhf (set in gluegen.cpptasks.detected.os.2) + - isAndroidARMv6 + - isAndroidARMv6Armel (set in gluegen.cpptasks.detected.os.2) + - isAndroidARMv6Armhf (set in gluegen.cpptasks.detected.os.2) - isLinux - isLinuxAMD64 - isLinuxIA64 - isLinuxX86 - - isLinuxARMv7 - - isLinuxARMv7Armel (set in gluegen.cpptasks.detected.os.2) - - isLinuxARMv7Armhf (set in gluegen.cpptasks.detected.os.2) + - isLinuxARMv6 + - isLinuxARMv6Armel (set in gluegen.cpptasks.detected.os.2) + - isLinuxARMv6Armhf (set in gluegen.cpptasks.detected.os.2) - isLinuxAlpha - isLinuxHppa - isLinuxMips @@ -117,7 +117,7 @@ - compiler.cfg.linux - compiler.cfg.linux.x86 - compiler.cfg.linux.amd64 - - compiler.cfg.linux.armv7 + - compiler.cfg.linux.armv6 - compiler.cfg.linux.alpha - compiler.cfg.linux.hppa - compiler.cfg.linux.mips @@ -138,7 +138,7 @@ - linker.cfg.linux - linker.cfg.linux.x86 - linker.cfg.linux.amd64 - - linker.cfg.linux.armv7 + - linker.cfg.linux.armv6 - linker.cfg.linux.alpha - linker.cfg.linux.hppa - linker.cfg.linux.mips @@ -209,7 +209,7 @@ by a custom file set in property 'gluegen-cpptasks.file' or environment var 'GLUEGEN_CPPTASKS_FILE' - See 'lib/gluegen-cpptasks-linux-armv7.xml' which sets OS and ARCH + See 'lib/gluegen-cpptasks-linux-armv6.xml' which sets OS and ARCH for crosscompilation. --> @@ -292,20 +292,22 @@ - + + - + + @@ -314,8 +316,8 @@ - - + + @@ -503,29 +505,29 @@ - + - + - + - + - + - + - + - + @@ -541,16 +543,16 @@ - - - + + + - - - + + + @@ -604,12 +606,12 @@ - - + + - - + + @@ -644,15 +646,15 @@ - - + + - - + + - + @@ -899,7 +901,7 @@ - + @@ -907,6 +909,10 @@ + + + + @@ -1106,7 +1112,13 @@ - + + + + + + + @@ -1296,10 +1308,10 @@ - - - - + + + + @@ -1359,7 +1371,7 @@ - + diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml new file mode 100644 index 0000000..1be5c1f --- /dev/null +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml index 65caa38..a172fb5 100644 --- a/make/lib/gluegen-cpptasks-android-armv7.xml +++ b/make/lib/gluegen-cpptasks-android-armv7.xml @@ -20,7 +20,7 @@ - + @@ -46,11 +46,8 @@ - - - - - + + @@ -80,7 +77,8 @@ - + + diff --git a/make/lib/gluegen-cpptasks-linux-armv4.xml b/make/lib/gluegen-cpptasks-linux-armv4.xml deleted file mode 100644 index 8911a6a..0000000 --- a/make/lib/gluegen-cpptasks-linux-armv4.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/make/lib/gluegen-cpptasks-linux-armv6.xml b/make/lib/gluegen-cpptasks-linux-armv6.xml new file mode 100644 index 0000000..d5267b8 --- /dev/null +++ b/make/lib/gluegen-cpptasks-linux-armv6.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/make/lib/gluegen-cpptasks-linux-armv6hf.xml b/make/lib/gluegen-cpptasks-linux-armv6hf.xml index 2b2acb6..26f2db9 100644 --- a/make/lib/gluegen-cpptasks-linux-armv6hf.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6hf.xml @@ -20,10 +20,10 @@ - + - + @@ -33,7 +33,7 @@ - + @@ -44,10 +44,10 @@ - + - + diff --git a/make/lib/gluegen-cpptasks-linux-armv7.xml b/make/lib/gluegen-cpptasks-linux-armv7.xml deleted file mode 100644 index e07d58e..0000000 --- a/make/lib/gluegen-cpptasks-linux-armv7.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/make/lib/gluegen-cpptasks-linux-armv7hf.xml b/make/lib/gluegen-cpptasks-linux-armv7hf.xml deleted file mode 100644 index 7e20f24..0000000 --- a/make/lib/gluegen-cpptasks-linux-armv7hf.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/make/scripts/adb-install-all-armv6.sh b/make/scripts/adb-install-all-armv6.sh new file mode 100755 index 0000000..866881c --- /dev/null +++ b/make/scripts/adb-install-all-armv6.sh @@ -0,0 +1,2 @@ +adb $* install ../build-android-armv6/jogamp-android-launcher.apk +adb $* install ../build-android-armv6/gluegen-rt-android-armeabi.apk diff --git a/make/scripts/adb-reinstall-all-armv6.sh b/make/scripts/adb-reinstall-all-armv6.sh new file mode 100755 index 0000000..0e62c59 --- /dev/null +++ b/make/scripts/adb-reinstall-all-armv6.sh @@ -0,0 +1,5 @@ +sdir=`dirname $0` + +$sdir/adb-uninstall-all.sh $* +$sdir/adb-install-all-armv6.sh $* + diff --git a/make/scripts/make.gluegen.all.android-armv6-cross.sh b/make/scripts/make.gluegen.all.android-armv6-cross.sh new file mode 100755 index 0000000..9744b3d --- /dev/null +++ b/make/scripts/make.gluegen.all.android-armv6-cross.sh @@ -0,0 +1,93 @@ +#! /bin/sh + +export NODE_LABEL=. + +export HOST_UID=jogamp +# jogamp02 - 10.1.0.122 +export HOST_IP=10.1.0.122 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda02 +#export TARGET_IP=jautab03 +#export TARGET_IP=jauphone04 +export TARGET_ADB_PORT=5555 +# needs executable bit (probably su) +export TARGET_ROOT=/data/projects +export TARGET_ANT_HOME=/usr/share/ant + +echo ANDROID_SDK_HOME $ANDROID_SDK_HOME +echo NDK_ROOT $NDK_ROOT + +if [ -z "$NDK_ROOT" ] ; then + # + # Generic android-ndk + # + if [ -e /usr/local/android-ndk ] ; then + NDK_ROOT=/usr/local/android-ndk + elif [ -e /opt-linux-x86/android-ndk ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk + elif [ -e /opt/android-ndk ] ; then + NDK_ROOT=/opt/android-ndk + # + # Specific android-ndk-r7b + # + elif [ -e /usr/local/android-ndk-r7b ] ; then + NDK_ROOT=/usr/local/android-ndk-r7b + elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk-r7b + elif [ -e /opt/android-ndk-r7b ] ; then + NDK_ROOT=/opt/android-ndk-r7b + else + echo NDK_ROOT is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $NDK_ROOT ] ; then + echo NDK_ROOT $NDK_ROOT does not exist + exit 1 +fi +export NDK_ROOT + +if [ -z "$ANDROID_SDK_HOME" ] ; then + if [ -e /usr/local/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/usr/local/android-sdk-linux_x86 + elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86 + elif [ -e /opt/android-sdk-linux_x86 ] ; then + ANDROID_SDK_HOME=/opt/android-sdk-linux_x86 + else + echo ANDROID_SDK_HOME is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $ANDROID_SDK_HOME ] ; then + echo ANDROID_SDK_HOME $ANDROID_SDK_HOME does not exist + exit 1 +fi +export ANDROID_SDK_HOME + +export ANDROID_VERSION=9 +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +export GCC_VERSION=4.4.3 +HOST_ARCH=linux-x86 +export TARGET_TRIPLE=arm-linux-androideabi + +export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH} +export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm + +# Need to add toolchain bins to the PATH. +export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH" + +export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv6.xml" + +#export JUNIT_DISABLED="true" +#export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +which gcc 2>&1 | tee make.gluegen.all.android-armv6-cross.log + +#BUILD_ARCHIVE=true \ +ant \ + -Drootrel.build=build-android-armv6 \ + $* 2>&1 | tee -a make.gluegen.all.android-armv6-cross.log diff --git a/make/scripts/make.gluegen.all.linux-armv6-cross.sh b/make/scripts/make.gluegen.all.linux-armv6-cross.sh new file mode 100755 index 0000000..bd56e89 --- /dev/null +++ b/make/scripts/make.gluegen.all.linux-armv6-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-gnueabi == armel triplet +PATH=`pwd`/lib/linux/arm-linux-gnueabi/bin:$PATH +export PATH + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxARMv6=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-armv6-armel +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-armv6.xml" + +#export JUNIT_DISABLED="true" +export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +ant \ + -Drootrel.build=build-linux-armv6 \ + $* 2>&1 | tee make.gluegen.all.linux-armv6-cross.log + + diff --git a/make/scripts/make.gluegen.all.linux-armv6.sh b/make/scripts/make.gluegen.all.linux-armv6.sh new file mode 100755 index 0000000..1fc6656 --- /dev/null +++ b/make/scripts/make.gluegen.all.linux-armv6.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxX86=true \ +# -DisX11=true \ + +# arm-linux-gnueabi == armel triplet +export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabi +export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm + +export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml" + +ant \ + -Drootrel.build=build-linux-armv6 \ + $* 2>&1 | tee make.gluegen.all.linux-armv6.log diff --git a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh new file mode 100755 index 0000000..c8c8f14 --- /dev/null +++ b/make/scripts/make.gluegen.all.linux-armv6hf-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 \ +# -DisLinuxARMv6=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=panda02 +export TARGET_ROOT=/home/jogamp/projects-cross +export TARGET_ANT_HOME=/usr/share/ant + +export TARGET_PLATFORM_ROOT=/opt-linux-armv6-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-armv6hf.xml" + +#export JUNIT_DISABLED="true" +export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" + +ant \ + -Drootrel.build=build-linux-armv6hf \ + $* 2>&1 | tee make.gluegen.all.linux-armv6hf-cross.log + + diff --git a/make/scripts/make.gluegen.all.linux-armv6hf.sh b/make/scripts/make.gluegen.all.linux-armv6hf.sh new file mode 100755 index 0000000..e922c2d --- /dev/null +++ b/make/scripts/make.gluegen.all.linux-armv6hf.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxX86=true \ +# -DisX11=true \ + +# arm-linux-gnueabihf == armhf triplet +export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf +export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm + +export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml" + +ant \ + -Drootrel.build=build-linux-armv6hf \ + $* 2>&1 | tee make.gluegen.all.linux-armv6hf.log diff --git a/make/scripts/make.gluegen.all.linux-armv7-cross.sh b/make/scripts/make.gluegen.all.linux-armv7-cross.sh deleted file mode 100755 index d364faf..0000000 --- a/make/scripts/make.gluegen.all.linux-armv7-cross.sh +++ /dev/null @@ -1,44 +0,0 @@ -#! /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-gnueabi == armel triplet -PATH=`pwd`/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_ROOT=/home/jogamp/projects-cross -export TARGET_ANT_HOME=/usr/share/ant - -export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armel -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-armv4.xml" - -#export JUNIT_DISABLED="true" -export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" - -ant \ - -Drootrel.build=build-linux-armv7 \ - $* 2>&1 | tee make.gluegen.all.linux-armv7-cross.log - - diff --git a/make/scripts/make.gluegen.all.linux-armv7.sh b/make/scripts/make.gluegen.all.linux-armv7.sh deleted file mode 100755 index 1d78d74..0000000 --- a/make/scripts/make.gluegen.all.linux-armv7.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh - -# -Dc.compiler.debug=true -# -Dgluegen.cpptasks.detected.os=true \ -# -DisUnix=true \ -# -DisLinux=true \ -# -DisLinuxX86=true \ -# -DisX11=true \ - -# arm-linux-gnueabi == armel triplet -export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabi -export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm - -export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv4.xml" - -ant \ - -Drootrel.build=build-linux-armv7 \ - $* 2>&1 | tee make.gluegen.all.linux-armv7.log diff --git a/make/scripts/make.gluegen.all.linux-armv7hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv7hf-cross.sh deleted file mode 100755 index adc9a7f..0000000 --- a/make/scripts/make.gluegen.all.linux-armv7hf-cross.sh +++ /dev/null @@ -1,44 +0,0 @@ -#! /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-armv6hf.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/make.gluegen.all.linux-armv7hf.sh b/make/scripts/make.gluegen.all.linux-armv7hf.sh deleted file mode 100755 index 54fe85a..0000000 --- a/make/scripts/make.gluegen.all.linux-armv7hf.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh - -# -Dc.compiler.debug=true -# -Dgluegen.cpptasks.detected.os=true \ -# -DisUnix=true \ -# -DisLinux=true \ -# -DisLinuxX86=true \ -# -DisX11=true \ - -# arm-linux-gnueabihf == armhf triplet -export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf -export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm - -export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml" - -ant \ - -Drootrel.build=build-linux-armv7hf \ - $* 2>&1 | tee make.gluegen.all.linux-armv7hf.log diff --git a/src/java/com/jogamp/gluegen/package.html b/src/java/com/jogamp/gluegen/package.html index c253473..7ea9d51 100644 --- a/src/java/com/jogamp/gluegen/package.html +++ b/src/java/com/jogamp/gluegen/package.html @@ -62,7 +62,7 @@ aligned_offset = offset + padding ; -
Type Size & Alignment for x86, x86_64, armv7l-32bit-eabi and Window(mingw/mingw64)
+
Type Size & Alignment for x86, x86_64, armv6l-32bit-eabi and Window(mingw/mingw64)
Runtime query is implemented as follows: 
    typedef struct {
diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java
index 464f4d4..111523d 100644
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -223,8 +223,8 @@ public abstract class PlatformPropsImpl {
      *   
  • linux-amd64
    • 
      *   
  • linux-ia64
    • 
      *   
  • linux-i586
    • 
-     *   
  • linux-armv7
    • 
-     *   
  • android-armv7
    • 
+     *   
  • linux-armv6
    • 
+     *   
  • android-armv6
    • 
      *   
  • macosx-universal
    • 
      *   
  • solaris-sparc
    • 
      *   
  • solaris-sparcv9
    • 
@@ -243,16 +243,16 @@ public abstract class PlatformPropsImpl {
                 _os_and_arch = "i586";
                 break;
             case ARM:
-                _os_and_arch = "armv7"; // TODO: sync with gluegen-cpptasks-base.xml
+                _os_and_arch = "armv6"; // TODO: sync with gluegen-cpptasks-base.xml
                 break;
             case ARMv5:
-                _os_and_arch = "armv5";
+                _os_and_arch = "armv6";
                 break;
             case ARMv6:
-                _os_and_arch = "armv5";
+                _os_and_arch = "armv6";
                 break;
             case ARMv7:
-                _os_and_arch = "armv7";
+                _os_and_arch = "armv6";
                 break;
             case SPARC_32:
                 _os_and_arch = "sparc"; 
-- 
cgit v1.2.3