|
252 | 252 | <param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
|
253 | 253 | </antcall>
|
254 | 254 |
|
255 |
| - <antcall target="unzip-arm-toolchain"> |
| 255 | + <antcall target="unzip-tool"> |
256 | 256 | <param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
|
257 | 257 | <param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
|
258 | 258 | <param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
|
|
486 | 486 |
|
487 | 487 | <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
|
488 | 488 | <!-- Unzip ARM tools -->
|
489 |
| - <antcall target="unzip-arm-toolchain"> |
| 489 | + <antcall target="unzip-tool"> |
490 | 490 | <param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
|
491 | 491 | <param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
|
492 | 492 | <param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
|
|
608 | 608 | <get src="${dist_url}" dest="${staging_folder}/dist/${dist_file}" verbose="true" ignoreerrors="true" />
|
609 | 609 | </target>
|
610 | 610 |
|
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 |
| - |
632 | 611 | <target name="linux-dist" depends="build"
|
633 | 612 | description="Build .tar.gz of linux version">
|
634 | 613 |
|
|
792 | 771 | </chmod>
|
793 | 772 |
|
794 | 773 | <!-- Unzip ARM toolchain -->
|
795 |
| - <antcall target="unzip-arm-toolchain"> |
| 774 | + <antcall target="unzip-tool"> |
796 | 775 | <param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
|
797 | 776 | <param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
|
798 | 777 | <param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
|
|
0 commit comments