Issue #234 fix code applied.

Former-commit-id: 3f92086
chipKIT32 · Jul 9, 2012 · fe7e80d · fe7e80d
1 parent e18b9ad
commit fe7e80d
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 9 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -220,7 +220,7 @@
       <arg value="macosx/dist/tools-universal.zip" />
     </exec>
 
-<unzip dest="macosx/work/mpide.app/Contents/Resources/Java/hardware/pic32/compiler" src="macosx/dist/pic32-tools-chipKIT-cxx-master-Darwin-image.zip" overwrite="false"/>
+<unzip dest="macosx/work/mpide.app/Contents/Resources/Java/hardware/pic32/compiler" src="macosx/dist/pic32-tools-chipKIT-cxx-master-Darwin-image-20120614.zip" overwrite="false"/>
 <chmod perm="+x">
       <fileset dir="macosx/work/mpide.app/Contents/Resources/Java/hardware/pic32/compiler" includes="**/*" />
 </chmod>
@@ -354,7 +354,7 @@
 
     <copy todir="linux/work" file="linux/dist/mpide" />
     <chmod perm="755" file="linux/work/mpide" />
-    <unzip dest="linux/work/hardware/pic32/compiler" src="linux/dist/pic32-tools-chipKIT-cxx-master-Linux32-image.zip" overwrite="false"/>
+    <unzip dest="linux/work/hardware/pic32/compiler" src="linux/dist/pic32-tools-chipKIT-cxx-master-Linux32-image-20120614.zip" overwrite="false"/>
     <chmod perm="+x">
       <fileset dir="linux/work/hardware/pic32/compiler" includes="**/*" />
     </chmod>
@@ -481,7 +481,7 @@
     <!-- Unzip AVR tools -->
     <unzip dest="windows/work/hardware" src="windows/avr_tools.zip" overwrite="false"/>
     <!-- pic32 compiler -->
-   <unzip dest="windows/work/hardware/pic32/compiler" src="windows/dist/pic32-tools-chipKIT-cxx-master-win32-image.zip" overwrite="false"/>
+   <unzip dest="windows/work/hardware/pic32/compiler" src="windows/dist/pic32-tools-chipKIT-cxx-master-win32-image-20120614.zip" overwrite="false"/>
     <chmod perm="+x">
       <fileset dir="windows/work/hardware/pic32/compiler" includes="**/*" />
     </chmod>

diff --git a/build/linux/dist/cpp-chipKIT-linux-AMD64-20110511.zip.REMOVED.git-id b/build/linux/dist/cpp-chipKIT-linux-AMD64-20110511.zip.REMOVED.git-id
diff --git a/build/linux/dist/cpp-chipKIT-linux-x86-20110609.zip.REMOVED.git-id b/build/linux/dist/cpp-chipKIT-linux-x86-20110609.zip.REMOVED.git-id
diff --git a/build/linux/dist/pic32-tools-chipKIT-cxx-master-Linux32-image-20120614.zip.REMOVED.git-id b/build/linux/dist/pic32-tools-chipKIT-cxx-master-Linux32-image-20120614.zip.REMOVED.git-id
@@ -0,0 +1 @@
+2eb2b2acf8eadca2c909dc1636559de86820cfe6
diff --git a/build/linux/dist/pic32-tools-chipKIT-cxx-master-Linux32-image.zip.REMOVED.git-id b/build/linux/dist/pic32-tools-chipKIT-cxx-master-Linux32-image.zip.REMOVED.git-id
diff --git a/build/macosx/dist/cpp-chipKIT-Mac-20110609.zip.REMOVED.git-id b/build/macosx/dist/cpp-chipKIT-Mac-20110609.zip.REMOVED.git-id
diff --git a/build/macosx/dist/pic32-tools-chipKIT-cxx-master-Darwin-image-20120614.zip.REMOVED.git-id b/build/macosx/dist/pic32-tools-chipKIT-cxx-master-Darwin-image-20120614.zip.REMOVED.git-id
@@ -0,0 +1 @@
+63d540b748fa07352c4b973f1c419d6392830e50
diff --git a/build/macosx/dist/pic32-tools-chipKIT-cxx-master-Darwin-image.zip.REMOVED.git-id b/build/macosx/dist/pic32-tools-chipKIT-cxx-master-Darwin-image.zip.REMOVED.git-id
diff --git a/build/windows/dist/pic32-tools-chipKIT-cxx-master-win32-image-20120614.zip.REMOVED.git-id b/build/windows/dist/pic32-tools-chipKIT-cxx-master-win32-image-20120614.zip.REMOVED.git-id
@@ -0,0 +1 @@
+519ff0266fc0306be9fd3cede2284d7a73efb4a6
diff --git a/build/windows/dist/pic32-tools-chipKIT-cxx-master-win32-image.zip.REMOVED.git-id b/build/windows/dist/pic32-tools-chipKIT-cxx-master-win32-image.zip.REMOVED.git-id
diff --git a/hardware/arduino/platforms.txt b/hardware/arduino/platforms.txt
@@ -61,4 +61,6 @@ avr.compiler.upload.flags=
 avr.library.path=./hardware/arduino/cores/arduino
 avr.library.core.path=./libraries
 avr.compiler.define=::
+avr.board.define=::
+