rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

build.xml: tar autodetects archive type, removing "z" flag

Browse Source
This commit is contained in:
Federico Fissore 2014-10-08 17:25:53 +02:00
parent f462191dba
commit f60745485f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/build.xml
View File

@ -569,7 +569,7 @@
<target name="untar" depends="untar-unzip-checksum" unless="${archive_file}_installed"> <target name="untar" depends="untar-unzip-checksum" unless="${archive_file}_installed">
<echo>Unzipping into folder ${dest_folder}</echo> <echo>Unzipping into folder ${dest_folder}</echo>
<exec executable="tar"> <exec executable="tar">
<arg value="xfz"/> <arg value="xf"/>
<arg value="${archive_file}"/> <arg value="${archive_file}"/>
<arg value="--directory=${dest_folder}"/> <arg value="--directory=${dest_folder}"/>
</exec> </exec>
@ -617,7 +617,6 @@
<move file="linux/work" tofile="linux/arduino-${version}" /> <move file="linux/work" tofile="linux/arduino-${version}" />
<exec executable="tar" dir="linux"> <exec executable="tar" dir="linux">
<arg value="-z"/>
<arg value="-c"/> <arg value="-c"/>
<arg value="-f"/> <arg value="-f"/>
<arg value="arduino-${version}-${platform}.tgz"/> <arg value="arduino-${version}-${platform}.tgz"/>
@ -674,7 +673,7 @@
<get src="http://switch.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-linux.tgz" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" /> <get src="http://switch.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-linux.tgz" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
<exec executable="tar" dir="windows/launcher"> <exec executable="tar" dir="windows/launcher">
<arg value="-xzf"/> <arg value="-xf"/>
<arg value="../launch4j-3.0.2-linux.tgz"/> <arg value="../launch4j-3.0.2-linux.tgz"/>
</exec> </exec>
</target> </target>