|
512 | 512 | <!-- Unzip AVR tools -->
|
513 | 513 | <target name="macosx-build-avr-toolchain" unless="light_bundle">
|
514 | 514 | <antcall target="avr-toolchain-bundle">
|
515 |
| - <param name="unpack_target" value="untar"/> |
| 515 | + <param name="unpack_target" value="untar-native"/> |
516 | 516 | <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
|
517 | 517 | <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
518 | 518 | <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
|
|
725 | 725 | <antcall target="build-arduino-builder" />
|
726 | 726 |
|
727 | 727 | <antcall target="avr-toolchain-bundle">
|
728 |
| - <param name="unpack_target" value="untar"/> |
| 728 | + <param name="unpack_target" value="untar-native"/> |
729 | 729 | <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
|
730 | 730 | <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
731 | 731 | <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
|
|
767 | 767 | <antcall target="build-arduino-builder" />
|
768 | 768 |
|
769 | 769 | <antcall target="avr-toolchain-bundle">
|
770 |
| - <param name="unpack_target" value="untar"/> |
| 770 | + <param name="unpack_target" value="untar-native"/> |
771 | 771 | <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
|
772 | 772 | <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
773 | 773 | <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
|
|
785 | 785 | <antcall target="build-arduino-builder" />
|
786 | 786 |
|
787 | 787 | <antcall target="avr-toolchain-bundle">
|
788 |
| - <param name="unpack_target" value="untar"/> |
| 788 | + <param name="unpack_target" value="untar-native"/> |
789 | 789 | <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
|
790 | 790 | <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
791 | 791 | <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
|
|
803 | 803 | <antcall target="build-arduino-builder" />
|
804 | 804 |
|
805 | 805 | <antcall target="avr-toolchain-bundle">
|
806 |
| - <param name="unpack_target" value="untar"/> |
| 806 | + <param name="unpack_target" value="untar-native"/> |
807 | 807 | <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
|
808 | 808 | <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
809 | 809 | <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
|
|
852 | 852 | <target name="build-arduino-builder" unless="no_arduino_builder">
|
853 | 853 | <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
|
854 | 854 | <mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
|
855 |
| - <antcall target="untar"> |
| 855 | + <antcall target="untar-native"> |
856 | 856 | <param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
|
857 | 857 | <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
|
858 | 858 | <param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />
|
|
915 | 915 | <echo>Untarring ${archive_file} into folder ${dest_folder}</echo>
|
916 | 916 | <untar src="${archive_file}" dest="${dest_folder}" compression="bzip2"/>
|
917 | 917 | </target>
|
| 918 | + <target name="untar-native" depends="untar-unzip-checksum" unless="${archive_file}_installed"> |
| 919 | + <echo>Untarring ${archive_file} into folder ${dest_folder}</echo> |
| 920 | + <exec executable="tar" failonerror="true"> |
| 921 | + <arg value="xf"/> |
| 922 | + <arg value="${archive_file}"/> |
| 923 | + <arg value="--directory=${dest_folder}"/> |
| 924 | + </exec> |
| 925 | + </target> |
918 | 926 |
|
919 | 927 | <target name="unzip" depends="untar-unzip-checksum" unless="${archive_file}_installed">
|
920 | 928 | <echo>Unzipping ${archive_file} into folder ${dest_folder}</echo>
|
|
1005 | 1013 | </target>
|
1006 | 1014 |
|
1007 | 1015 | <target name="download-launch4j-linux">
|
1008 |
| - <antcall target="untar"> |
| 1016 | + <antcall target="untar-native"> |
1009 | 1017 | <param name="archive_file" value="windows/launch4j-3.9-linux.tgz"/>
|
1010 | 1018 | <param name="archive_url" value="https://downloads.arduino.cc/tools/launch4j-3.9-linux.tgz"/>
|
1011 | 1019 | <param name="final_folder" value="windows/launcher/launch4j"/>
|
|
0 commit comments