Permalink
Browse files

Issue #369 raspberrypi tools folder fixed and Issue #370 support cros…

…s platform linux builds.
  • Loading branch information...
1 parent 88bc747 commit 06e29dc0b98143135d700c535f28ed39d76708c0 @ricklon ricklon committed Jul 1, 2013
Showing with 8 additions and 2 deletions.
  1. +8 −2 build/build.xml
View
@@ -7,6 +7,11 @@
<property file="upload.properties"/>
<property name="aws.bucket" value="chipkit" />
+
+ <input message="Enter platform: "
+ addproperty="platform"
+ />
+
<condition property="macosx"><os family="mac" /></condition>
<condition property="windows"><os family="windows" /></condition>
<condition property="linux"><os family="unix" /></condition>
@@ -76,6 +81,7 @@
<input message="Enter version number:"
addproperty="version"
defaultvalue="${revision}" />
+
<antcall target="${platform}-dist" />
</target>
@@ -452,15 +458,15 @@
verbose="false"
usetimestamp="true"/>
- <untar dest="raspberrypi/work/hardware/tools/" src="raspberrypi/dist/tools.tar" overwrite="false" />
+ <untar dest="raspberrypi/work/hardware/" src="raspberrypi/dist/tools.tar" overwrite="false" />
<chmod perm="755" file="raspberrypi/work/hardware/tools/avrdude" />
<!-- For now we'll just leach the generic linux startup script. If we want
to tweak a specific Pi version we can change this to one stored in the
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" src="raspberrypi/dist/pic32-tools-chipKIT-cxx-master-arm-linux-image.zip" overwrite="false"/>
+ <unzip dest="raspberrypi/work/hardware/pic32/compiler" src="raspberrypi/dist/pic32-tools-chipKIT-cxx-master-arm-linux-image.zip" overwrite="false"/>
<chmod perm="+x">
<fileset dir="raspberrypi/work/hardware/pic32/compiler" includes="**/*" />
</chmod>

0 comments on commit 06e29dc

Please sign in to comment.