Skip to content

Commit fe02dcb

Browse files
cmagliecmaglie
committed
Added ARM build for ArduinoBot
1 parent 7bfe215 commit fe02dcb

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

‎build/build.xml

+18-13
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,33 @@
2222
<condition property="platform" value="windows"><os family="windows" /></condition>
2323
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
2424
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
25-
<condition property="platform" value="arm"><os family="unix" arch="arm" /></condition>
25+
<condition property="platform" value="linuxarm"><os family="unix" arch="arm" /></condition>
2626

2727
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
2828
<condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
2929
<condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
3030
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
3131
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
3232
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
33-
<condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition>
33+
<condition property="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
3434

3535
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
3636
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
3737
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
3838
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
39-
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="arm" /></condition>
39+
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
4040

4141
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
4242
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
4343
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
4444
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
45-
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="arm" /></condition>
45+
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linuxarm" /></condition>
4646

4747
<condition property="arch-bits" value="32">
4848
<equals arg1="${platform}" arg2="linux32"/>
4949
</condition>
5050
<condition property="arch-bits" value="32">
51-
<equals arg1="${platform}" arg2="arm"/>
51+
<equals arg1="${platform}" arg2="linuxarm"/>
5252
</condition>
5353
<condition property="arch-bits" value="64">
5454
<equals arg1="${platform}" arg2="linux64"/>
@@ -61,10 +61,12 @@
6161
<property name="WINDOWS_BUNDLED_JVM" value="${java.home}"/>
6262
<property name="LINUX32_BUNDLED_JVM" value="none"/>
6363
<property name="LINUX64_BUNDLED_JVM" value="none"/>
64+
<property name="LINUXARM_BUNDLED_JVM" value="none"/>
6465
<condition property="linux-bundle-jvm-task" value="noop">
6566
<and>
6667
<equals arg1="${LINUX32_BUNDLED_JVM}" arg2="none"/>
6768
<equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
69+
<equals arg1="${LINUXARM_BUNDLED_JVM}" arg2="none"/>
6870
</and>
6971
</condition>
7072
<condition property="linux-bundle-jvm-task" value="bundle">
@@ -75,6 +77,9 @@
7577
<not>
7678
<equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
7779
</not>
80+
<not>
81+
<equals arg1="${LINUXARM_BUNDLED_JVM}" arg2="none"/>
82+
</not>
7883
</or>
7984
</condition>
8085

@@ -641,9 +646,9 @@
641646

642647
</target>
643648

644-
<target name="arm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
649+
<target name="linuxarm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
645650
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
646-
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
651+
<param name="JVM" value="${LINUXARM_BUNDLED_JVM}"/>
647652
</antcall>
648653

649654
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
@@ -753,7 +758,7 @@
753758

754759
<target name="linux64-run" depends="build,start"/>
755760

756-
<target name="arm-run" depends="build,start"/>
761+
<target name="linuxarm-run" depends="build,start"/>
757762

758763
<target name="linux32-start">
759764
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
@@ -763,7 +768,7 @@
763768
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
764769
</target>
765770

766-
<target name="arm-start">
771+
<target name="linuxarm-start">
767772
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
768773
</target>
769774

@@ -846,13 +851,13 @@
846851
</target>
847852

848853
<target name="linux32-dist" depends="linux-dist"
849-
description="Build .tar.xz of linux version" />
854+
description="Build .tar.xz of linux x86_32 version" />
850855

851856
<target name="linux64-dist" depends="linux-dist"
852-
description="Build .tar.xz of linux version" />
857+
description="Build .tar.xz of linux x86_64 version" />
853858

854-
<target name="arm-dist" depends="linux-dist"
855-
description="Build .tar.xz of linux version" />
859+
<target name="linuxarm-dist" depends="linux-dist"
860+
description="Build .tar.xz of linux armhf version" />
856861

857862
<!-- - - - - - - - -->
858863
<!-- Windows -->

‎build/build_all_dist.bash

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ mv linux/arduino-*-linux32.tar.xz ../
1212
ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 $@ clean dist
1313
mv linux/arduino-*-linux64.tar.xz ../
1414

15+
ant -Djava.net.preferIPv4Stack=true -Dplatform=linuxarm $@ clean dist
16+
mv linux/arduino-*-linuxarm.tar.xz ../
17+
1518
ant -Djava.net.preferIPv4Stack=true -Dplatform=windows $@ clean dist
1619
mv windows/arduino-*-windows.zip ../
1720

‎build/build_pull_request.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ fi
1818

1919
VERSION="PR-${ghprbPullId}-BUILD-${BUILD_NUMBER}"
2020

21-
./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
21+
./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
2222

0 commit comments

Comments
 (0)