Skip to content

Commit 4b20898

Browse files
cmagliecmaglie
committed
Added arduino-cli 0.6.0 to the build
1 parent aa50ec3 commit 4b20898

7 files changed

+48
-0
lines changed

‎build/arduino-cli_0.6.0_Linux_32bit.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c56c601c079ab515225f6bd38de4e201ae2cda6e

‎build/arduino-cli_0.6.0_Linux_64bit.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5d1a4721fb827e2759a114bc2cf9b0c384f1e84e

‎build/arduino-cli_0.6.0_Linux_ARM64.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3fefbf1657f248efc3d11c16cb53389054935ac4

‎build/arduino-cli_0.6.0_Linux_ARMv7.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
76f5ede75caccc870ed9cefd592959d93d3ad0f6

‎build/arduino-cli_0.6.0_Windows_32bit.zip.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4f4b92c0707dab4c1e8b2e28d344979eeaaa497a

‎build/arduino-cli_0.6.0_macOS_64bit.tar.bz2.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
479ecad6fc3abdbc51072024cfc33cfc27771200

‎build/build.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@
2525
<condition property="platform" value="linuxarm"><os family="unix" arch="arm" /></condition>
2626
<condition property="platform" value="linuxaarch64"><os family="unix" arch="aarch64" /></condition>
2727

28+
<condition property="platform_ext" value="macOS_64bit" ><equals arg1="${platform}" arg2="macosx" /></condition>
29+
<condition property="platform_ext" value="Windows_32bit"><equals arg1="${platform}" arg2="windows" /></condition>
30+
<condition property="platform_ext" value="Linux_32bit" ><equals arg1="${platform}" arg2="linux32" /></condition>
31+
<condition property="platform_ext" value="Linux_64bit" ><equals arg1="${platform}" arg2="linux64" /></condition>
32+
<condition property="platform_ext" value="Linux_ARMv7" ><equals arg1="${platform}" arg2="linuxarm" /></condition>
33+
<condition property="platform_ext" value="Linux_ARM64" ><equals arg1="${platform}" arg2="linuxaarch64" /></condition>
34+
2835
<condition property="windows_host" value="true"><os family="windows" /></condition>
2936

3037
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
@@ -100,6 +107,7 @@
100107
<property name="portable" value="false" />
101108

102109
<property name="ARDUINO-BUILDER-VERSION" value="1.5.4" />
110+
<property name="ARDUINO-CLI-VERSION" value="0.6.0" />
103111
<property name="LIBLISTSERIAL-VERSION" value="1.4.2-2" />
104112
<property name="AVRGCC-VERSION" value="7.3.0-atmel3.6.1-arduino7" />
105113
<property name="AVRDUDE-VERSION" value="6.3.0-arduino17" />
@@ -492,6 +500,7 @@
492500

493501
<property name="ARDUINO-BUILDER-EXTRA-VERSION" value="-signed" />
494502
<antcall target="build-arduino-builder" />
503+
<antcall target="build-arduino-cli" />
495504

496505
<antcall target="portable-${portable}">
497506
<param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
@@ -714,6 +723,7 @@
714723
</antcall>
715724

716725
<antcall target="build-arduino-builder" />
726+
<antcall target="build-arduino-cli" />
717727

718728
<antcall target="avr-toolchain-bundle">
719729
<param name="unpack_target" value="untar-native"/>
@@ -756,6 +766,7 @@
756766
</antcall>
757767

758768
<antcall target="build-arduino-builder" />
769+
<antcall target="build-arduino-cli" />
759770

760771
<antcall target="avr-toolchain-bundle">
761772
<param name="unpack_target" value="untar-native"/>
@@ -774,6 +785,7 @@
774785
</antcall>
775786

776787
<antcall target="build-arduino-builder" />
788+
<antcall target="build-arduino-cli" />
777789

778790
<antcall target="avr-toolchain-bundle">
779791
<param name="unpack_target" value="untar-native"/>
@@ -792,6 +804,7 @@
792804
</antcall>
793805

794806
<antcall target="build-arduino-builder" />
807+
<antcall target="build-arduino-cli" />
795808

796809
<antcall target="avr-toolchain-bundle">
797810
<param name="unpack_target" value="untar-native"/>
@@ -840,6 +853,20 @@
840853
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
841854
</target>
842855

856+
<target name="build-arduino-cli" unless="no_arduino_cli">
857+
<delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/>
858+
<mkdir dir="${staging_folder}/arduino-cli-${platform}"/>
859+
<antcall target="untar-native">
860+
<param name="archive_file" value="./arduino-cli_${ARDUINO-CLI-VERSION}_${platform_ext}.tar.bz2" />
861+
<param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli_${ARDUINO-CLI-VERSION}_${platform_ext}.tar.gz" />
862+
<param name="final_folder" value="${staging_folder}/arduino-cli-${platform}/arduino-cli" />
863+
<param name="dest_folder" value="${staging_folder}/arduino-cli-${platform}" />
864+
</antcall>
865+
<copy file="${staging_folder}/arduino-cli-${platform}/arduino-cli" tofile="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" />
866+
<chmod perm="755" file="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" />
867+
<delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/>
868+
</target>
869+
843870
<target name="build-arduino-builder" unless="no_arduino_builder">
844871
<property name="ARDUINO-BUILDER-EXTRA-VERSION" value="" /> <!-- default if not set already -->
845872
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
@@ -1089,12 +1116,27 @@
10891116
</copy>
10901117
<delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
10911118

1119+
<delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/>
1120+
<mkdir dir="${staging_folder}/arduino-cli-windows"/>
1121+
<antcall target="unzip">
1122+
<param name="archive_file" value="./arduino-cli_${ARDUINO-CLI-VERSION}_Windows_32bit.zip" />
1123+
<param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli_${ARDUINO-CLI-VERSION}_Windows_32bit.zip" />
1124+
<param name="final_folder" value="${staging_folder}/arduino-cli-windows/arduino-cli_${ARDUINO-CLI-VERSION}_Windows_32bit.exe" />
1125+
<param name="dest_folder" value="${staging_folder}/arduino-cli-windows" />
1126+
</antcall>
1127+
<copy file="${staging_folder}/arduino-cli-windows/arduino-cli.exe" tofile="windows/work/arduino-cli.exe" />
1128+
<antcall target="make-file-executable">
1129+
<param name="file" value="windows/work/arduino-cli.exe" />
1130+
</antcall>
1131+
<delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/>
1132+
10921133
<unzip src="../arduino-core/lib/jna-4.2.2.jar" dest="windows/work/lib">
10931134
<patternset>
10941135
<include name="com/sun/jna/win32-x86/jnidispatch.dll"/>
10951136
</patternset>
10961137
<mapper type="flatten"/>
10971138
</unzip>
1139+
10981140
<move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
10991141
<antcall target="make-file-executable">
11001142
<param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />

0 commit comments

Comments
 (0)