From 99a7015a5dd65ad41c48e18f26ad2f1dc9595ee0 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sun, 3 Oct 2010 17:05:10 +0000
Subject: [PATCH] further tweaks to our "upload" target

---
 build.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 77491e8a4..2cefe116c 100644
--- a/build.xml
+++ b/build.xml
@@ -69,11 +69,11 @@
 
     <!-- A bloody hack, but a useful and quick one -->
     <target name="get-version">
-    <exec executable="perl" failonerror="true" outputproperty="version-code" errorproperty="version-error">
+    <exec executable="perl" failonerror="true" outputproperty="version-name" errorproperty="version-error">
         <!-- yes, ant needs &quot; for " in doublequoted strings. -->
-        <arg line="-ne'/android:versionCode.*?=.*?&quot;(\d+)&quot;/ ? print $1 : undef ' AndroidManifest.xml" />
+        <arg line="-ne'/android:versionName.*?=.*?&quot;(.*?)&quot;/ ? print $1 : undef ' AndroidManifest.xml" />
     </exec>
-    <echo>Building version number ${version-code}</echo>
+    <echo>Building version number ${version-name}</echo>
     </target>
 
     <target name="get-version-from-git">
@@ -125,7 +125,7 @@
 	<jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
     </target>
 
-    <target name="upload" depends="release,get-version">
+    <target name="upload" depends="clean,get-version,release">
         <echo>Uploading to Google Code using Google::Code::Upload</echo>
         <exec executable="mv" failonerror="true">
             <arg value="${out.release.package}" />