diff options
18 files changed, 324 insertions, 166 deletions
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 @@ <path id="junit.run.classpath"> <pathelement location="${junit.jar}" /> <pathelement location="${TestJarsInJar.jar}" /> + <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${gluegen.jar}" /> <pathelement location="${gluegen-test.jar}" /> </path> - <property name="junit.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> - <property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen.root}/make/lib/TestJarsInJar.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> + <property name="junit.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> + <property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen.root}/make/lib/TestJarsInJar.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> <property name="junit.run.remote.apks" value="${gluegen.root}/${rootrel.build}/jogamp-android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${build_t}/gluegen-test.apk${path.separator}${gluegen.root}/make/lib/TestJarsInJar.apk"/> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> 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 @@ <property name="linker.cfg.id" value="linker.cfg.linux" /> </target> - <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 name="declare.linux.armv6" if="isLinuxARMv6"> + <echo message="Linux.armv6" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6" /> + <property name="linker.cfg.id" value="linker.cfg.linux.armv6" /> </target> <target name="declare.linux.alpha" if="isLinuxAlpha"> @@ -364,7 +364,7 @@ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" /> </target> - <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv7" if="isLinux" > + <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" 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/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. --> <target name="gluegen.cpptasks.detect.os.custom"> @@ -292,20 +292,22 @@ <condition property="isHPUX"> <os name="HP-UX" /> </condition> - <condition property="isAndroidARMv7"> + <condition property="isAndroidARMv6"> <and> <istrue value="${isAndroid}" /> <or> <os arch="arm" /> + <os arch="armv6" /> <os arch="armv7" /> </or> </and> </condition> - <condition property="isLinuxARMv7"> + <condition property="isLinuxARMv6"> <and> <istrue value="${isLinux}" /> <or> <os arch="arm" /> + <os arch="armv6" /> <os arch="armv7" /> </or> </and> @@ -314,8 +316,8 @@ <and> <isfalse value="${isAbiEabiGnuArmhf}" /> <or> - <istrue value="${isAndroidARMv7}" /> - <istrue value="${isLinuxARMv7}" /> + <istrue value="${isAndroidARMv6}" /> + <istrue value="${isLinuxARMv6}" /> </or> </and> </condition> @@ -503,29 +505,29 @@ </target> <target name="gluegen.cpptasks.detect.os.refine" unless="gluegen.cpptasks.detected.os.2"> - <condition property="isAndroidARMv7Armel"> + <condition property="isAndroidARMv6Armel"> <and> <istrue value="${isAbiEabiGnuArmel}" /> - <istrue value="${isAndroidARMv7}" /> + <istrue value="${isAndroidARMv6}" /> </and> </condition> - <condition property="isAndroidARMv7Armhf"> + <condition property="isAndroidARMv6Armhf"> <and> <istrue value="${isAbiEabiGnuArmhf}" /> - <istrue value="${isAndroidARMv7}" /> + <istrue value="${isAndroidARMv6}" /> </and> </condition> - <condition property="isLinuxARMv7Armel"> + <condition property="isLinuxARMv6Armel"> <and> <istrue value="${isAbiEabiGnuArmel}" /> - <istrue value="${isLinuxARMv7}" /> + <istrue value="${isLinuxARMv6}" /> </and> </condition> - <condition property="isLinuxARMv7Armhf"> + <condition property="isLinuxARMv6Armhf"> <and> <istrue value="${isAbiEabiGnuArmhf}" /> - <istrue value="${isLinuxARMv7}" /> + <istrue value="${isLinuxARMv6}" /> </and> </condition> @@ -541,16 +543,16 @@ <echo message="HPUX=${isHPUX}" /> <echo message="IA64=${isIA64}" /> <echo message="Android=${isAndroid}" /> - <echo message="AndroidARMv7=${isAndroidARMv7}" /> - <echo message="AndroidARMv7Armel=${isAndroidARMv7Armel}" /> - <echo message="AndroidARMv7Armhf=${isAndroidARMv7Armhf}" /> + <echo message="AndroidARMv6=${isAndroidARMv6}" /> + <echo message="AndroidARMv6Armel=${isAndroidARMv6Armel}" /> + <echo message="AndroidARMv6Armhf=${isAndroidARMv6Armhf}" /> <echo message="Linux=${isLinux}" /> <echo message="LinuxAMD64=${isLinuxAMD64}" /> <echo message="LinuxIA64=${isLinuxIA64}" /> <echo message="LinuxX86=${isLinuxX86}" /> - <echo message="LinuxARMv7=${isLinuxARMv7}" /> - <echo message="LinuxARMv7Armel=${isLinuxARMv7Armel}" /> - <echo message="LinuxARMv7Armhf=${isLinuxARMv7Armhf}" /> + <echo message="LinuxARMv6=${isLinuxARMv6}" /> + <echo message="LinuxARMv6Armel=${isLinuxARMv6Armel}" /> + <echo message="LinuxARMv6Armhf=${isLinuxARMv6Armhf}" /> <echo message="LinuxAlpha=${isLinuxAlpha}" /> <echo message="LinuxHppa=${isLinuxHppa}" /> <echo message="LinuxMips=${isLinuxMips}" /> @@ -604,12 +606,12 @@ <property name="os.and.arch" value="linux-i586" /> </target> - <target name="gluegen.cpptasks.detect.os.linux.armv7.armel" unless="gluegen.cpptasks.detected.os.2" if="isLinuxARMv7Armel"> - <property name="os.and.arch" value="linux-armv7" /> + <target name="gluegen.cpptasks.detect.os.linux.armv6.armel" unless="gluegen.cpptasks.detected.os.2" if="isLinuxARMv6Armel"> + <property name="os.and.arch" value="linux-armv6" /> </target> - <target name="gluegen.cpptasks.detect.os.linux.armv7.armhf" unless="gluegen.cpptasks.detected.os.2" if="isLinuxARMv7Armhf"> - <property name="os.and.arch" value="linux-armv7hf" /> + <target name="gluegen.cpptasks.detect.os.linux.armv6.armhf" unless="gluegen.cpptasks.detected.os.2" if="isLinuxARMv6Armhf"> + <property name="os.and.arch" value="linux-armv6hf" /> </target> <target name="gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAlpha"> @@ -644,15 +646,15 @@ <property name="os.and.arch" value="linux-sparc" /> </target> - <target name="gluegen.cpptasks.detect.os.android.armv7.armel" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv7Armel"> - <property name="os.and.arch" value="android-armv7" /> + <target name="gluegen.cpptasks.detect.os.android.armv6.armel" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv6Armel"> + <property name="os.and.arch" value="android-armv6" /> </target> - <target name="gluegen.cpptasks.detect.os.android.armv7.armhf" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv7Armhf"> - <property name="os.and.arch" value="android-armv7hf" /> + <target name="gluegen.cpptasks.detect.os.android.armv6.armhf" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv6Armhf"> + <property name="os.and.arch" value="android-armv6hf" /> </target> - <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.armel,gluegen.cpptasks.detect.os.linux.armv7.armhf,gluegen.cpptasks.detect.os.android.armv7.armel,gluegen.cpptasks.detect.os.android.armv7.armhf,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.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.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.android.armv6.armhf,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"> <property name="native.library.suffix" value="*lib" /> @@ -899,7 +901,7 @@ </defineset> </compiler> - <compiler id="compiler.cfg.linux.armv7" name="gcc"> + <compiler id="compiler.cfg.linux.armv6" name="gcc"> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -907,6 +909,10 @@ <define name="DEBUG" if="c.compiler.use-debug"/> <define name="NDEBUG" unless="c.compiler.use-debug"/> </defineset> + <compilerarg value="-fpic" /> + <compilerarg value="-march=armv5te" /> + <compilerarg value="-marm" /> + <compilerarg value="-mfloat-abi=softfp" /> </compiler> <compiler id="compiler.cfg.android" name="gcc"> @@ -1106,7 +1112,13 @@ <linkerarg value="-m64"/> </linker> - <linker id="linker.cfg.linux.armv7" name="gcc"> + <linker id="linker.cfg.linux.armv6" name="gcc"> + <linkerarg value="-fpic" /> + <linkerarg value="-march=armv5te" /> + <linkerarg value="-marm" /> + <linkerarg value="-mfloat-abi=softfp" /> + <linkerarg value="-nostdlib" /> + <linkerarg value="-Bdynamic" /> </linker> <linker id="linker.cfg.linux.alpha" name="gcc"> @@ -1296,10 +1308,10 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/alpha" /> </target> - <target name="gluegen.cpptasks.declare.compiler.linux.armv7" if="isLinuxARMv7"> - <echo message="Linux.armv7" /> - <property name="compiler.cfg.id.base" value="compiler.cfg.linux.armv7" /> - <property name="linker.cfg.id.base" value="linker.cfg.linux.armv7" /> + <target name="gluegen.cpptasks.declare.compiler.linux.armv6" if="isLinuxARMv6"> + <echo message="Linux.armv6" /> + <property name="compiler.cfg.id.base" value="compiler.cfg.linux.armv6" /> + <property name="linker.cfg.id.base" value="linker.cfg.linux.armv6" /> <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/arm" /> </target> @@ -1359,7 +1371,7 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" /> </target> - <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv7,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux"> + <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux"> <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> 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 @@ +<?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-android-armv6" 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="isAndroid" value="true" /> + <property name="isAndroidARMv6" value="true" /> + <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> + <property name="isCrosscompilation" value="true" /> + <property name="android.abi" value="armeabi" /> + <property name="isAbiEabiGnuArmel" value="true" /> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-android-armv6' done"/> +</target> + +<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> + +<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android"> + <echo message="Custom forced compiler Android NDK, linker.cfg.android" /> + <compiler id="compiler.cfg.android" name="gcc"> + <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> + <!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin will not find + subprograms properly (see gcc -print-search-dirs). Not sure if this is a bug in the NDK + or not. Need to explicitly indicate where subprograms are with -B. + NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN/bin. --> + <compilerarg value="-B${env.NDK_TOOLCHAIN_ROOT}/libexec/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" /> + + <compilerarg value="-ffunction-sections" /> + <compilerarg value="-funwind-tables" /> + <compilerarg value="-fstack-protector" /> + <compilerarg value="-fpic" /> + + <compilerarg value="-march=armv6" /> + <compilerarg value="-mfloat-abi=softfp" /> + <compilerarg value="-marm" /> + + <compilerarg value="-g" if="c.compiler.use-debug" /> + <compilerarg value="-O0" if="c.compiler.use-debug" /> + <compilerarg value="-Os" unless="c.compiler.use-debug" /> + <!--<compilerarg value="-O2" /> --> + + <compilerarg value="-fomit-frame-pointer" /> + <compilerarg value="-fno-strict-aliasing" /> + <compilerarg value="-finline-limit=64" /> + <compilerarg value="-Wa,--noexecstack" /> + <includepath path="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}/include" /> <!-- for stdarg.h --> + <defineset> + <define name="__unix__" /> + <define name="__ARM_ARCH_5__" /> + <define name="__ARM_ARCH_5T__" /> + <define name="__ARM_ARCH_5E__" /> + <define name="__ARM_ARCH_5TE__" /> + <define name="ANDROID" /> + <define name="_DEBUG" if="c.compiler.use-debug"/> + <define name="DEBUG" if="c.compiler.use-debug"/> + <define name="NDEBUG" unless="c.compiler.use-debug"/> + </defineset> + </compiler> + + <linker id="linker.cfg.android" name="gcc"> + <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> + <linkerarg value="-fpic" /> + + <linkerarg value="-march=armv6" /> + <linkerarg value="-mfloat-abi=softfp" /> + <linkerarg value="-marm" /> + + <linkerarg value="-nostdlib" /> + <linkerarg value="-Bdynamic" /> + <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> + <linkerarg value="-Wl,-z,nocopyreloc" /> + + <linkerarg value="--demangle" /> + <linkerarg value="--gc-sections" /> + <linkerarg value="--no-undefined" /> + <!-- The gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin needs to be told + where to find libgcc as the default location (gcc -print-search-dirs) + is not correct. Not sure if this is a bug in the NDK or not. We also + enforce that libgcc is linked after source files but before other shared + libraries. --> + <libset dir="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" libs="gcc" /> + <libset libs="c,m,dl" /> + </linker> + +</target> + +<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir"> + <echo message="Custom forced Linux.x86 cross compile android" /> + <property name="compiler.cfg.id.base" value="compiler.cfg.android" /> + <property name="linker.cfg.id.base" value="linker.cfg.android" /> + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> +</target> + +<target name="declare.linux.android"> + <echo message="android.arm" /> + <property name="compiler.cfg.id" value="compiler.cfg.android" /> + <property name="linker.cfg.id" value="linker.cfg.android" /> +</target> + +</project> + + 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 @@ <property name="gluegen.cpptasks.detected.os" value="true" /> <property name="isUnix" value="true" /> <property name="isAndroid" value="true" /> - <property name="isAndroidARMv7" value="true" /> + <property name="isAndroidARMv6" value="true" /> <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> <property name="isCrosscompilation" value="true" /> <property name="android.abi" value="armeabi-v7a" /> @@ -46,11 +46,8 @@ <compilerarg value="-fpic" /> <compilerarg value="-march=armv7-a" /> - <!--compilerarg value="-march=armv5te" /--> - - <compilerarg value="-mtune=xscale" /> - <compilerarg value="-msoft-float" /> - <compilerarg value="-mthumb" /> + <compilerarg value="-mfloat-abi=softfp" /> + <compilerarg value="-marm" /> <compilerarg value="-g" if="c.compiler.use-debug" /> <compilerarg value="-O0" if="c.compiler.use-debug" /> @@ -80,7 +77,8 @@ <linkerarg value="-fpic" /> <linkerarg value="-march=armv7-a" /> - <!--linkerarg value="-march=armv5te" /--> + <linkerarg value="-mfloat-abi=softfp" /> + <linkerarg value="-marm" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> diff --git a/make/lib/gluegen-cpptasks-linux-armv4.xml b/make/lib/gluegen-cpptasks-linux-armv6.xml index 8911a6a..d5267b8 100644 --- a/make/lib/gluegen-cpptasks-linux-armv4.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6.xml @@ -13,27 +13,27 @@ Example: gluegen/make/make.gluegen.all.linux-x86.sh --> -<project name="GlueGen-cpptasks-linux-armv4" basedir="." > +<project name="GlueGen-cpptasks-linux-armv6" 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="isLinuxARMv6" 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="isAbiEabiGnuArmel" value="true" /> - <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv4' done"/> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv6' done"/> </target> <import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> <target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir"> - <echo message="Custom forced compiler Linux ARMv4t soft float" /> + <echo message="Custom forced compiler Linux ARMv5te soft float" /> - <compiler id="compiler.cfg.linux.armv7" name="gcc"> + <compiler id="compiler.cfg.linux.armv6" name="gcc"> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -42,20 +42,19 @@ <define name="NDEBUG" unless="c.compiler.use-debug"/> </defineset> <compilerarg value="-fpic" /> - <compilerarg value="-march=armv4t" /> + <compilerarg value="-march=armv5te" /> <compilerarg value="-marm" /> - <compilerarg value="-mfloat-abi=soft" /> + <compilerarg value="-mfloat-abi=softfp" /> </compiler> - <linker id="linker.cfg.linux.armv7" name="gcc"> + <linker id="linker.cfg.linux.armv6" name="gcc"> <linkerarg value="-fpic" /> - <linkerarg value="-march=armv4t" /> + <linkerarg value="-march=armv5te" /> <linkerarg value="-marm" /> - <linkerarg value="-mfloat-abi=soft" /> + <linkerarg value="-mfloat-abi=softfp" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> </linker> - </target> </project> 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 @@ <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="isLinuxARMv6" value="true" /> <property name="isX11" value="true" /> <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> - <property name="isCrosscompilation" value="false" /> + <property name="isCrosscompilation" value="true" /> <property name="isAbiEabiGnuArmhf" value="true" /> <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv6hf' done"/> </target> @@ -33,7 +33,7 @@ <target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir"> <echo message="Custom forced compiler Linux ARMv6t hard float" /> - <compiler id="compiler.cfg.linux.armv7hf" name="gcc"> + <compiler id="compiler.cfg.linux.armv6" name="gcc"> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -44,10 +44,10 @@ <compilerarg value="-fpic" /> <compilerarg value="-march=armv6" /> <compilerarg value="-marm" /> - <compilerarg value="-mfloat-abi=hard" /> + <!-- compilerarg value="-mfloat-abi=hard" / --> </compiler> - <linker id="linker.cfg.linux.armv7hf" name="gcc"> + <linker id="linker.cfg.linux.armv6" name="gcc"> <linkerarg value="-fpic" /> <linkerarg value="-march=armv6" /> <linkerarg value="-marm" /> 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 @@ -<?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-armv7" 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="isAbiEabiGnuArmel" value="true" /> - <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv7' done"/> -</target> - -<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> - -</project> - - 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 @@ -<?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/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-armv7-cross.sh b/make/scripts/make.gluegen.all.linux-armv6-cross.sh index d364faf..bd56e89 100755 --- a/make/scripts/make.gluegen.all.linux-armv7-cross.sh +++ b/make/scripts/make.gluegen.all.linux-armv6-cross.sh @@ -14,7 +14,7 @@ export PATH # -Dgluegen.cpptasks.detected.os=true \ # -DisUnix=true \ # -DisLinux=true \ -# -DisLinuxARMv7=true \ +# -DisLinuxARMv6=true \ # -DisX11=false \ export NODE_LABEL=. @@ -28,17 +28,17 @@ 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_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-armv4.xml" +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-armv7 \ - $* 2>&1 | tee make.gluegen.all.linux-armv7-cross.log + -Drootrel.build=build-linux-armv6 \ + $* 2>&1 | tee make.gluegen.all.linux-armv6-cross.log diff --git a/make/scripts/make.gluegen.all.linux-armv7.sh b/make/scripts/make.gluegen.all.linux-armv6.sh index 1d78d74..1fc6656 100755 --- a/make/scripts/make.gluegen.all.linux-armv7.sh +++ b/make/scripts/make.gluegen.all.linux-armv6.sh @@ -11,8 +11,8 @@ 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" +export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml" ant \ - -Drootrel.build=build-linux-armv7 \ - $* 2>&1 | tee make.gluegen.all.linux-armv7.log + -Drootrel.build=build-linux-armv6 \ + $* 2>&1 | tee make.gluegen.all.linux-armv6.log diff --git a/make/scripts/make.gluegen.all.linux-armv7hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh index adc9a7f..c8c8f14 100755 --- a/make/scripts/make.gluegen.all.linux-armv7hf-cross.sh +++ b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh @@ -14,7 +14,7 @@ export PATH # -Dgluegen.cpptasks.detected.os=true \ # -DisUnix=true \ # -DisLinux=true \ -# -DisLinuxARMv7=true \ +# -DisLinuxARMv6=true \ # -DisX11=false \ export NODE_LABEL=. @@ -24,11 +24,11 @@ export HOST_IP=jogamp02 export HOST_RSYNC_ROOT=PROJECTS/JOGL export TARGET_UID=jogamp -export TARGET_IP=panda01 +export TARGET_IP=panda02 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_ROOT=/opt-linux-armv6-armhf export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm @@ -38,7 +38,7 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml" export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" ant \ - -Drootrel.build=build-linux-armv7hf \ - $* 2>&1 | tee make.gluegen.all.linux-armv7hf-cross.log + -Drootrel.build=build-linux-armv6hf \ + $* 2>&1 | tee make.gluegen.all.linux-armv6hf-cross.log diff --git a/make/scripts/make.gluegen.all.linux-armv7hf.sh b/make/scripts/make.gluegen.all.linux-armv6hf.sh index 54fe85a..e922c2d 100755 --- a/make/scripts/make.gluegen.all.linux-armv7hf.sh +++ b/make/scripts/make.gluegen.all.linux-armv6hf.sh @@ -14,5 +14,5 @@ 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 + -Drootrel.build=build-linux-armv6hf \ + $* 2>&1 | tee make.gluegen.all.linux-armv6hf.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 ; </blockquote> - <h5>Type Size & Alignment for x86, x86_64, armv7l-32bit-eabi and Window(mingw/mingw64)</h5> + <h5>Type Size & Alignment for x86, x86_64, armv6l-32bit-eabi and Window(mingw/mingw64)</h5> Runtime query is implemented as follows: <pre> 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 { * <li>linux-amd64</li> * <li>linux-ia64</li> * <li>linux-i586</li> - * <li>linux-armv7</li> - * <li>android-armv7</li> + * <li>linux-armv6</li> + * <li>android-armv6</li> * <li>macosx-universal</li> * <li>solaris-sparc</li> * <li>solaris-sparcv9</li> @@ -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"; |