Switched from DashO (commercial, old, crufty) to Proguard (free, new,

sexy) for our download-size optimization.

.cvsignore

@@ -1,2 +0,0 @@
-dasho.*
-dclasses

build.xml

@@ -8,9 +8,6 @@
   <property name="dist.jar" value="${app.name}.jar"/>
   <property name="app.dop" value="etc/${app.name}.dop"/>
 
-  <!-- we get DashO from a magical place -->
-  <property name="dasho-tool.jar" value="/export/threerings/lib/DashoPro.jar"/>
-
   <!-- used when generating javadocs -->
   <property name="javadoc.dir"  value="${deploy.dir}/docs"/>
   <property name="doc.packages" value="com.threerings.getdown.*"/>
@@ -74,24 +71,10 @@
          basedir="${deploy.dir}/classes"/>
   </target>
 
-  <!-- runs DashO on the code and jars up the results -->
+  <!-- optimizes, combines and removes dead code -->
-  <target name="dasho" depends="dist">
+  <target name="proguard" depends="dist">
-    <delete dir="dclasses"/>
+    <taskdef resource="proguard/ant/task.properties"
-
+             classpath="lib/proguard.jar"/>
-    <!-- now run DashO on the whole business -->
+    <proguard configuration="etc/getdown.pro"/>
-    <echo message="Invoking DashO ${dasho-tool.jar}..."/>
-    <exec executable="java">
-      <arg line="-mx256M"/>
-      <arg line="-classpath ${dasho-tool.jar}"/>
-      <arg line="DashoPro"/>
-      <arg line="-f ${app.dop}"/>
-    </exec>
-
-    <!-- blow away some javaws crap -->
-    <delete dir="dclasses/com/sun/javaws/resources"/>
-    <delete dir="dclasses/com/sun/javaws/ui"/>
-    <!-- finally jar up the results -->
-    <jar basedir="dclasses" manifest="lib/manifest.mf"
-      destfile="${deploy.dir}/${app.name}-dop.jar"/>
   </target>
 </project>

etc/getdown.dop

@@ -1,72 +0,0 @@
-;
-; DashO-Pro Configuration File for Getdown launcher
-;
-
--Version:
-2.3
-
--MapFile:
-./dasho.map
-
--ReportFile:
-./dasho.rpt
-
--ClassPath:
-/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar
-/usr/local/java/jre/lib/rt.jar
-dist/classes
-lib/jRegistryKey.jar
-../../projects/samskivert/dist/samskivert.jar
-../../lib/commons-io.jar
-../../lib/javaws.jar
-
--Destination:
-./dclasses
-
--TriggerFields:
-
--TriggerMethods:
-com.threerings.getdown.launcher.Getdown:main:java.lang.String[]
-
--RemoveUnusedElements:
-;none
-;onlynonpublics
-all
-
--ExcludePackages:
-javax.*
-
--ExcludeMethods:
-
--IncludeClassesUnconditional:
-ca.beq.util.win32.registry.RegistryException
-ca.beq.util.win32.registry.RegistryKey
-ca.beq.util.win32.registry.RegistryValue
-ca.beq.util.win32.registry.RootKey
-ca.beq.util.win32.registry.ValueIterator
-ca.beq.util.win32.registry.ValueType
-
--General:
-nomakepublic
-fornamedetection
-;ignorenotfoundclasses
-;includesun
-leavedebugginginfo
-
--RenameOptions:
-;OFF
-;ONLYNONPUBLICS
-ON
-
--RenamePrefix:
-(keeppackages)
-;(verbatim)
-
--OptimizationType:
-none
-;speed
-;size
-
--IncludeNonClassFiles:
-dist/classes
-../../lib/javaws.jar

etc/getdown.pro

@@ -0,0 +1,22 @@
+#
+# $Id$
+#
+# Proguard configuration file for Getdown launcher
+
+-injars dist/getdown.jar(!**/tools/DigesterTask*)
+-injars lib/jRegistryKey.jar
+-injars lib/samskivert.jar(!**/velocity/**,!**/xml/**)
+-injars lib/commons-io.jar
+-injars lib/javaws.jar(com/sun/javaws/jardiff/**,com/sun/javaws/cache/Patcher*)
+
+-libraryjars <java.home>/lib/rt.jar
+
+-outjars dist/getdown-pro.jar
+
+-keep public class ca.beq.util.win32.registry.** {
+    public protected *;
+}
+
+-keep public class com.threerings.getdown.launcher.Getdown {
+    public static void main (java.lang.String[]);
+}