From db5f0620b328a91686903cfe567869df7ac7f2ff Mon Sep 17 00:00:00 2001
From: Brian Schmalz <brian@schmalzhaus.com>
Date: Sat, 31 May 2014 07:47:13 -0500
Subject: [PATCH] Updated build.xml to use new (20140530) compilers. Also
 bumped build number in platforms.txt up by one. Tested with Windows build,
 and it appears to work.

---
 build/build.xml              | 16 ++++++++--------
 hardware/pic32/platforms.txt |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 52a0048a0..ce184e984 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -269,12 +269,12 @@
       <arg value="macosx/dist/tools-universal.zip" />
     </exec>
      
-<get src="https://chipkit.s3.amazonaws.com/compilers/mz/pic32-tools-chipKIT-cxx-dev_pic32mz_B-Darwin-image.zip"
+<get src="https://chipkit.s3.amazonaws.com/compilers/pic32-tools-Darwin-image-20140530.zip"
          dest="macosx/dist"
          verbose="false"
          usetimestamp="true"/>
 
-<unzip dest="macosx/work/mpide.app/Contents/Resources/Java/hardware/pic32/compiler" src="macosx/dist/pic32-tools-chipKIT-cxx-dev_pic32mz_B-Darwin-image.zip" overwrite="false"/>
+<unzip dest="macosx/work/mpide.app/Contents/Resources/Java/hardware/pic32/compiler" src="macosx/dist/pic32-tools-Darwin-image-20140530" overwrite="false"/>
 <chmod perm="+x" maxparallel="300">
       <fileset dir="macosx/work/mpide.app/Contents/Resources/Java/hardware/pic32/compiler" includes="**/*" />
 </chmod>
@@ -500,12 +500,12 @@
     <copy todir="linux/work" file="linux/dist/mpide" />
     <chmod perm="755" file="linux/work/mpide" />
  
-  <get src="https://chipkit.s3.amazonaws.com/compilers/mz/pic32-tools-chipKIT-cxx-dev_pic32mz_B-Linux-image.zip"
+  <get src="https://chipkit.s3.amazonaws.com/compilers/pic32-tools-Linux32-image-20140530.zip"
          dest="linux/dist"
          verbose="false"
          usetimestamp="true"/>
 
-    <unzip dest="linux/work/hardware/pic32/compiler" src="linux/dist/pic32-tools-chipKIT-cxx-dev_pic32mz_B-Linux-image.zip" overwrite="false"/>
+    <unzip dest="linux/work/hardware/pic32/compiler" src="linux/dist/pic32-tools-Linux32-image-20140530.zip" overwrite="false"/>
     <chmod perm="+x">
       <fileset dir="linux/work/hardware/pic32/compiler/pic32-tools/bin" includes="**/*" />
     </chmod>
@@ -538,7 +538,7 @@
       <param name="target.path" value="raspberrypi/work" />
     </antcall>
 
-    <get src="https://chipkit.s3.amazonaws.com/compilers/mz/pic32-tools-chipKIT-cxx-dev_pic32mz_B-arm-linux-image.zip"
+    <get src="https://chipkit.s3.amazonaws.com/compilers/pic32-tools-arm-linux-image-20140530.zip"
          dest="raspberrypi/dist"
          verbose="false"
          usetimestamp="true"/>
@@ -556,7 +556,7 @@
          raspberrypi/dist folder instead. -->
     <copy todir="raspberrypi/work" file="linux/dist/mpide" />
     <chmod perm="755" file="raspberrypi/work/mpide" />
-    <unzip dest="raspberrypi/work/hardware/pic32/compiler" src="raspberrypi/dist/pic32-tools-chipKIT-cxx-dev_pic32mz_B-arm-linux-image.zip" overwrite="false"/>
+    <unzip dest="raspberrypi/work/hardware/pic32/compiler" src="raspberrypi/dist/pic32-tools-arm-linux-image-20140530.zip" overwrite="false"/>
     <chmod perm="+x">
       <fileset dir="raspberrypi/work/hardware/pic32/compiler" includes="**/*" />
     </chmod>
@@ -849,12 +849,12 @@ Description: chipKIT MPIDE Development environment
     <!-- Unzip AVR tools -->
     <unzip dest="windows/work/hardware" src="windows/avr_tools.zip" overwrite="false"/>
     <!-- pic32 compiler -->
-     <get src="https://chipkit.s3.amazonaws.com/compilers/mz/pic32-tools-chipKIT-cxx-dev_pic32mz_B-win32-image.zip "
+     <get src="https://chipkit.s3.amazonaws.com/compilers/pic32-tools-win32-image-20140530.zip "
          dest="windows/dist"
          verbose="false"
          usetimestamp="true"/>
 
-   <unzip dest="windows/work/hardware/pic32/compiler" src="windows/dist/pic32-tools-chipKIT-cxx-dev_pic32mz_B-win32-image.zip" overwrite="false"/>
+   <unzip dest="windows/work/hardware/pic32/compiler" src="windows/dist/pic32-tools-win32-image-20140530.zip" overwrite="false"/>
     <chmod perm="+x">
       <fileset dir="windows/work/hardware/pic32/compiler" includes="**/*" />
     </chmod>
diff --git a/hardware/pic32/platforms.txt b/hardware/pic32/platforms.txt
index 762c3f489..43a3a2cce 100644
--- a/hardware/pic32/platforms.txt
+++ b/hardware/pic32/platforms.txt
@@ -41,6 +41,6 @@ pic32.library.core.path=./hardware/pic32/cores/pic32
 pic32.library.path=./hardware/pic32/libraries
 pic32.ldscript=chipKIT-BL-mega.ld
 pic32.ldcommon=chipKIT-application-COMMON.ld
-pic32.compiler.define=::-DMPIDEVER=16777995::-DMPIDE=23::
+pic32.compiler.define=::-DMPIDEVER=16777996::-DMPIDE=23::
 pic32.build.variant=Default_100
 pic32.core.header=WProgram.h