noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build.xml: moved checksum into untar-unzip-checksum

This commit is contained in:
Federico Fissore 2014-10-08 17:16:50 +02:00
parent 00ecd5585d
commit f462191dba
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/build.xml
View File

@ -552,8 +552,7 @@
<get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" />
</target>
<!-- Ensure that the tool is downloaded and test checksums, if everything's ok unzip it on the tools folder -->
<target name="untar" depends="untar-unzip-download" unless="${archive_file}_installed">
<target name="untar-unzip-checksum" depends="untar-unzip-download">
<echo>Testing checksum of "${archive_file}"</echo>
<checksum file="${archive_file}" algorithm="sha" fileext=".sha" verifyproperty="checksum.matches"/>
<condition property="checksum.matches.fail">
@ -564,8 +563,10 @@
File ${archive_file} failed checksum.
Please remove "${archive_file}" to download it again.
</fail>
</target>
<!-- Unzip tool to the destination folder -->
<!-- Ensure that the tool is downloaded and test checksums, if everything's ok unzip it on the tools folder -->
<target name="untar" depends="untar-unzip-checksum" unless="${archive_file}_installed">
<echo>Unzipping into folder ${dest_folder}</echo>
<exec executable="tar">
<arg value="xfz"/>
@ -574,19 +575,7 @@
</exec>
</target>
<target name="unzip" depends="untar-unzip-download" unless="${archive_file}_installed">
<echo>Testing checksum of "${archive_file}"</echo>
<checksum file="${archive_file}" algorithm="sha" fileext=".sha" verifyproperty="checksum.matches"/>
<condition property="checksum.matches.fail">
<equals arg1="${checksum.matches}" arg2="false"/>
</condition>
<fail if="checksum.matches.fail">Checksum failed.
File ${archive_file} failed checksum.
Please remove "${archive_file}" to download it again.
</fail>
<!-- Unzip tool to the destination folder -->
<target name="unzip" depends="untar-unzip-checksum" unless="${archive_file}_installed">
<echo>Unzipping into folder ${dest_folder}</echo>
<mkdir dir="${dest_folder}" />
<exec executable="unzip">