|
100 | 100 | <property name="portable" value="false" />
|
101 | 101 |
|
102 | 102 | <property name="ARDUINO-BUILDER-VERSION" value="1.4.5" />
|
| 103 | + <property name="ARDUINO-CLI-VERSION" value="0.3.4-alpha.preview" /> |
103 | 104 | <property name="LIBLISTSERIAL-VERSION" value="1.4.2" />
|
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" />
|
|
504 | 505 | <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
|
505 | 506 |
|
506 | 507 | <antcall target="build-arduino-builder" />
|
| 508 | + <antcall target="build-arduino-cli" /> |
507 | 509 |
|
508 | 510 | <antcall target="portable-${portable}">
|
509 | 511 | <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
|
|
724 | 726 | </antcall>
|
725 | 727 |
|
726 | 728 | <antcall target="build-arduino-builder" />
|
| 729 | + <antcall target="build-arduino-cli" /> |
727 | 730 |
|
728 | 731 | <antcall target="avr-toolchain-bundle">
|
729 | 732 | <param name="unpack_target" value="untar-native"/>
|
|
766 | 769 | </antcall>
|
767 | 770 |
|
768 | 771 | <antcall target="build-arduino-builder" />
|
| 772 | + <antcall target="build-arduino-cli" /> |
769 | 773 |
|
770 | 774 | <antcall target="avr-toolchain-bundle">
|
771 | 775 | <param name="unpack_target" value="untar-native"/>
|
|
784 | 788 | </antcall>
|
785 | 789 |
|
786 | 790 | <antcall target="build-arduino-builder" />
|
| 791 | + <antcall target="build-arduino-cli" /> |
787 | 792 |
|
788 | 793 | <antcall target="avr-toolchain-bundle">
|
789 | 794 | <param name="unpack_target" value="untar-native"/>
|
|
802 | 807 | </antcall>
|
803 | 808 |
|
804 | 809 | <antcall target="build-arduino-builder" />
|
| 810 | + <antcall target="build-arduino-cli" /> |
805 | 811 |
|
806 | 812 | <antcall target="avr-toolchain-bundle">
|
807 | 813 | <param name="unpack_target" value="untar-native"/>
|
|
850 | 856 | <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
|
851 | 857 | </target>
|
852 | 858 |
|
| 859 | + <target name="build-arduino-cli" unless="no_arduino_cli"> |
| 860 | + <delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/> |
| 861 | + <mkdir dir="${staging_folder}/arduino-cli-${platform}"/> |
| 862 | + <antcall target="untar"> |
| 863 | +<!-- |
| 864 | + <param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" /> |
| 865 | + <param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" /> |
| 866 | + <param name="final_folder" value="${staging_folder}/arduino-cli-${platform}/arduino-cli" /> |
| 867 | + <param name="dest_folder" value="${staging_folder}/arduino-cli-${platform}" /> |
| 868 | +--> |
| 869 | + <param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" /> |
| 870 | + <param name="archive_url" value="https://downloads.arduino.cc/PR/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}.tar.bz2" /> |
| 871 | + <param name="final_folder" value="${staging_folder}/arduino-cli-${platform}/arduino-cli" /> |
| 872 | + <param name="dest_folder" value="${staging_folder}/arduino-cli-${platform}" /> |
| 873 | + </antcall> |
| 874 | + <copy file="${staging_folder}/arduino-cli-${platform}/arduino-cli-${ARDUINO-CLI-VERSION}-${platform}" tofile="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" /> |
| 875 | + <chmod perm="755" file="${staging_folder}/work/${staging_hardware_folder}/../arduino-cli" /> |
| 876 | + <delete dir="${staging_folder}/arduino-cli-${platform}" includeemptydirs="true"/> |
| 877 | + </target> |
| 878 | + |
853 | 879 | <target name="build-arduino-builder" unless="no_arduino_builder">
|
854 | 880 | <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
|
855 | 881 | <mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
|
|
1098 | 1124 | </copy>
|
1099 | 1125 | <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
|
1100 | 1126 |
|
| 1127 | + <delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/> |
| 1128 | + <mkdir dir="${staging_folder}/arduino-cli-windows"/> |
| 1129 | + <antcall target="unzip-with-ant-task"> |
| 1130 | + <param name="archive_file" value="./arduino-cli-${ARDUINO-CLI-VERSION}-windows.zip" /> |
| 1131 | + <param name="archive_url" value="https://downloads.arduino.cc/arduino-cli/arduino-cli-${ARDUINO-CLI-VERSION}-windows.zip" /> |
| 1132 | + <param name="final_folder" value="${staging_folder}/arduino-cli-windows/arduino-cli-${ARDUINO-CLI-VERSION}-windows.exe" /> |
| 1133 | + <param name="dest_folder" value="${staging_folder}/arduino-cli-windows" /> |
| 1134 | + </antcall> |
| 1135 | + <copy file="${staging_folder}/arduino-cli-windows/arduino-cli-${ARDUINO-CLI-VERSION}-windows.exe" tofile="windows/work/arduino-cli.exe" /> |
| 1136 | + <antcall target="make-file-executable"> |
| 1137 | + <param name="file" value="windows/work/arduino-cli.exe" /> |
| 1138 | + </antcall> |
| 1139 | + <delete dir="${staging_folder}/arduino-cli-windows" includeemptydirs="true"/> |
| 1140 | + |
1101 | 1141 | <unzip src="../arduino-core/lib/jna-4.2.2.jar" dest="windows/work/lib">
|
1102 | 1142 | <patternset>
|
1103 | 1143 | <include name="com/sun/jna/win32-x86/jnidispatch.dll"/>
|
1104 | 1144 | </patternset>
|
1105 | 1145 | <mapper type="flatten"/>
|
1106 | 1146 | </unzip>
|
| 1147 | + |
1107 | 1148 | <move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
|
1108 | 1149 | <antcall target="make-file-executable">
|
1109 | 1150 | <param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" />
|
|
0 commit comments