Skip to content

Commit bc8b9db

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

7 files changed

+41
-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

+35
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101

102102
<property name="ARDUINO-BUILDER-VERSION" value="1.5.2" />
103103
<property name="LIBLISTSERIAL-VERSION" value="1.4.2-2" />
104+
<property name="ARDUINO-CLI-VERSION" value="0.3.4-alpha.preview" />
104105
<property name="AVRGCC-VERSION" value="7.3.0-atmel3.6.1-arduino5" />
105106
<property name="AVRDUDE-VERSION" value="6.3.0-arduino17" />
106107
<property name="AVRCORE-VERSION" value="1.8.2" />
@@ -514,6 +515,7 @@
514515

515516
<property name="ARDUINO-BUILDER-EXTRA-VERSION" value="-signed" />
516517
<antcall target="build-arduino-builder" />
518+
<antcall target="build-arduino-cli" />
517519

518520
<antcall target="portable-${portable}">
519521
<param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
@@ -772,6 +774,7 @@
772774
</antcall>
773775

774776
<antcall target="build-arduino-builder" />
777+
<antcall target="build-arduino-cli" />
775778

776779
<antcall target="avr-toolchain-bundle">
777780
<param name="unpack_target" value="untar-native"/>
@@ -833,6 +836,7 @@
833836
</antcall>
834837

835838
<antcall target="build-arduino-builder" />
839+
<antcall target="build-arduino-cli" />
836840

837841
<antcall target="avr-toolchain-bundle">
838842
<param name="unpack_target" value="untar-native"/>
@@ -851,6 +855,7 @@
851855
</antcall>
852856

853857
<antcall target="build-arduino-builder" />
858+
<antcall target="build-arduino-cli" />
854859

855860
<antcall target="avr-toolchain-bundle">
856861
<param name="unpack_target" value="untar-native"/>
@@ -869,6 +874,7 @@
869874
</antcall>
870875

871876
<antcall target="build-arduino-builder" />
877+
<antcall target="build-arduino-cli" />
872878

873879
<antcall target="avr-toolchain-bundle">
874880
<param name="unpack_target" value="untar-native"/>
@@ -917,6 +923,20 @@
917923
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
918924
</target>
919925

926+
<target name="build-arduino-cli" unless="no_arduino_cli">
927+
<delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/>
928+
<mkdir dir="${staging_folder}/arduino-cli-${platform}"/>
929+
<antcall target="untar-native">
930+
<param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
931+
<param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
932+
<param name="final_folder" value="${staging_folder}/arduino-cli-${platform}/arduino-cli" />
933+
<param name="dest_folder" value="${staging_folder}/arduino-cli-${platform}" />
934+
</antcall>
935+
<copy file="${staging_folder}/arduino-cli-${platform}/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}" tofile="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" />
936+
<chmod perm="755" file="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" />
937+
<delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/>
938+
</target>
939+
920940
<target name="build-arduino-builder" unless="no_arduino_builder">
921941
<property name="ARDUINO-BUILDER-EXTRA-VERSION" value="" /> <!-- default if not set already -->
922942
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
@@ -1188,12 +1208,27 @@
11881208
</copy>
11891209
<delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
11901210

1211+
<delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/>
1212+
<mkdir dir="${staging_folder}/arduino-cli-windows"/>
1213+
<antcall target="unzip-with-ant-task">
1214+
<param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-windows.zip" />
1215+
<param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-windows.zip" />
1216+
<param name="final_folder" value="${staging_folder}/arduino-cli-windows/arduino-cli-${ARDUINO-CLI-VERSION}-windows.exe" />
1217+
<param name="dest_folder" value="${staging_folder}/arduino-cli-windows" />
1218+
</antcall>
1219+
<copy file="${staging_folder}/arduino-cli-windows/arduino-cli-${ARDUINO-CLI-VERSION}-windows.exe" tofile="windows/work/arduino-cli.exe" />
1220+
<antcall target="make-file-executable">
1221+
<param name="file" value="windows/work/arduino-cli.exe" />
1222+
</antcall>
1223+
<delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/>
1224+
11911225
<unzip src="../arduino-core/lib/jna-4.2.2.jar" dest="windows/work/lib">
11921226
<patternset>
11931227
<include name="com/sun/jna/win32-x86/jnidispatch.dll"/>
11941228
</patternset>
11951229
<mapper type="flatten"/>
11961230
</unzip>
1231+
11971232
<move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
11981233
<antcall target="make-file-executable">
11991234
<param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />

0 commit comments

Comments
 (0)