noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added ARM build for ArduinoBot

This commit is contained in:
Cristian Maglie 2016-02-02 17:00:49 +01:00
parent e4176bfbdf
commit 48cf016195
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
build/build.xml
View File

@ -26,7 +26,7 @@
<condition property="platform" value="windows"><os family="windows" /></condition> <condition property="platform" value="windows"><os family="windows" /></condition>
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition> <condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition> <condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
<condition property="platform" value="arm"><os family="unix" arch="arm" /></condition> <condition property="platform" value="linuxarm"><os family="unix" arch="arm" /></condition>
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition> <condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition> <condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
@ -34,25 +34,25 @@
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition> <condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition> <condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition> <condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition> <condition property="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition> <condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition> <condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition> <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition> <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="arm" /></condition> <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition> <condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition> <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition> <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition> <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="arm" /></condition> <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linuxarm" /></condition>
<condition property="arch-bits" value="32"> <condition property="arch-bits" value="32">
<equals arg1="${platform}" arg2="linux32"/> <equals arg1="${platform}" arg2="linux32"/>
</condition> </condition>
<condition property="arch-bits" value="32"> <condition property="arch-bits" value="32">
<equals arg1="${platform}" arg2="arm"/> <equals arg1="${platform}" arg2="linuxarm"/>
</condition> </condition>
<condition property="arch-bits" value="64"> <condition property="arch-bits" value="64">
<equals arg1="${platform}" arg2="linux64"/> <equals arg1="${platform}" arg2="linux64"/>
@ -65,10 +65,12 @@
<property name="WINDOWS_BUNDLED_JVM" value="${java.home}"/> <property name="WINDOWS_BUNDLED_JVM" value="${java.home}"/>
<property name="LINUX32_BUNDLED_JVM" value="none"/> <property name="LINUX32_BUNDLED_JVM" value="none"/>
<property name="LINUX64_BUNDLED_JVM" value="none"/> <property name="LINUX64_BUNDLED_JVM" value="none"/>
<property name="LINUXARM_BUNDLED_JVM" value="none"/>
<condition property="linux-bundle-jvm-task" value="noop"> <condition property="linux-bundle-jvm-task" value="noop">
<and> <and>
<equals arg1="${LINUX32_BUNDLED_JVM}" arg2="none"/> <equals arg1="${LINUX32_BUNDLED_JVM}" arg2="none"/>
<equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/> <equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
<equals arg1="${LINUXARM_BUNDLED_JVM}" arg2="none"/>
</and> </and>
</condition> </condition>
<condition property="linux-bundle-jvm-task" value="bundle"> <condition property="linux-bundle-jvm-task" value="bundle">
@ -79,6 +81,9 @@
<not> <not>
<equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/> <equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
</not> </not>
<not>
<equals arg1="${LINUXARM_BUNDLED_JVM}" arg2="none"/>
</not>
</or> </or>
</condition> </condition>
@ -684,9 +689,9 @@
</target> </target>
<target name="arm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version"> <target name="linuxarm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
<antcall target="linux-jvm-${linux-bundle-jvm-task}"> <antcall target="linux-jvm-${linux-bundle-jvm-task}">
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/> <param name="JVM" value="${LINUXARM_BUNDLED_JVM}"/>
</antcall> </antcall>
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/> <delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
@ -796,7 +801,7 @@
<target name="linux64-run" depends="build,start"/> <target name="linux64-run" depends="build,start"/>
<target name="arm-run" depends="build,start"/> <target name="linuxarm-run" depends="build,start"/>
<target name="linux32-start"> <target name="linux32-start">
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/> <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
@ -806,7 +811,7 @@
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/> <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
</target> </target>
<target name="arm-start"> <target name="linuxarm-start">
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/> <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
</target> </target>
@ -889,13 +894,13 @@
</target> </target>
<target name="linux32-dist" depends="linux-dist" <target name="linux32-dist" depends="linux-dist"
description="Build .tar.xz of linux version" /> description="Build .tar.xz of linux x86_32 version" />
<target name="linux64-dist" depends="linux-dist" <target name="linux64-dist" depends="linux-dist"
description="Build .tar.xz of linux version" /> description="Build .tar.xz of linux x86_64 version" />
<target name="arm-dist" depends="linux-dist" <target name="linuxarm-dist" depends="linux-dist"
description="Build .tar.xz of linux version" /> description="Build .tar.xz of linux armhf version" />
<!-- - - - - - - - --> <!-- - - - - - - - -->
<!-- Windows --> <!-- Windows -->

3
build/build_all_dist.bash
View File

@ -12,6 +12,9 @@ mv linux/arduino-*-linux32.tar.xz ../
ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 $@ clean dist ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 $@ clean dist
mv linux/arduino-*-linux64.tar.xz ../ mv linux/arduino-*-linux64.tar.xz ../
ant -Djava.net.preferIPv4Stack=true -Dplatform=linuxarm $@ clean dist
mv linux/arduino-*-linuxarm.tar.xz ../
ant -Djava.net.preferIPv4Stack=true -Dplatform=windows $@ clean dist ant -Djava.net.preferIPv4Stack=true -Dplatform=windows $@ clean dist
mv windows/arduino-*-windows.zip ../ mv windows/arduino-*-windows.zip ../

2
build/build_pull_request.bash
View File

@ -18,5 +18,5 @@ fi
VERSION="PR-${ghprbPullId}-BUILD-${BUILD_NUMBER}" VERSION="PR-${ghprbPullId}-BUILD-${BUILD_NUMBER}"
./build_all_dist.bash -Dversion="${VERSION}" -DMACOSX_BUNDLED_JVM=$MACOSX_BUNDLED_JVM -DWINDOWS_BUNDLED_JVM=$WINDOWS_BUNDLED_JVM -DLINUX32_BUNDLED_JVM=$LINUX32_BUNDLED_JVM -DLINUX64_BUNDLED_JVM=$LINUX64_BUNDLED_JVM ./build_all_dist.bash -Dversion="${VERSION}" -DMACOSX_BUNDLED_JVM=$MACOSX_BUNDLED_JVM -DWINDOWS_BUNDLED_JVM=$WINDOWS_BUNDLED_JVM -DLINUX32_BUNDLED_JVM=$LINUX32_BUNDLED_JVM -DLINUX64_BUNDLED_JVM=$LINUX64_BUNDLED_JVM -DLINUXARM_BUNDLED_JVM=$LINUXARM_BUNDLED_JVM