Skip to content

Commit 576e882

Browse files
NicoHoodNicoHood
committed
Added ARM architecture to build.xml
1 parent ff13b30 commit 576e882

File tree

1 file changed

+63
-2
lines changed

1 file changed

+63
-2
lines changed

Diff for: ‎build/build.xml

+63-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>
@@ -572,7 +579,9 @@
572579
<fileset dir="linux/work" includes="arduino" />
573580
<fileset dir="linux/work" includes="**/*.sh" />
574581
</chmod>
582+
</target>
575583

584+
<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
576585
<antcall target="unzip">
577586
<param name="archive_file" value="./libastylej-2.05.1.zip" />
578587
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
@@ -587,7 +596,50 @@
587596
</antcall>
588597
</target>
589598

590-
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
599+
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
600+
<antcall target="unzip">
601+
<param name="archive_file" value="./libastylej-2.05.1.zip" />
602+
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
603+
<param name="final_folder" value="${staging_folder}/libastylej" />
604+
<param name="dest_folder" value="${staging_folder}" />
605+
</antcall>
606+
<copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
607+
<chmod perm="755" file="linux/work/lib/libastylej.so" />
608+
</target>
609+
610+
<target name="arm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
611+
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
612+
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
613+
</antcall>
614+
615+
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
616+
<mkdir dir="${staging_folder}/arduino-builder-arm"/>
617+
<antcall target="untar">
618+
<param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
619+
<param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
620+
<param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
621+
<param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
622+
</antcall>
623+
<copy file="${staging_folder}/arduino-builder-arm/arduino-builder" tofile="linux/work/arduino-builder" />
624+
<chmod perm="755" file="linux/work/arduino-builder" />
625+
<move file="${staging_folder}/arduino-builder-arm/tools" tofile="linux/work/tools-builder"/>
626+
<copy todir="linux/work/hardware" overwrite="true">
627+
<fileset dir="${staging_folder}/arduino-builder-arm/hardware" includes="*.txt"/>
628+
</copy>
629+
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
630+
631+
<antcall target="avr-toolchain-bundle">
632+
<param name="unpack_target" value="untar"/>
633+
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
634+
<param name="gcc_version" value="4.8.1-arduino5"/>
635+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
636+
<param name="avrdude_version" value="6.0.1-arduino5"/>
637+
</antcall>
638+
639+
<antcall target="package-library-index-json-bundle"/>
640+
</target>
641+
642+
<target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
591643
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
592644
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
593645
</antcall>
@@ -619,7 +671,7 @@
619671
<antcall target="package-library-index-json-bundle"/>
620672
</target>
621673

622-
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
674+
<target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
623675
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
624676
<param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
625677
</antcall>
@@ -667,6 +719,8 @@
667719

668720
<target name="linux64-run" depends="build,start"/>
669721

722+
<target name="arm-run" depends="build,start"/>
723+
670724
<target name="linux32-start">
671725
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
672726
</target>
@@ -675,6 +729,10 @@
675729
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
676730
</target>
677731

732+
<target name="arm-start">
733+
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
734+
</target>
735+
678736
<!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
679737
<!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
680738
<!-- hardware/tools/${dist_check_file} is checked for existence -->
@@ -759,6 +817,9 @@
759817
<target name="linux64-dist" depends="linux-dist"
760818
description="Build .tar.xz of linux version" />
761819

820+
<target name="arm-dist" depends="linux-dist"
821+
description="Build .tar.xz of linux version" />
822+
762823
<!-- - - - - - - - -->
763824
<!-- Windows -->
764825
<!-- - - - - - - - -->

0 commit comments

Comments
 (0)