summaryrefslogtreecommitdiffstats
path: root/make/gluegen-cpptasks-base.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-03-28 03:09:39 +0200
committerSven Gothel <[email protected]>2012-03-28 03:09:39 +0200
commit0d486ab4bc73a53218cb015936aed755e8e9e6de (patch)
treef6d02062c504c3a23ba5bd9df0a1c50b725c1721 /make/gluegen-cpptasks-base.xml
parentdd19355464d63ff2e77013f2e537e49d3ba750a1 (diff)
Add support for armhf/gnueabihf resulting in new 'os.and.arch' := [ 'android-armv7hf' and 'linux-armv7hf' ]
- Platform gets new ABIType [ GENERIC, ARMEL, ARMHF ] - Platform impl. needs to guess ABIType in case of ARM, since no Java system property ('os.arch' ..) reflects the new EABI. I consider this a bug, since this will also hinder JNLP to work. The latter also uses 'os.arch' sys property to determine the nativelib resource! (See Platform.guessABITypeImpl(..) for details how we guess the type.) - Adding symbolic links to ubuntu's gnueabihf cross tool chain - Adding armhf crossbuild script
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
-rwxr-xr-xmake/gluegen-cpptasks-base.xml32
1 files changed, 30 insertions, 2 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">