Skip to content

Commit 6f1bfe1

Browse files
committed
Added ARM architecture to build.xml (WIP)
1 parent 64fcc71 commit 6f1bfe1

File tree

1 file changed

+30
-1
lines changed

1 file changed

+30
-1
lines changed

Diff for: build/build.xml

+30-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<condition property="platform" value="windows"><os family="windows" /></condition>
2020
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
2121
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
22+
<condition property="platform" value="arm"><os family="unix" arch="arm" /></condition>
2223

2324
<condition property="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
2425
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
@@ -27,22 +28,28 @@
2728
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
2829
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
2930
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
31+
<condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition>
3032

3133
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
3234
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
3335
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
3436
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
3537
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
38+
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="arm" /></condition>
3639

3740
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
3841
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><equals arg1="${platform}" arg2="macosx-old" /></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>
@@ -389,7 +396,6 @@
389396
<antcall target="assemble">
390397
<param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
391398
</antcall>
392-
393399
<antcall target="unzip">
394400
<param name="archive_file" value="./libastylej-2.05.zip" />
395401
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
@@ -641,16 +647,35 @@
641647
<copy todir="linux/work" file="linux/dist/arduino" />
642648
<chmod perm="755" file="linux/work/arduino" />
643649

650+
<!--
644651
<antcall target="unzip">
645652
<param name="archive_file" value="./libastylej-2.05.zip" />
646653
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
647654
<param name="final_folder" value="${staging_folder}/libastylej" />
648655
<param name="dest_folder" value="${staging_folder}" />
649656
</antcall>
650657
<copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
658+
-->
659+
<copy file="/usr/lib/jni/libastylej.so" tofile="linux/work/lib/libastylej.so" />
651660
<chmod perm="755" file="linux/work/lib/libastylej.so" />
652661
</target>
653662

663+
<target name="arm-build" depends="linux-build" description="Build linux (32-bit) version">
664+
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
665+
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
666+
</antcall>
667+
668+
<antcall target="avr-toolchain-bundle">
669+
<param name="unpack_target" value="untar"/>
670+
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
671+
<param name="gcc_version" value="4.8.1-arduino5"/>
672+
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
673+
<param name="avrdude_version" value="6.0.1-arduino5"/>
674+
</antcall>
675+
676+
<antcall target="package-library-index-json-bundle"/>
677+
</target>
678+
654679
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
655680
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
656681
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
@@ -699,6 +724,10 @@
699724
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
700725
</target>
701726

727+
<target name="arm-run" depends="build" description="Run Linux ARM (32-bit) version">
728+
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
729+
</target>
730+
702731
<target name="linux64-run" depends="build" description="Run Linux (64-bit) version">
703732
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
704733
</target>

0 commit comments

Comments
 (0)