From 960c517b51c9e62bcf10bcabe5d0c2cf9e5424fd Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Sat, 3 Aug 2013 02:10:59 +0200
Subject: [PATCH] Updated ARM gcc for win32 and macos to version 4.7.4

---
 build/build.xml                               | 123 +++++-------------
 ...one-eabi-4.4.1-2010q1-188-macos.tar.gz.sha |   1 -
 ...-arm-none-eabi-4.7.4-2013q2-mac.tar.gz.sha |   1 +
 ...one-eabi-4.4.1-2010q1-188-win32.tar.gz.sha |   1 -
 ...-none-eabi-4.7.4-2013q2-windows.tar.gz.sha |   1 +
 5 files changed, 37 insertions(+), 90 deletions(-)
 delete mode 100644 build/macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz.sha
 create mode 100644 build/macosx/dist/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz.sha
 delete mode 100644 build/windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz.sha
 create mode 100644 build/windows/dist/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz.sha

diff --git a/build/build.xml b/build/build.xml
index 0bebb4376..9f93f9ff1 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -16,6 +16,16 @@
   <condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
   <condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
 
+  <condition property="staging_folder" value="macosx"><os family="mac" /></condition>
+  <condition property="staging_folder" value="windows"><os family="windows" /></condition>
+  <condition property="staging_folder" value="linux"><os family="unix" arch="i386" /></condition>
+  <condition property="staging_folder" value="linux"><os family="unix" arch="amd64" /></condition>
+
+  <condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><os family="mac" /></condition>
+  <condition property="staging_hardware_folder" value="hardware"><os family="windows" /></condition>
+  <condition property="staging_hardware_folder" value="hardware"><os family="unix" arch="i386" /></condition>
+  <condition property="staging_hardware_folder" value="hardware"><os family="unix" arch="amd64" /></condition>
+
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
     <include name="core/core.jar" />
@@ -174,7 +184,7 @@
     <fail message="wrong platform (${os.name})" />
   </target>
 
-  <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build, macosx-check-arm-toolchain" description="Build Mac OS X version">
+  <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
     <mkdir dir="macosx/work" />
 
     <!-- assemble the pde -->
@@ -223,7 +233,11 @@
       <param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
     </antcall>
 
-    <antcall target="macosx-unzip-arm-toolchain" />
+    <antcall target="unzip-arm-toolchain">
+      <param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz" />
+      <param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz" />
+      <param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
+    </antcall>
 
     <delete includeEmptyDirs="true" quiet="true">
       <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools" includes="**/3.4.6/**/*"/>
@@ -241,42 +255,6 @@
     <exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="false"/>
   </target>
 
-  <target name="macosx-check-arm-toolchain-distfile">
-    <available file="macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" property="arm_distfile_available" />
-  </target>
-
-  <target name="macosx-get-arm-toolchain" depends="macosx-check-arm-toolchain-distfile" unless="arm_distfile_available">
-    <!-- Retrieve ARM toolchain -->
-    <get
-      src="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz"
-      dest="macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" verbose="true" />
-  </target>
-
-  <target name="macosx-check-arm-toolchain">
-    <available file="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/g++_arm_none_eabi"
-      property="arm_available" />
-  </target>
-
-  <target name="macosx-unzip-arm-toolchain" depends="macosx-get-arm-toolchain, macosx-check-arm-toolchain" unless="arm_available">
-    <checksum file="macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" 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 gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz failed checksum.
-      Please remove "macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" to download it again.
-    </fail>
-
-    <!-- ...and unzip on the destination folder -->
-    <exec executable="tar" output="/dev/null">
-      <arg value="xfz"/>
-      <arg value="macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz"/>
-      <arg value="--directory=macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/"/>
-    </exec>
-  </target>
-
   <!-- - - - - - - - - - - - - - - - -->
   <!-- Sign application for MacOSX.  -->
   <!-- - - - - - - - - - - - - - - - -->
@@ -475,7 +453,7 @@
 
   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
     <!-- Unzip ARM tools -->
-    <antcall target="linux-unzip-arm-toolchain">
+    <antcall target="unzip-arm-toolchain">
       <param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-linux32.tar.gz" />
       <param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-linux32.tar.gz" />
       <param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
@@ -495,7 +473,7 @@
     <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
 
     <!-- Unzip ARM tools -->
-    <antcall target="linux-unzip-arm-toolchain">
+    <antcall target="unzip-arm-toolchain">
       <param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-linux64.tar.gz" />
       <param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-linux64.tar.gz" />
       <param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
@@ -516,21 +494,21 @@
     <exec executable="./linux/work/arduino" spawn="false"/>
   </target>
 
-  <!-- Set 'arm_disfile_available' property if ARM toolchain dist_file is downloaded -->
+  <!-- Set 'arm_disfile_available' property if ARM toolchain dist_file is downloaded             -->
   <!-- Set 'arm_toolchain_installed' property if ARM toolchain is installed in working directory -->
-  <target name="linux-check-arm-toolchain">
-    <available file="linux/dist/${dist_file}" property="arm_distfile_available" />
-    <available file="linux/work/hardware/tools/${dist_check_file}" property="arm_toolchain_installed" />
+  <target name="check-arm-toolchain">
+    <available file="${staging_folder}/dist/${dist_file}" property="arm_distfile_available" />
+    <available file="${staging_folder}/work/hardware/tools/${dist_check_file}" property="arm_toolchain_installed" />
   </target>
 
   <!-- Retrieve ARM toolchain -->
-  <target name="linux-get-arm-toolchain" depends="linux-check-arm-toolchain" unless="arm_distfile_available">
-    <get src="${dist_url}" dest="linux/dist/${dist_file}" verbose="true" />
+  <target name="get-arm-toolchain" depends="check-arm-toolchain" unless="arm_distfile_available">
+    <get src="${dist_url}" dest="${staging_folder}/dist/${dist_file}" verbose="true" />
   </target>
 
-  <target name="linux-unzip-arm-toolchain" depends="linux-get-arm-toolchain, linux-check-arm-toolchain"
+  <target name="unzip-arm-toolchain" depends="get-arm-toolchain, check-arm-toolchain"
       unless="arm_toolchain_installed">
-    <checksum file="linux/dist/${dist_file}" algorithm="sha"
+    <checksum file="${staging_folder}/dist/${dist_file}" algorithm="sha"
       fileext=".sha" verifyproperty="checksum.matches"/>
     <condition property="checksum.matches.fail">
       <equals arg1="${checksum.matches}" arg2="false"/>
@@ -538,14 +516,14 @@
     <fail if="checksum.matches.fail">Checksum failed.
 
       File ${dist_file} failed checksum.
-      Please remove "linux/dist/${dist_file}" to download it again.
+      Please remove "${staging_folder}/dist/${dist_file}" to download it again.
     </fail>
 
     <!-- Unzip toolchain to the destination folder -->
     <exec executable="tar" output="/dev/null" os="Linux">
       <arg value="xfz"/>
-      <arg value="linux/dist/${dist_file}"/>
-      <arg value="--directory=linux/work/hardware/tools"/>
+      <arg value="${staging_folder}/dist/${dist_file}"/>
+      <arg value="--directory=${staging_folder}/work/${staging_hardware_folder}/tools/"/>
     </exec>
   </target>
 
@@ -690,7 +668,12 @@
       <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
     </chmod>
 
-    <antcall target="windows-unzip-arm-toolchain" />
+    <!-- Unzip ARM toolchain -->
+    <antcall target="unzip-arm-toolchain">
+      <param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz" />
+      <param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz" />
+      <param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
+    </antcall>
 
     <delete includeEmptyDirs="true" quiet="true">
       <fileset dir="windows/work/hardware/tools/avr/doc" />
@@ -703,42 +686,6 @@
 	  dir="windows/work" spawn="true"/>
   </target>
 
-  <target name="windows-check-arm-toolchain-distfile">
-    <available file="windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" property="arm_distfile_available" />
-  </target>
-
-  <target name="windows-get-arm-toolchain" depends="windows-check-arm-toolchain-distfile" unless="arm_distfile_available">
-    <!-- Retrieve ARM toolchain -->
-    <get
-      src="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz"
-      dest="windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz"
-      verbose="true" />
-  </target>
-
-  <target name="windows-check-arm-toolchain">
-    <available file="windows/work/hardware/tools/g++_arm_none_eabi" property="arm_available" />
-  </target>
-
-  <target name="windows-unzip-arm-toolchain" depends="windows-get-arm-toolchain, windows-check-arm-toolchain" unless="arm_available">
-    <checksum file="windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" 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 gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz failed checksum.
-      Please remove "windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" to download it again.
-    </fail>
-
-    <!-- Unzip toolchain to the destination folder -->
-    <exec executable="tar">
-      <arg value="xfz"/>
-      <arg value="windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz"/>
-      <arg value="--directory=windows/work/hardware/tools"/>
-    </exec>
-  </target>
-
   <target name="windows-dist" depends="windows-build"
 	  description="Create .zip files of windows version">
 
diff --git a/build/macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz.sha b/build/macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz.sha
deleted file mode 100644
index 3b951bb7f..000000000
--- a/build/macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz.sha
+++ /dev/null
@@ -1 +0,0 @@
-14c554bb9aa9f0d0262a593e7452d33f4babc60d
diff --git a/build/macosx/dist/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz.sha b/build/macosx/dist/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz.sha
new file mode 100644
index 000000000..a265218f9
--- /dev/null
+++ b/build/macosx/dist/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz.sha
@@ -0,0 +1 @@
+a1326c6258f91d9b318570bc619ca8a3b799d8bc
diff --git a/build/windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz.sha b/build/windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz.sha
deleted file mode 100644
index 068b717e3..000000000
--- a/build/windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz.sha
+++ /dev/null
@@ -1 +0,0 @@
-f288affa058bfdd44f8b93800fc4cb01b2ebf1e5
diff --git a/build/windows/dist/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz.sha b/build/windows/dist/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz.sha
new file mode 100644
index 000000000..0c66d28a8
--- /dev/null
+++ b/build/windows/dist/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz.sha
@@ -0,0 +1 @@
+c41fa509205b9ced43fc221b6a0cae4223a0842d