Skip to content

Commit 4b7eaf2

Browse files
author
Federico Fissore
committed
build.xml: removed unzip-arm-toolchain
1 parent 82b6e6e commit 4b7eaf2

File tree

1 file changed

+3
-24
lines changed

1 file changed

+3
-24
lines changed

build/build.xml

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
<param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
253253
</antcall>
254254

255-
<antcall target="unzip-arm-toolchain">
255+
<antcall target="unzip-tool">
256256
<param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
257257
<param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
258258
<param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
@@ -486,7 +486,7 @@
486486

487487
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
488488
<!-- Unzip ARM tools -->
489-
<antcall target="unzip-arm-toolchain">
489+
<antcall target="unzip-tool">
490490
<param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
491491
<param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
492492
<param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
@@ -608,27 +608,6 @@
608608
<get src="${dist_url}" dest="${staging_folder}/dist/${dist_file}" verbose="true" ignoreerrors="true" />
609609
</target>
610610

611-
<target name="unzip-arm-toolchain" depends="get-arm-toolchain, check-arm-toolchain"
612-
unless="arm_toolchain_installed">
613-
<checksum file="${staging_folder}/dist/${dist_file}" algorithm="sha"
614-
fileext=".sha" verifyproperty="checksum.matches"/>
615-
<condition property="checksum.matches.fail">
616-
<equals arg1="${checksum.matches}" arg2="false"/>
617-
</condition>
618-
<fail if="checksum.matches.fail">Checksum failed.
619-
620-
File ${dist_file} failed checksum.
621-
Please remove "${staging_folder}/dist/${dist_file}" to download it again.
622-
</fail>
623-
624-
<!-- Unzip toolchain to the destination folder -->
625-
<exec executable="tar">
626-
<arg value="xfz"/>
627-
<arg value="${staging_folder}/dist/${dist_file}"/>
628-
<arg value="--directory=${staging_folder}/work/${staging_hardware_folder}/tools/"/>
629-
</exec>
630-
</target>
631-
632611
<target name="linux-dist" depends="build"
633612
description="Build .tar.gz of linux version">
634613

@@ -792,7 +771,7 @@
792771
</chmod>
793772

794773
<!-- Unzip ARM toolchain -->
795-
<antcall target="unzip-arm-toolchain">
774+
<antcall target="unzip-tool">
796775
<param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
797776
<param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
798777
<param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />

0 commit comments

Comments
 (0)