Scratch that we need to weave after we run Proguard. Fortunately we don't do

anything that requires runtime support.
This commit is contained in:
Michael Bayne
2006-04-10 21:15:46 +00:00
parent fe87ef6b04
commit 7297af72af
2 changed files with 6 additions and 7 deletions
+5 -5
View File
@@ -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>
+1 -2
View File
@@ -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