Split off toolchain and native library installs in build.xml

This doesn't change anything except a bit of ordering in the build, but
prepares for making these steps optional.

Author: matthijskooijman

build/build.xml

@@ -198,7 +198,7 @@
     <fail message="wrong platform (${os.name})" />
   </target>
 
-  <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
+  <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build, macosx-native-libs, macosx-toolchains" description="Build Mac OS X version">
     <mkdir dir="macosx/work" />
 
     <!-- assemble the pde -->
@@ -222,9 +222,12 @@
       <fileset file="shared/revisions.txt" />
     </copy>
 
-    <!-- Unzip AVR tools -->
-    <!-- <unzip dest="macosx/work/Arduino.app/Contents/Resources/Java/hardware" src="macosx/dist/tools-universal.zip" overwrite="false"/> -->
+    <antcall target="assemble">
+      <param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
+    </antcall>
+  </target>
 
+  <target name="macosx-toolchains">
     <exec executable="unzip">
       <arg value="-q" />
       <arg value="-n" />
@@ -243,10 +246,6 @@
       <fileset file="macosx/dist/eeprom.h" />
     </copy>
 
-    <antcall target="assemble">
-      <param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
-    </antcall>
-
     <antcall target="unzip-arm-toolchain">
       <param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" />
       <param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" />
@@ -259,7 +258,9 @@
       <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools" includes="**/man/**/*"/>
       <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools" includes="**/man"/>
     </delete>
+  </target>
 
+  <target name="macosx-native-libs">
     <get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="macosx" usetimestamp="true" />
     <unzip src="macosx/libastylej-2.03.zip" dest="macosx" overwrite="true"/>
     <copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/Arduino.app/Contents/Resources/Java/lib/" />
@@ -460,7 +461,22 @@
 
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
+  </target>
+
+  <target name="linux-native-libs">
+    <get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="linux" usetimestamp="true" />
+    <unzip src="linux/libastylej-2.03.zip" dest="linux" overwrite="true"/>
+    <copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
+    <chmod perm="755" file="linux/work/lib/libastylej.so" />
+  </target>
+
+  <target name="linux32-build" depends="linux-build, linux32-toolchains, linux-native-libs"
+	  description="Build linux (32-bit) version" />
 
+  <target name="linux64-build" depends="linux-build, linux64-toolchains, linux-native-libs"
+	  description="Build linux (64-bit) version" />
+
+  <target name="linux-toolchains">
     <mkdir dir="linux/work/hardware/tools" />
     <copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
     <copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
@@ -472,14 +488,9 @@
     <chmod perm="755" file="linux/work/hardware/tools/bossac" />
     <chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
     <chmod perm="755" file="linux/work/hardware/tools/adk2install" />
-
-    <get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="linux" usetimestamp="true" />
-    <unzip src="linux/libastylej-2.03.zip" dest="linux" overwrite="true"/>
-    <copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
-    <chmod perm="755" file="linux/work/lib/libastylej.so" />
   </target>
 
-  <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
+  <target name="linux32-toolchains" depends="linux-toolchains">
     <!-- Unzip ARM tools -->
     <antcall target="unzip-arm-toolchain">
       <param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
@@ -492,10 +503,9 @@
       <arg value="-xjf"/>
       <arg value="../../avr_tools_linux32.tar.bz2"/>
     </exec>
-
   </target>
 
-  <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
+  <target name="linux64-toolchains" depends="linux-toolchains">
     <!-- Unzip ARM tools -->
     <antcall target="unzip-arm-toolchain">
       <param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
@@ -630,7 +640,7 @@
   </target>
 
   <target name="windows-build"
-	  depends="revision-check, windows-checkos, subprojects-build"
+	  depends="revision-check, windows-checkos, subprojects-build, windows-toolchains, windows-native-libs"
 	  description="Build windows version">
     <mkdir dir="windows/work" />
 
@@ -656,28 +666,6 @@
       <fileset dir="windows/dist" includes="drivers/**" />
     </copy>
 
-    <!-- Unzip AVR tools -->
-    <get src="http://downloads.arduino.cc/WinAVR-20081205-arduino-2.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
-    <unzip dest="windows/work/hardware" src="windows/WinAVR-20081205-arduino-2.zip" overwrite="false"/>
-
-    <copy todir="windows/work/hardware/tools/avr/avr/include/avr">
-      <fileset file="windows/eeprom.h" />
-    </copy>
-
-    <get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="windows" usetimestamp="true" />
-    <unzip src="windows/libastylej-2.03.zip" dest="windows" overwrite="true"/>
-    <copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" />
-
-    <!-- Copy bossac.exe tool -->
-    <copy todir="windows/work/hardware/tools">
-      <fileset file="windows/bossac.exe" />
-      <fileset file="windows/listComPorts.exe" />
-    </copy>
-    <chmod perm="755">
-      <fileset file="windows/work/hardware/tools/bossac.exe" />
-      <fileset file="windows/work/hardware/tools/listComPorts.exe" />
-    </chmod>
-
     <antcall target="assemble">
       <param name="target.path" value="windows/work" />
     </antcall>
@@ -699,6 +687,32 @@
     <chmod perm="755">
       <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
     </chmod>
+  </target>
+
+  <target name="windows-native-libs">
+    <get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="windows" usetimestamp="true" />
+    <unzip src="windows/libastylej-2.03.zip" dest="windows" overwrite="true"/>
+    <copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" />
+  </target>
+
+  <target name="windows-toolchains">
+    <!-- Unzip AVR tools -->
+    <get src="http://downloads.arduino.cc/WinAVR-20081205-arduino-2.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
+    <unzip dest="windows/work/hardware" src="windows/WinAVR-20081205-arduino-2.zip" overwrite="false"/>
+
+    <copy todir="windows/work/hardware/tools/avr/avr/include/avr">
+      <fileset file="windows/eeprom.h" />
+    </copy>
+
+    <!-- Copy bossac.exe tool -->
+    <copy todir="windows/work/hardware/tools">
+      <fileset file="windows/bossac.exe" />
+      <fileset file="windows/listComPorts.exe" />
+    </copy>
+    <chmod perm="755">
+      <fileset file="windows/work/hardware/tools/bossac.exe" />
+      <fileset file="windows/work/hardware/tools/listComPorts.exe" />
+    </chmod>
 
     <!-- Unzip ARM toolchain -->
     <antcall target="unzip-arm-toolchain">