rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Use tar native binary for extraction on unix

Browse Source 
To overcome ant untar behaviour (executable bits being lost)
This commit is contained in:
Martino Facchin 2019-03-22 09:19:43 +01:00 committed by Pieter12345
parent afbf75651f
commit 96e7bc29fc
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/build.xml
View File

@ -512,7 +512,7 @@
<!-- Unzip AVR tools --> <!-- Unzip AVR tools -->
<target name="macosx-build-avr-toolchain" unless="light_bundle"> <target name="macosx-build-avr-toolchain" unless="light_bundle">
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar"/> <param name="unpack_target" value="untar-native"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/> <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/> <param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/> <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
@ -725,7 +725,7 @@
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar"/> <param name="unpack_target" value="untar-native"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/> <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/> <param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/> <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
@ -767,7 +767,7 @@
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar"/> <param name="unpack_target" value="untar-native"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/> <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/> <param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/> <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
@ -785,7 +785,7 @@
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar"/> <param name="unpack_target" value="untar-native"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/> <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/> <param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/> <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
@ -803,7 +803,7 @@
<antcall target="build-arduino-builder" /> <antcall target="build-arduino-builder" />
<antcall target="avr-toolchain-bundle"> <antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar"/> <param name="unpack_target" value="untar-native"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/> <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/> <param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/> <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
@ -852,7 +852,7 @@
<target name="build-arduino-builder" unless="no_arduino_builder"> <target name="build-arduino-builder" unless="no_arduino_builder">
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/> <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
<mkdir dir="${staging_folder}/arduino-builder-${platform}"/> <mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
<antcall target="untar"> <antcall target="untar-native">
<param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" /> <param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" /> <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
<param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" /> <param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />
@ -915,6 +915,14 @@
<echo>Untarring ${archive_file} into folder ${dest_folder}</echo> <echo>Untarring ${archive_file} into folder ${dest_folder}</echo>
<untar src="${archive_file}" dest="${dest_folder}" compression="bzip2"/> <untar src="${archive_file}" dest="${dest_folder}" compression="bzip2"/>
</target> </target>
<target name="untar-native" depends="untar-unzip-checksum" unless="${archive_file}_installed">
<echo>Untarring ${archive_file} into folder ${dest_folder}</echo>
<exec executable="tar" failonerror="true">
<arg value="xf"/>
<arg value="${archive_file}"/>
<arg value="--directory=${dest_folder}"/>
</exec>
</target>
<target name="unzip" depends="untar-unzip-checksum" unless="${archive_file}_installed"> <target name="unzip" depends="untar-unzip-checksum" unless="${archive_file}_installed">
<echo>Unzipping ${archive_file} into folder ${dest_folder}</echo> <echo>Unzipping ${archive_file} into folder ${dest_folder}</echo>
@ -1005,7 +1013,7 @@
</target> </target>
<target name="download-launch4j-linux"> <target name="download-launch4j-linux">
<antcall target="untar"> <antcall target="untar-native">
<param name="archive_file" value="windows/launch4j-3.9-linux.tgz"/> <param name="archive_file" value="windows/launch4j-3.9-linux.tgz"/>
<param name="archive_url" value="https://downloads.arduino.cc/tools/launch4j-3.9-linux.tgz"/> <param name="archive_url" value="https://downloads.arduino.cc/tools/launch4j-3.9-linux.tgz"/>
<param name="final_folder" value="windows/launcher/launch4j"/> <param name="final_folder" value="windows/launcher/launch4j"/>