Added arduino-cli to the build (WIP)

cmaglie · facchinm · commit 4f35b22237e6 · 2019-05-14T14:46:29.000+02:00
diff --git a/build/arduino-cli-0.3.4-alpha.preview-linux32.tar.bz2.sha b/build/arduino-cli-0.3.4-alpha.preview-linux32.tar.bz2.sha
@@ -0,0 +1 @@
+18f6669f8a3c328f6a096eb6709a2c1e4c9cdeae
diff --git a/build/arduino-cli-0.3.4-alpha.preview-linux64.tar.bz2.sha b/build/arduino-cli-0.3.4-alpha.preview-linux64.tar.bz2.sha
@@ -0,0 +1 @@
+1309e3bf1685ec5cefbb46cb6397e7c452ac293a
diff --git a/build/arduino-cli-0.3.4-alpha.preview-linuxaarch64.tar.bz2.sha b/build/arduino-cli-0.3.4-alpha.preview-linuxaarch64.tar.bz2.sha
@@ -0,0 +1 @@
+2fd4bd6f4c196e45fa08bb1b6eae27494378708a
diff --git a/build/arduino-cli-0.3.4-alpha.preview-linuxarm.tar.bz2.sha b/build/arduino-cli-0.3.4-alpha.preview-linuxarm.tar.bz2.sha
@@ -0,0 +1 @@
+a4977a3dffb2268eee3328bfa362aa31e8bfbbe9
diff --git a/build/arduino-cli-0.3.4-alpha.preview-macosx.tar.bz2.sha b/build/arduino-cli-0.3.4-alpha.preview-macosx.tar.bz2.sha
@@ -0,0 +1 @@
+47f1beae490e214d2cbde36089fe45e91cc4bd21
diff --git a/build/arduino-cli-0.3.4-alpha.preview-windows.zip.sha b/build/arduino-cli-0.3.4-alpha.preview-windows.zip.sha
@@ -0,0 +1 @@
+30d454fb2d76bf08dd40f61414b809f3538a8d31
diff --git a/build/build.xml b/build/build.xml
@@ -100,6 +100,7 @@
   <property name="portable" value="false" />
 
   <property name="ARDUINO-BUILDER-VERSION" value="1.4.4" />
+  <property name="ARDUINO-CLI-VERSION" value="0.3.4-alpha.preview" />
   <property name="LIBLISTSERIAL-VERSION" value="1.4.2" />
   <property name="AVRGCC-VERSION" value="5.4.0-atmel3.6.1-arduino2" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino14" />
@@ -503,6 +504,7 @@
     <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
 
     <antcall target="build-arduino-builder" />
+    <antcall target="build-arduino-cli" />
 
     <antcall target="portable-${portable}">
       <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
@@ -723,6 +725,7 @@
     </antcall>
 
     <antcall target="build-arduino-builder" />
+    <antcall target="build-arduino-cli" />
 
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar-native"/>
@@ -765,6 +768,7 @@
     </antcall>
 
     <antcall target="build-arduino-builder" />
+    <antcall target="build-arduino-cli" />
 
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar-native"/>
@@ -783,6 +787,7 @@
     </antcall>
 
     <antcall target="build-arduino-builder" />
+    <antcall target="build-arduino-cli" />
 
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar-native"/>
@@ -801,6 +806,7 @@
     </antcall>
 
     <antcall target="build-arduino-builder" />
+    <antcall target="build-arduino-cli" />
 
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar-native"/>
@@ -849,6 +855,26 @@
     <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>
 
+  <target name="build-arduino-cli" unless="no_arduino_cli">
+    <delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/>
+    <mkdir dir="${staging_folder}/arduino-cli-${platform}"/>
+    <antcall target="untar">
+<!--
+      <param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
+      <param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
+      <param name="final_folder" value="${staging_folder}/arduino-cli-${platform}/arduino-cli" />
+      <param name="dest_folder" value="${staging_folder}/arduino-cli-${platform}" />
+-->
+      <param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
+      <param name="archive_url" value="https://downloads.arduino.cc/PR/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" />
+      <param name="final_folder" value="${staging_folder}/arduino-cli-${platform}/arduino-cli" />
+      <param name="dest_folder" value="${staging_folder}/arduino-cli-${platform}" />
+    </antcall>
+    <copy file="${staging_folder}/arduino-cli-${platform}/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}" tofile="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" />
+    <chmod perm="755" file="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" />
+    <delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/>
+  </target>
+
   <target name="build-arduino-builder" unless="no_arduino_builder">
     <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
     <mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
@@ -1097,12 +1123,27 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
 
+    <delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/>
+    <mkdir dir="${staging_folder}/arduino-cli-windows"/>
+    <antcall target="unzip-with-ant-task">
+      <param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-windows.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-windows.zip" />
+      <param name="final_folder" value="${staging_folder}/arduino-cli-windows/arduino-cli-${ARDUINO-CLI-VERSION}-windows.exe" />
+      <param name="dest_folder" value="${staging_folder}/arduino-cli-windows" />
+    </antcall>
+    <copy file="${staging_folder}/arduino-cli-windows/arduino-cli-${ARDUINO-CLI-VERSION}-windows.exe" tofile="windows/work/arduino-cli.exe" />
+    <antcall target="make-file-executable">
+      <param name="file" value="windows/work/arduino-cli.exe" />
+    </antcall>
+    <delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/>
+
     <unzip src="../arduino-core/lib/jna-4.2.2.jar" dest="windows/work/lib">
       <patternset>
         <include name="com/sun/jna/win32-x86/jnidispatch.dll"/>
       </patternset>
       <mapper type="flatten"/>
     </unzip>
+
     <move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
     <antcall target="make-file-executable">
       <param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+18f6669f8a3c328f6a096eb6709a2c1e4c9cdeae`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1309e3bf1685ec5cefbb46cb6397e7c452ac293a`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+2fd4bd6f4c196e45fa08bb1b6eae27494378708a`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+a4977a3dffb2268eee3328bfa362aa31e8bfbbe9`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+47f1beae490e214d2cbde36089fe45e91cc4bd21`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+30d454fb2d76bf08dd40f61414b809f3538a8d31`