From 7297af72af1d9bf91defca36e1f4dcc0f4df96e5 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 10 Apr 2006 21:15:46 +0000
Subject: [PATCH] Scratch that we need to weave after we run Proguard.
 Fortunately we don't do anything that requires runtime support.

---
 build.xml       | 10 +++++-----
 etc/getdown.pro |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 3b28598..12d4f98 100644
--- a/build.xml
+++ b/build.xml
@@ -68,11 +68,6 @@
   <target name="dist" depends="prepare,compile">
     <jar destfile="${deploy.dir}/${app.name}.jar" manifest="lib/manifest.mf"
          basedir="${deploy.dir}/classes"/>
-
-    <taskdef name="weave" classname="com.rc.retroweaver.ant.RetroWeaverTask"
-             classpath="lib/retroweaver-all-1.2.2.jar"/>
-    <weave inputjar="${deploy.dir}/${app.name}.jar"
-           outputjar="${deploy.dir}/${app.name}-retro.jar"/>
   </target>
 
   <!-- optimizes, combines and removes dead code -->
@@ -80,5 +75,10 @@
     <taskdef resource="proguard/ant/task.properties"
              classpath="lib/proguard.jar"/>
     <proguard configuration="etc/getdown.pro"/>
+
+    <taskdef name="weave" classname="com.rc.retroweaver.ant.RetroWeaverTask"
+             classpath="lib/retroweaver-all-1.2.2.jar"/>
+    <weave inputjar="${deploy.dir}/${app.name}-pro.jar"
+           outputjar="${deploy.dir}/${app.name}-retro-pro.jar"/>
   </target>
 </project>
diff --git a/etc/getdown.pro b/etc/getdown.pro
index de00be0..3a5b754 100644
--- a/etc/getdown.pro
+++ b/etc/getdown.pro
@@ -3,11 +3,10 @@
 #
 # Proguard configuration file for Getdown launcher
 
--injars dist/getdown-retro.jar(!**/tools/DigesterTask*,!**/tools/Differ*)
+-injars dist/getdown.jar(!**/tools/DigesterTask*,!**/tools/Differ*)
 -injars lib/jRegistryKey.jar(!META-INF/*)
 -injars lib/samskivert.jar(!META-INF/*,!**/velocity/**,!**/xml/**)
 -injars lib/commons-io.jar(!META-INF/*)
--injars lib/retroweaver-rt-1.2.2.jar(!META-INF/*)
 
 -libraryjars <java.home>/lib/rt.jar