Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding ARM builds #3549

Closed
wants to merge 7 commits into from
Closed

Adding ARM builds #3549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f1bfe1
Added ARM architecture to build.xml (WIP)
CRImier Jun 13, 2015
9c4e110
Modified build.xml to work with ARM arch and download corresponding f…
CRImier Jun 18, 2015
64d158b
Merge branch 'master' of https://github.com/CRImier/Arduino
CRImier Jun 18, 2015
ec6dcee
Fixed libastylej.so naming
CRImier Jun 19, 2015
a855307
...And another quick fix to libastylej naming
CRImier Jun 19, 2015
55e5c8b
Made libastyle unpack a separate branch, since distinction between x8…
CRImier Jul 19, 2015
ba7ef99
Added checksum files for armhf versions of avr-gcc and avrdude packages
CRImier Jul 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 45 additions & 3 deletions build/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<condition property="platform" value="windows"><os family="windows" /></condition>
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
<condition property="platform" value="arm"><os family="unix" arch="arm" /></condition>

<condition property="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
Expand All @@ -27,22 +28,28 @@
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition>

<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="arm" /></condition>

<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><equals arg1="${platform}" arg2="macosx-old" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="arm" /></condition>

<condition property="arch-bits" value="32">
<equals arg1="${platform}" arg2="linux32"/>
</condition>
<condition property="arch-bits" value="32">
<equals arg1="${platform}" arg2="arm"/>
</condition>
<condition property="arch-bits" value="64">
<equals arg1="${platform}" arg2="linux64"/>
</condition>
Expand Down Expand Up @@ -389,7 +396,6 @@
<antcall target="assemble">
<param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
</antcall>

<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
Expand Down Expand Up @@ -640,7 +646,9 @@

<copy todir="linux/work" file="linux/dist/arduino" />
<chmod perm="755" file="linux/work/arduino" />
</target>

<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
Expand All @@ -651,7 +659,34 @@
<chmod perm="755" file="linux/work/lib/libastylej.so" />
</target>

<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
<param name="final_folder" value="${staging_folder}/libastylej" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
<copy file="linux/libastylej/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
<chmod perm="755" file="linux/work/lib/libastylej.so" />
</target>

<target name="arm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
</antcall>

<antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar"/>
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
<param name="gcc_version" value="4.8.1-arduino5"/>
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
</antcall>

<antcall target="package-library-index-json-bundle"/>
</target>

<target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
</antcall>
Expand All @@ -667,7 +702,7 @@
<antcall target="package-library-index-json-bundle"/>
</target>

<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
<target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
<antcall target="linux-jvm-${linux-bundle-jvm-task}">
<param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
</antcall>
Expand Down Expand Up @@ -699,6 +734,10 @@
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
</target>

<target name="arm-run" depends="build" description="Run Linux ARM version">
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
</target>

<target name="linux64-run" depends="build" description="Run Linux (64-bit) version">
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
</target>
Expand Down Expand Up @@ -787,6 +826,9 @@
<target name="linux64-dist" depends="linux-dist"
description="Build .tar.xz of linux version" />

<target name="arm-dist" depends="linux-dist"
description="Build .tar.xz of linux version" />

<!-- - - - - - - - -->
<!-- Windows -->
<!-- - - - - - - - -->
Expand Down
1 change: 1 addition & 0 deletions build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f52585a4f98440ba569a60faf178e272668a5ee7
1 change: 1 addition & 0 deletions build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f65cf0d340fc38dca7d9b20af56bf3523815ceef