Skip to content

Commit 48cf016

Browse files
cmagliecmaglie
committed
Added ARM build for ArduinoBot
1 parent e4176bf commit 48cf016

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
@@ -26,33 +26,33 @@
2626
<condition property="platform" value="windows"><os family="windows" /></condition>
2727
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
2828
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
29-
<condition property="platform" value="arm"><os family="unix" arch="arm" /></condition>
29+
<condition property="platform" value="linuxarm"><os family="unix" arch="arm" /></condition>
3030

3131
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
3232
<condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
3333
<condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
3434
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
3535
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
3636
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
37-
<condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition>
37+
<condition property="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
3838

3939
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
4040
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
4141
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
4242
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
43-
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="arm" /></condition>
43+
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
4444

4545
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
4646
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
4747
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
4848
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
49-
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="arm" /></condition>
49+
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linuxarm" /></condition>
5050

5151
<condition property="arch-bits" value="32">
5252
<equals arg1="${platform}" arg2="linux32"/>
5353
</condition>
5454
<condition property="arch-bits" value="32">
55-
<equals arg1="${platform}" arg2="arm"/>
55+
<equals arg1="${platform}" arg2="linuxarm"/>
5656
</condition>
5757
<condition property="arch-bits" value="64">
5858
<equals arg1="${platform}" arg2="linux64"/>
@@ -65,10 +65,12 @@
6565
<property name="WINDOWS_BUNDLED_JVM" value="${java.home}"/>
6666
<property name="LINUX32_BUNDLED_JVM" value="none"/>
6767
<property name="LINUX64_BUNDLED_JVM" value="none"/>
68+
<property name="LINUXARM_BUNDLED_JVM" value="none"/>
6869
<condition property="linux-bundle-jvm-task" value="noop">
6970
<and>
7071
<equals arg1="${LINUX32_BUNDLED_JVM}" arg2="none"/>
7172
<equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
73+
<equals arg1="${LINUXARM_BUNDLED_JVM}" arg2="none"/>
7274
</and>
7375
</condition>
7476
<condition property="linux-bundle-jvm-task" value="bundle">
@@ -79,6 +81,9 @@
7981
<not>
8082
<equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
8183
</not>
84+
<not>
85+
<equals arg1="${LINUXARM_BUNDLED_JVM}" arg2="none"/>
86+
</not>
8287
</or>
8388
</condition>
8489

@@ -684,9 +689,9 @@
684689

685690
</target>
686691

687-
<target name="arm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
692+
<target name="linuxarm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
688693
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
689-
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
694+
<param name="JVM" value="${LINUXARM_BUNDLED_JVM}"/>
690695
</antcall>
691696

692697
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
@@ -796,7 +801,7 @@
796801

797802
<target name="linux64-run" depends="build,start"/>
798803

799-
<target name="arm-run" depends="build,start"/>
804+
<target name="linuxarm-run" depends="build,start"/>
800805

801806
<target name="linux32-start">
802807
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
@@ -806,7 +811,7 @@
806811
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
807812
</target>
808813

809-
<target name="arm-start">
814+
<target name="linuxarm-start">
810815
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
811816
</target>
812817

@@ -889,13 +894,13 @@
889894
</target>
890895

891896
<target name="linux32-dist" depends="linux-dist"
892-
description="Build .tar.xz of linux version" />
897+
description="Build .tar.xz of linux x86_32 version" />
893898

894899
<target name="linux64-dist" depends="linux-dist"
895-
description="Build .tar.xz of linux version" />
900+
description="Build .tar.xz of linux x86_64 version" />
896901

897-
<target name="arm-dist" depends="linux-dist"
898-
description="Build .tar.xz of linux version" />
902+
<target name="linuxarm-dist" depends="linux-dist"
903+
description="Build .tar.xz of linux armhf version" />
899904

900905
<!-- - - - - - - - -->
901906
<!-- 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)