|
101 | 101 |
|
102 | 102 | <property name="ARDUINO-BUILDER-VERSION" value="1.5.2" />
|
103 | 103 | <property name="LIBLISTSERIAL-VERSION" value="1.4.2-2" />
|
| 104 | + <property name="ARDUINO-CLI-VERSION" value="0.3.4-alpha.preview" /> |
104 | 105 | <property name="AVRGCC-VERSION" value="7.3.0-atmel3.6.1-arduino5" />
|
105 | 106 | <property name="AVRDUDE-VERSION" value="6.3.0-arduino17" />
|
106 | 107 | <property name="AVRCORE-VERSION" value="1.8.2" />
|
|
514 | 515 |
|
515 | 516 | <property name="ARDUINO-BUILDER-EXTRA-VERSION" value="-signed" />
|
516 | 517 | <antcall target="build-arduino-builder" />
|
| 518 | + <antcall target="build-arduino-cli" /> |
517 | 519 |
|
518 | 520 | <antcall target="portable-${portable}">
|
519 | 521 | <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
|
|
772 | 774 | </antcall>
|
773 | 775 |
|
774 | 776 | <antcall target="build-arduino-builder" />
|
| 777 | + <antcall target="build-arduino-cli" /> |
775 | 778 |
|
776 | 779 | <antcall target="avr-toolchain-bundle">
|
777 | 780 | <param name="unpack_target" value="untar-native"/>
|
|
833 | 836 | </antcall>
|
834 | 837 |
|
835 | 838 | <antcall target="build-arduino-builder" />
|
| 839 | + <antcall target="build-arduino-cli" /> |
836 | 840 |
|
837 | 841 | <antcall target="avr-toolchain-bundle">
|
838 | 842 | <param name="unpack_target" value="untar-native"/>
|
|
851 | 855 | </antcall>
|
852 | 856 |
|
853 | 857 | <antcall target="build-arduino-builder" />
|
| 858 | + <antcall target="build-arduino-cli" /> |
854 | 859 |
|
855 | 860 | <antcall target="avr-toolchain-bundle">
|
856 | 861 | <param name="unpack_target" value="untar-native"/>
|
|
869 | 874 | </antcall>
|
870 | 875 |
|
871 | 876 | <antcall target="build-arduino-builder" />
|
| 877 | + <antcall target="build-arduino-cli" /> |
872 | 878 |
|
873 | 879 | <antcall target="avr-toolchain-bundle">
|
874 | 880 | <param name="unpack_target" value="untar-native"/>
|
|
917 | 923 | <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
|
918 | 924 | </target>
|
919 | 925 |
|
| 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 | + |
920 | 940 | <target name="build-arduino-builder" unless="no_arduino_builder">
|
921 | 941 | <property name="ARDUINO-BUILDER-EXTRA-VERSION" value="" /> <!-- default if not set already -->
|
922 | 942 | <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
|
|
1188 | 1208 | </copy>
|
1189 | 1209 | <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
|
1190 | 1210 |
|
| 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 | + |
1191 | 1225 | <unzip src="../arduino-core/lib/jna-4.2.2.jar" dest="windows/work/lib">
|
1192 | 1226 | <patternset>
|
1193 | 1227 | <include name="com/sun/jna/win32-x86/jnidispatch.dll"/>
|
1194 | 1228 | </patternset>
|
1195 | 1229 | <mapper type="flatten"/>
|
1196 | 1230 | </unzip>
|
| 1231 | + |
1197 | 1232 | <move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
|
1198 | 1233 | <antcall target="make-file-executable">
|
1199 | 1234 | <param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
|
|
0 commit comments