Skip to content

Commit 0319e59

Browse files
NicoHoodcmaglie
NicoHood
authored and
cmaglie
committed
Added ARM architecture to build.xml
1 parent 248573f commit 0319e59

4 files changed

+80
-2
lines changed

‎build/arduino-builder-arm-1.3.11.tar.bz2.sha

+1
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
@@ -22,27 +22,34 @@
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>
2526

2627
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
2728
<condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
2829
<condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
2930
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
3031
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
3132
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
33+
<condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition>
3234

3335
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
3436
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
3537
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
3638
<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>
3740

3841
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
3942
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
4043
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
4144
<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>
4246

4347
<condition property="arch-bits" value="32">
4448
<equals arg1="${platform}" arg2="linux32"/>
4549
</condition>
50+
<condition property="arch-bits" value="32">
51+
<equals arg1="${platform}" arg2="arm"/>
52+
</condition>
4653
<condition property="arch-bits" value="64">
4754
<equals arg1="${platform}" arg2="linux64"/>
4855
</condition>
@@ -582,7 +589,9 @@
582589
<fileset dir="linux/work" includes="arduino" />
583590
<fileset dir="linux/work" includes="**/*.sh" />
584591
</chmod>
592+
</target>
585593

594+
<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
586595
<antcall target="unzip">
587596
<param name="archive_file" value="./libastylej-2.05.1-2.zip" />
588597
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-2.zip" />
@@ -607,7 +616,64 @@
607616

608617
</target>
609618

610-
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
619+
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
620+
<antcall target="unzip">
621+
<param name="archive_file" value="./libastylej-2.05.1-2.zip" />
622+
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-2.zip" />
623+
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
624+
<param name="dest_folder" value="${staging_folder}" />
625+
</antcall>
626+
<copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
627+
<chmod perm="755" file="linux/work/lib/libastylej.so" />
628+
629+
<antcall target="portable-${portable}">
630+
<param name="parentdir" value="linux/work" />
631+
</antcall>
632+
633+
<antcall target="unzip">
634+
<param name="archive_file" value="./liblistSerials-1.0.5.zip" />
635+
<param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-1.0.5.zip" />
636+
<param name="final_folder" value="${staging_folder}/liblistSerials-1.0.5" />
637+
<param name="dest_folder" value="${staging_folder}" />
638+
</antcall>
639+
<copy file="linux/liblistSerials-1.0.5/arm/liblistSerialsj.so" todir="linux/work/lib/" />
640+
<chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
641+
642+
</target>
643+
644+
<target name="arm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
645+
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
646+
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
647+
</antcall>
648+
649+
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
650+
<mkdir dir="${staging_folder}/arduino-builder-arm"/>
651+
<antcall target="untar">
652+
<param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
653+
<param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
654+
<param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
655+
<param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
656+
</antcall>
657+
<copy file="${staging_folder}/arduino-builder-arm/arduino-builder" tofile="linux/work/arduino-builder" />
658+
<chmod perm="755" file="linux/work/arduino-builder" />
659+
<move file="${staging_folder}/arduino-builder-arm/tools" tofile="linux/work/tools-builder"/>
660+
<copy todir="linux/work/hardware" overwrite="true">
661+
<fileset dir="${staging_folder}/arduino-builder-arm/hardware" includes="*.txt"/>
662+
</copy>
663+
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
664+
665+
<antcall target="avr-toolchain-bundle">
666+
<param name="unpack_target" value="untar"/>
667+
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
668+
<param name="gcc_version" value="4.8.1-arduino5"/>
669+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
670+
<param name="avrdude_version" value="6.0.1-arduino5"/>
671+
</antcall>
672+
673+
<antcall target="package-library-index-json-bundle"/>
674+
</target>
675+
676+
<target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
611677
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
612678
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
613679
</antcall>
@@ -639,7 +705,7 @@
639705
<antcall target="package-library-index-json-bundle"/>
640706
</target>
641707

642-
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
708+
<target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
643709
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
644710
<param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
645711
</antcall>
@@ -687,6 +753,8 @@
687753

688754
<target name="linux64-run" depends="build,start"/>
689755

756+
<target name="arm-run" depends="build,start"/>
757+
690758
<target name="linux32-start">
691759
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
692760
</target>
@@ -695,6 +763,10 @@
695763
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
696764
</target>
697765

766+
<target name="arm-start">
767+
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
768+
</target>
769+
698770
<!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
699771
<!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
700772
<!-- hardware/tools/${dist_check_file} is checked for existence -->
@@ -779,6 +851,9 @@
779851
<target name="linux64-dist" depends="linux-dist"
780852
description="Build .tar.xz of linux version" />
781853

854+
<target name="arm-dist" depends="linux-dist"
855+
description="Build .tar.xz of linux version" />
856+
782857
<!-- - - - - - - - -->
783858
<!-- Windows -->
784859
<!-- - - - - - - - -->

‎build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0c8070d4dbec5fc9f2d794672402acc3b3c21edd

‎build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
78fd8aa9a98b05c6a8590c43b579322d795fc421

0 commit comments

Comments
 (0)