Work properly with the new build system.

This commit is contained in:
Michael Bayne
2006-11-14 21:05:40 +00:00
parent 8a3ea897cf
commit 2acaa9bbf5
2 changed files with 9 additions and 8 deletions
+4 -3
View File
@@ -107,17 +107,18 @@
<!-- optimizes, combines and removes dead code --> <!-- optimizes, combines and removes dead code -->
<target name="proguard" depends="dist"> <target name="proguard" depends="dist">
<taskdef resource="proguard/ant/task.properties" <taskdef resource="proguard/ant/task.properties"
classpath="lib/proguard.jar"/> classpath="${deploy.dir}/lib/proguard.jar"/>
<proguard configuration="etc/getdown.pro"/> <proguard configuration="etc/getdown.pro"/>
<taskdef name="weave" classname="com.rc.retroweaver.ant.RetroWeaverTask" <taskdef name="weave" classname="com.rc.retroweaver.ant.RetroWeaverTask"
classpath="lib/retroweaver-all-1.2.2.jar"/> classpath="${deploy.dir}/lib/retroweaver-all-1.2.2.jar"/>
<weave inputjar="${deploy.dir}/${app.name}-pro.jar" <weave inputjar="${deploy.dir}/${app.name}-pro.jar"
outputjar="${deploy.dir}/${app.name}-retro-pro.jar"/> outputjar="${deploy.dir}/${app.name}-retro-pro.jar"/>
<!-- now combine the retroweaved jar file with the retroweaver runtime --> <!-- now combine the retroweaved jar file with the retroweaver runtime -->
<unjar src="${deploy.dir}/${app.name}-retro-pro.jar" <unjar src="${deploy.dir}/${app.name}-retro-pro.jar"
dest="${deploy.dir}/rptmp"/> dest="${deploy.dir}/rptmp"/>
<unjar src="lib/retroweaver-rt-1.2.2.jar" dest="${deploy.dir}/rptmp"/> <unjar src="${deploy.dir}/lib/retroweaver-rt-1.2.2.jar"
dest="${deploy.dir}/rptmp"/>
<jar destfile="${deploy.dir}/${app.name}-retro-pro.jar" <jar destfile="${deploy.dir}/${app.name}-retro-pro.jar"
manifest="lib/manifest.mf" basedir="${deploy.dir}/rptmp"/> manifest="lib/manifest.mf" basedir="${deploy.dir}/rptmp"/>
<delete dir="${deploy.dir}/rptmp"/> <delete dir="${deploy.dir}/rptmp"/>
+5 -5
View File
@@ -6,11 +6,11 @@
-basedirectory ../ -basedirectory ../
-injars dist/getdown.jar(!**/tools/DigesterTask*,!**/tools/Differ*) -injars dist/getdown.jar(!**/tools/DigesterTask*,!**/tools/Differ*)
-injars lib/jRegistryKey.jar(!META-INF/*) -injars dist/lib/jRegistryKey.jar(!META-INF/*)
-injars lib/samskivert.jar(!META-INF/*,!**/velocity/**,!**/xml/**) -injars dist/lib/samskivert.jar(!META-INF/*,!**/velocity/**,!**/xml/**)
-injars lib/commons-codec.jar(!META-INF/*) -injars dist/lib/commons-codec.jar(!META-INF/*)
-injars lib/commons-io.jar(!META-INF/*) -injars dist/lib/commons-io.jar(!META-INF/*)
-injars lib/snark.jar(!META-INF/*) -injars dist/lib/snark.jar(!META-INF/*)
-libraryjars <java.home>/lib/rt.jar -libraryjars <java.home>/lib/rt.jar
-dontskipnonpubliclibraryclasses -dontskipnonpubliclibraryclasses