From c2954b19a74eb42024cf1da8ae2222ee94eed4e1 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Wed, 22 Jun 2011 01:28:14 -0700
Subject: [PATCH] changed version code back to beta and changed way sources get
 copied in ant build

---
 astrid/AndroidManifest.xml |  4 ++--
 astrid/build.xml           | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index f2ce9efec..877980d01 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="3.7.7"
-          android:versionCode="184">
+          android:versionName="3.8.0-rc4"
+          android:versionCode="183">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/build.xml b/astrid/build.xml
index 2175bebf5..ca823f38b 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -70,16 +70,18 @@
     -->
     <setup />
 
-    <!-- amalgamate sources -->
-    <delete dir="${source.dir}" />
-    <mkdir dir="${source.dir}" />
-    <for list="${astrid.sources}" param="dir">
-      <sequential>
-        <copy todir="${source.dir}">
-          <fileset dir="@{dir}" />
-        </copy>
-      </sequential>
-    </for>
+    <target name="copy-sources">
+      <!-- amalgamate sources -->
+      <delete dir="${source.dir}" />
+      <mkdir dir="${source.dir}" />
+      <for list="${astrid.sources}" param="dir">
+        <sequential>
+          <copy todir="${source.dir}">
+            <fileset dir="@{dir}" />
+          </copy>
+        </sequential>
+      </for>
+    </target>
 
     <target name="get-version">
       <loadfile property="manifest" srcFile="AndroidManifest.xml" />
@@ -109,11 +111,11 @@
       </exec>
     </target>
 
-    <target name="debug" depends="clean, updatekeys, android_rules.debug">
+    <target name="debug" depends="clean, copy-sources, updatekeys, android_rules.debug">
     </target>
 
     <!-- post build: rename apk -->
-    <target name="release" depends="clean, get-version, warnings, updatekeys, updatekeys-release, disable-market, android_rules.release">
+    <target name="release" depends="clean, get-version, copy-sources, warnings, updatekeys, updatekeys-release, disable-market, android_rules.release">
       <mkdir dir="../release" />
       <property name="out.final.package"
                 location="../release/${ant.project.name}-${manifest.version.code}-${manifest.version.name}-release.apk" />