Permalink
Browse files

Merge branch 'master' of github.com:chipKIT32/chipKIT32-MAX

  • Loading branch information...
2 parents b7c724a + 6e2aab4 commit c2f1d8768f05c58c0700705f10c73c6b05861a75 @GeneApperson GeneApperson committed Feb 4, 2013
Showing with 13 additions and 6 deletions.
  1. +13 −6 build/build.xml
View
19 build/build.xml
@@ -69,6 +69,9 @@
<input message="Enter version number:"
addproperty="version"
defaultvalue="${revision}" />
+ <propertyfile file="upload.properties">
+ <entry key="version" value="${version}"/>
+ </propertyfile>
<antcall target="${platform}-dist" />
</target>
@@ -77,6 +80,9 @@
<input message="Enter version number:"
addproperty="version"
defaultvalue="${revision}-${platform}-${TODAY}-test" />
+ <propertyfile file="upload.properties">
+ <entry key="version" value="${version}"/>
+ </propertyfile>
<antcall target="${platform}-dist" />
</target>
@@ -322,9 +328,6 @@
macosx/mpide-${version}.dmg
=======================================================
</echo>
- <propertyfile file="upload.properties">
- <entry key="version" value="${version}"/>
- </propertyfile>
</target>
@@ -669,14 +672,18 @@
<!-- Upload the current build -->
<target name="upload" description="Use the Task" depends="awstasks.setup">
<property file="test.properties"/>
+ <echo message="Platform: ${platform} Version: ${version}" />
<s3put key="${aws.access_key}" secret="${aws.secret_key}" bucket="${aws.bucket}"
dest="builds" publicread="true" cacheControl="3600" contentType="application/x-readme">
- <fileset dir="macosx" includes="mpide-${version}.dmg"/>
+<!-- <fileset dir="${platform}" includes="mpide-${version}.dmg"/>
+ <fileset dir="${platform}" includes="mpide-${version}.zip"/>
+-->
+ <fileset dir="${platform}" includes="mpide-${version}.tgz"/>
<contenttypemapping extension="md" contenttype="text/plain"/>
<cachecontrolmapping extension="md" maxage="7200"/>
- <contentencodingmapping extension="md" encoding="UTF-8" />
+ <contentencodingmapping extension="md" encoding="UTF-8" />
</s3put>
-
+ <echo message="Upload task complete" />
</target>
<!-- Debugging echo target for s3, other values could be added as needed. -->
<target name="echo">

0 comments on commit c2f1d87

Please sign in to comment.