rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Added arduino-cli to the build (WIP)

Browse Source
This commit is contained in:
Cristian Maglie 2019-01-18 14:40:40 +01:00 committed by Martino Facchin
parent 1f327b9689
commit bc8b9db711
7 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/arduino-cli-0.3.4-alpha.preview-linux32.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
18f6669f8a3c328f6a096eb6709a2c1e4c9cdeae

1
build/arduino-cli-0.3.4-alpha.preview-linux64.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
1309e3bf1685ec5cefbb46cb6397e7c452ac293a

1
build/arduino-cli-0.3.4-alpha.preview-linuxaarch64.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
2fd4bd6f4c196e45fa08bb1b6eae27494378708a

1
build/arduino-cli-0.3.4-alpha.preview-linuxarm.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
a4977a3dffb2268eee3328bfa362aa31e8bfbbe9

1
build/arduino-cli-0.3.4-alpha.preview-macosx.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
47f1beae490e214d2cbde36089fe45e91cc4bd21

1
build/arduino-cli-0.3.4-alpha.preview-windows.zip.sha Normal file
View File

@ -0,0 +1 @@
30d454fb2d76bf08dd40f61414b809f3538a8d31

35
build/build.xml
View File

@ -101,6 +101,7 @@
<property name="ARDUINO-BUILDER-VERSION" value="1.5.2" /> <property name="ARDUINO-BUILDER-VERSION" value="1.5.2" />
<property name="LIBLISTSERIAL-VERSION" value="1.4.2-2" /> <property name="LIBLISTSERIAL-VERSION" value="1.4.2-2" />
<property name="ARDUINO-CLI-VERSION" value="0.3.4-alpha.preview" />
<property name="AVRGCC-VERSION" value="7.3.0-atmel3.6.1-arduino5" /> <property name="AVRGCC-VERSION" value="7.3.0-atmel3.6.1-arduino5" />
<property name="AVRDUDE-VERSION" value="6.3.0-arduino17" /> <property name="AVRDUDE-VERSION" value="6.3.0-arduino17" />
<property name="AVRCORE-VERSION" value="1.8.2" /> <property name="AVRCORE-VERSION" value="1.8.2" />
@ -514,6 +515,7 @@
<property name="ARDUINO-BUILDER-EXTRA-VERSION" value="-signed" /> <property name="ARDUINO-BUILDER-EXTRA-VERSION" value="-signed" />
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="build-arduino-cli" />
<antcall target="portable-${portable}"> <antcall target="portable-${portable}">
<param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." /> <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
@ -772,6 +774,7 @@
</antcall> </antcall>
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="build-arduino-cli" />
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar-native"/> <param name="unpack_target" value="untar-native"/>
@ -833,6 +836,7 @@
</antcall> </antcall>
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="build-arduino-cli" />
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar-native"/> <param name="unpack_target" value="untar-native"/>
@ -851,6 +855,7 @@
</antcall> </antcall>
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="build-arduino-cli" />
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar-native"/> <param name="unpack_target" value="untar-native"/>
@ -869,6 +874,7 @@
</antcall> </antcall>
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="build-arduino-cli" />
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar-native"/> <param name="unpack_target" value="untar-native"/>
@ -917,6 +923,20 @@
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/> <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
</target> </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-native">
<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}" />
</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"> <target name="build-arduino-builder" unless="no_arduino_builder">
<property name="ARDUINO-BUILDER-EXTRA-VERSION" value="" /> <!-- default if not set already --> <property name="ARDUINO-BUILDER-EXTRA-VERSION" value="" /> <!-- default if not set already -->
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/> <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
@ -1188,12 +1208,27 @@
</copy> </copy>
<delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/> <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"> <unzip src="../arduino-core/lib/jna-4.2.2.jar" dest="windows/work/lib">
<patternset> <patternset>
<include name="com/sun/jna/win32-x86/jnidispatch.dll"/> <include name="com/sun/jna/win32-x86/jnidispatch.dll"/>
</patternset> </patternset>
<mapper type="flatten"/> <mapper type="flatten"/>
</unzip> </unzip>
<move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" /> <move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
<antcall target="make-file-executable"> <antcall target="make-file-executable">
<param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" /> <param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />