From 4b739cd74fcd70b7eee17eeb33e635ae641d5f89 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Wed, 22 Jun 2011 00:52:56 +0000
Subject: [PATCH] Nix the building of the getdown-tools.jar. We can just
 include everything in getdown-pro.jar and it's only 10% larger (109k ->
 121k), and it vastly simplifies life for users.

Just use getdown-pro.jar for all of your Getdown-related needs:

- use it to install your application
- use it in your build scripts for the various Getdown tasks
- link against it in your app to use LaunchUtil or to embed Getdown

We'll even ship this on the website as simply getdown.jar. I'm tempted to ship
this in Maven and modify the main Getdown POM to not export any of its
dependencies. However, that will require a bunch of build file tweaking, which
I'd rather save for another day.
---
 build.xml | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/build.xml b/build.xml
index 44921ab..8b71e5a 100644
--- a/build.xml
+++ b/build.xml
@@ -120,7 +120,7 @@
     </artifact:dependencies>
     <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>
 
-    <!-- build the client jar file -->
+    <!-- build the dependencies included jar file -->
     <proguard>
       <injar path="${getdown.jar}"/>
       <injar path="${jregistrykey:jregistrykey:jar}" filter="!META-INF/**"/>
@@ -132,36 +132,14 @@
       <libraryjar name="${rt.jar}"/>
       <libraryjar name="${org.apache.ant:ant:jar}"/>
 
-      <keep name="com.threerings.getdown.launcher.Getdown">
-        <method access="static" name="main"/>
-      </keep>
-      <keep name="com.threerings.getdown.launcher.GetdownApp">
-        <method access="static" name="main"/>
-      </keep>
-      <keep name="com.threerings.getdown.launcher.GetdownApplet">
-        <constructor/><method name="*"/><field access="public" name="*"/>
+      <!-- keep the whole nine yards, just trim/obfuscate our depends -->
+      <keep name="com.threerings.getdown.**">
+        <method name="*"/>
       </keep>
       <keep name="ca.beq.util.win32.registry.**">
         <constructor/><method name="*"/><field access="public" name="*"/>
       </keep>
     </proguard>
-
-    <!-- build the tools jar file -->
-    <proguard>
-      <injar path="${getdown.jar}"/>
-      <injar path="${com.samskivert:samskivert:jar}" filter="!META-INF/**, 
-        !**/Log4JLogger*,!**/*.java,com/samskivert/Log.class,**/samskivert/io/**,
-        **/samskivert/swing/**,**/samskivert/text/**,**/samskivert/util/**"/>
-      <injar path="${commons-codec:commons-codec:jar}" filter="!META-INF/**"/>
-      <outjar path="${deploy.dir}/getdown-tools${version.suff}.jar"/>
-      <libraryjar name="${rt.jar}"/>
-      <libraryjar name="${jregistrykey:jregistrykey:jar}"/>
-      <libraryjar name="${org.apache.ant:ant:jar}"/>
-
-      <keep name="com.threerings.getdown.tools.*">
-        <method name="*"/>
-      </keep>
-    </proguard>
   </target>
 
   <target name="sign" depends="compile">