Skip to content

Commit e4ade59

Browse files
NicoHoodcmaglie
authored andcommitted
Added ARM architecture to build.xml
1 parent e215675 commit e4ade59

4 files changed

+80
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1626819d4f7ae4cf4b4d1253e872acd446acc15c

build/build.xml

+77-2
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,34 @@
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>
2930

3031
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
3132
<condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
3233
<condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
3334
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
3435
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
3536
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
37+
<condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition>
3638

3739
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
3840
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
3941
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
4042
<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>
4144

4245
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
4346
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
4447
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
4548
<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>
4650

4751
<condition property="arch-bits" value="32">
4852
<equals arg1="${platform}" arg2="linux32"/>
4953
</condition>
54+
<condition property="arch-bits" value="32">
55+
<equals arg1="${platform}" arg2="arm"/>
56+
</condition>
5057
<condition property="arch-bits" value="64">
5158
<equals arg1="${platform}" arg2="linux64"/>
5259
</condition>
@@ -625,7 +632,9 @@
625632
<fileset dir="linux/work" includes="arduino" />
626633
<fileset dir="linux/work" includes="**/*.sh" />
627634
</chmod>
635+
</target>
628636

637+
<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
629638
<antcall target="unzip">
630639
<param name="archive_file" value="./libastylej-2.05.1-2.zip" />
631640
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-2.zip" />
@@ -650,7 +659,64 @@
650659

651660
</target>
652661

653-
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
662+
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
663+
<antcall target="unzip">
664+
<param name="archive_file" value="./libastylej-2.05.1-2.zip" />
665+
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-2.zip" />
666+
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
667+
<param name="dest_folder" value="${staging_folder}" />
668+
</antcall>
669+
<copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
670+
<chmod perm="755" file="linux/work/lib/libastylej.so" />
671+
672+
<antcall target="portable-${portable}">
673+
<param name="parentdir" value="linux/work" />
674+
</antcall>
675+
676+
<antcall target="unzip">
677+
<param name="archive_file" value="./liblistSerials-1.0.5.zip" />
678+
<param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-1.0.5.zip" />
679+
<param name="final_folder" value="${staging_folder}/liblistSerials-1.0.5" />
680+
<param name="dest_folder" value="${staging_folder}" />
681+
</antcall>
682+
<copy file="linux/liblistSerials-1.0.5/arm/liblistSerialsj.so" todir="linux/work/lib/" />
683+
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
684+
685+
</target>
686+
687+
<target name="arm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
688+
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
689+
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
690+
</antcall>
691+
692+
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
693+
<mkdir dir="${staging_folder}/arduino-builder-arm"/>
694+
<antcall target="untar">
695+
<param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
696+
<param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
697+
<param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
698+
<param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
699+
</antcall>
700+
<copy file="${staging_folder}/arduino-builder-arm/arduino-builder" tofile="linux/work/arduino-builder" />
701+
<chmod perm="755" file="linux/work/arduino-builder" />
702+
<move file="${staging_folder}/arduino-builder-arm/tools" tofile="linux/work/tools-builder"/>
703+
<copy todir="linux/work/hardware" overwrite="true">
704+
<fileset dir="${staging_folder}/arduino-builder-arm/hardware" includes="*.txt"/>
705+
</copy>
706+
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
707+
708+
<antcall target="avr-toolchain-bundle">
709+
<param name="unpack_target" value="untar"/>
710+
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
711+
<param name="gcc_version" value="4.8.1-arduino5"/>
712+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
713+
<param name="avrdude_version" value="6.0.1-arduino5"/>
714+
</antcall>
715+
716+
<antcall target="package-library-index-json-bundle"/>
717+
</target>
718+
719+
<target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
654720
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
655721
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
656722
</antcall>
@@ -682,7 +748,7 @@
682748
<antcall target="package-library-index-json-bundle"/>
683749
</target>
684750

685-
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
751+
<target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
686752
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
687753
<param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
688754
</antcall>
@@ -730,6 +796,8 @@
730796

731797
<target name="linux64-run" depends="build,start"/>
732798

799+
<target name="arm-run" depends="build,start"/>
800+
733801
<target name="linux32-start">
734802
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
735803
</target>
@@ -738,6 +806,10 @@
738806
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
739807
</target>
740808

809+
<target name="arm-start">
810+
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
811+
</target>
812+
741813
<!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
742814
<!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
743815
<!-- hardware/tools/${dist_check_file} is checked for existence -->
@@ -822,6 +894,9 @@
822894
<target name="linux64-dist" depends="linux-dist"
823895
description="Build .tar.xz of linux version" />
824896

897+
<target name="arm-dist" depends="linux-dist"
898+
description="Build .tar.xz of linux version" />
899+
825900
<!-- - - - - - - - -->
826901
<!-- Windows -->
827902
<!-- - - - - - - - -->
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0c8070d4dbec5fc9f2d794672402acc3b3c21edd
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
78fd8aa9a98b05c6a8590c43b579322d795fc421

0 commit comments

Comments
 (0)