Skip to content

Commit eefcef1

Browse files
cmagliefacchinm
authored andcommitted
Added arduino-cli to the build (WIP)
1 parent f52fc1f commit eefcef1

7 files changed

+46
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18f6669f8a3c328f6a096eb6709a2c1e4c9cdeae
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1309e3bf1685ec5cefbb46cb6397e7c452ac293a
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2fd4bd6f4c196e45fa08bb1b6eae27494378708a
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a4977a3dffb2268eee3328bfa362aa31e8bfbbe9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
47f1beae490e214d2cbde36089fe45e91cc4bd21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
30d454fb2d76bf08dd40f61414b809f3538a8d31

build/build.xml

+40
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<property name="portable" value="false" />
101101

102102
<property name="ARDUINO-BUILDER-VERSION" value="1.4.3" />
103+
<property name="ARDUINO-CLI-VERSION" value="0.3.4-alpha.preview" />
103104
<property name="LIBLISTSERIAL-VERSION" value="1.4.2" />
104105
<property name="AVRGCC-VERSION" value="5.4.0-atmel3.6.1-arduino2" />
105106
<property name="AVRDUDE-VERSION" value="6.3.0-arduino14" />
@@ -487,6 +488,7 @@
487488
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
488489

489490
<antcall target="build-arduino-builder" />
491+
<antcall target="build-arduino-cli" />
490492

491493
<antcall target="portable-${portable}">
492494
<param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
@@ -709,6 +711,7 @@
709711
</antcall>
710712

711713
<antcall target="build-arduino-builder" />
714+
<antcall target="build-arduino-cli" />
712715

713716
<antcall target="avr-toolchain-bundle">
714717
<param name="unpack_target" value="untar"/>
@@ -751,6 +754,7 @@
751754
</antcall>
752755

753756
<antcall target="build-arduino-builder" />
757+
<antcall target="build-arduino-cli" />
754758

755759
<antcall target="avr-toolchain-bundle">
756760
<param name="unpack_target" value="untar"/>
@@ -769,6 +773,7 @@
769773
</antcall>
770774

771775
<antcall target="build-arduino-builder" />
776+
<antcall target="build-arduino-cli" />
772777

773778
<antcall target="avr-toolchain-bundle">
774779
<param name="unpack_target" value="untar"/>
@@ -787,6 +792,7 @@
787792
</antcall>
788793

789794
<antcall target="build-arduino-builder" />
795+
<antcall target="build-arduino-cli" />
790796

791797
<antcall target="avr-toolchain-bundle">
792798
<param name="unpack_target" value="untar"/>
@@ -835,6 +841,26 @@
835841
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
836842
</target>
837843

844+
<target name="build-arduino-cli" unless="no_arduino_cli">
845+
<delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/>
846+
<mkdir dir="${staging_folder}/arduino-cli-${platform}"/>
847+
<antcall target="untar">
848+
<!--
849+
<param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
850+
<param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
851+
<param name="final_folder" value="${staging_folder}/arduino-cli-${platform}/arduino-cli" />
852+
<param name="dest_folder" value="${staging_folder}/arduino-cli-${platform}" />
853+
-->
854+
<param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
855+
<param name="archive_url" value="https://downloads.arduino.cc/PR/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
856+
<param name="final_folder" value="${staging_folder}/arduino-cli-${platform}/arduino-cli" />
857+
<param name="dest_folder" value="${staging_folder}/arduino-cli-${platform}" />
858+
</antcall>
859+
<copy file="${staging_folder}/arduino-cli-${platform}/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}" tofile="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" />
860+
<chmod perm="755" file="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" />
861+
<delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/>
862+
</target>
863+
838864
<target name="build-arduino-builder" unless="no_arduino_builder">
839865
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
840866
<mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
@@ -1087,6 +1113,20 @@
10871113
</copy>
10881114
<delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
10891115

1116+
<delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/>
1117+
<mkdir dir="${staging_folder}/arduino-cli-windows"/>
1118+
<antcall target="unzip-with-ant-task">
1119+
<param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-windows.zip" />
1120+
<param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-windows.zip" />
1121+
<param name="final_folder" value="${staging_folder}/arduino-cli-windows/arduino-cli-${ARDUINO-CLI-VERSION}-windows.exe" />
1122+
<param name="dest_folder" value="${staging_folder}/arduino-cli-windows" />
1123+
</antcall>
1124+
<copy file="${staging_folder}/arduino-cli-windows/arduino-cli-${ARDUINO-CLI-VERSION}-windows.exe" tofile="windows/work/arduino-cli.exe" />
1125+
<antcall target="make-file-executable">
1126+
<param name="file" value="windows/work/arduino-cli.exe" />
1127+
</antcall>
1128+
<delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/>
1129+
10901130
<exec executable="unzip" failonerror="true">
10911131
<arg value="-q" />
10921132
<arg value="-n" />

0 commit comments

Comments
 (0)