From 1e5b1e5a7f38dbf66418ce50f81bf060f6500bd1 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sun, 12 Jul 2009 22:00:36 +0000
Subject: [PATCH] Place all of our tools into narya-tools along with all of
 their dependencies. Provide an ant properties file that defines all of our
 tasks in one fell swoop.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5861 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 build.xml                                     | 240 ++++++++++--------
 .../presents/tools/presents.properties        |   5 +
 2 files changed, 135 insertions(+), 110 deletions(-)
 create mode 100644 src/java/com/threerings/presents/tools/presents.properties

diff --git a/build.xml b/build.xml
index 8ade05959..b025fa7ea 100644
--- a/build.xml
+++ b/build.xml
@@ -27,107 +27,6 @@
     <echo level="info" message="EHCache: ${ehcache.present}"/>
   </target>
 
-  <!-- generates fields for persistent record classes -->
-  <target name="genrecord" depends="prepare">
-    <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
-             classpathref="classpath"/>
-    <!-- make sure the record class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" debug="on" optimize="${build.optimize}"
-           deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
-      <include name="**/*Record.java"/>
-    </javac>
-    <!-- now update the source files -->
-    <grecord classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Record.java"/>
-    </grecord>
-  </target>
-
-  <!-- generates additional methods for distributed object classes -->
-  <target name="gendobj" depends="prepare"> 
-    <taskdef name="dobj" classpathref="classpath"
-             classname="com.threerings.presents.tools.GenDObjectTask"/>
-    <!-- make sure the dobject class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
-           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
-      <include name="**/*Object.java"/>
-    </javac>
-    <!-- now generate the associated files -->
-    <dobj classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Object.java"/>
-    </dobj>
-  </target>
-
-  <!-- generates marshaller and dispatcher classes for all invocation service declarations -->
-  <target name="genservice"> 
-    <taskdef name="service" classpathref="classpath"
-             classname="com.threerings.presents.tools.GenServiceTask"/>
-    <!-- make sure the service class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
-           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
-      <include name="**/*Service.java"/>
-      <exclude name="**/InvocationService.java"/>
-    </javac>
-    <!-- now generate the associated files -->
-    <service header="lib/SOURCE_HEADER" asroot="src/as" classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Service.java">
-        <exclude name="**/InvocationService.java"/>
-        <exclude name="**/peer/**"/>
-        <exclude name="**/admin/**"/>
-      </fileset>
-      <providerless service="ChatService"/>
-      <providerless service="SimulatorService"/>
-      <providerless service="TimeBaseService"/>
-    </service>
-    <service header="lib/SOURCE_HEADER" classpathref="classpath">
-      <fileset dir="src/java" includes="**/peer/**/*Service.java"/>
-      <fileset dir="src/java" includes="**/admin/**/*Service.java"/>
-    </service>
-  </target>
-
-  <!-- generates sender and decoder classes for all invocation receiver declarations -->
-  <target name="genreceiver"> 
-    <taskdef name="receiver" classpathref="classpath"
-             classname="com.threerings.presents.tools.GenReceiverTask"/>
-    <!-- make sure the receiver class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
-      <include name="**/*Receiver.java"/>
-      <exclude name="**/InvocationReceiver.java"/>
-    </javac>
-    <!-- now generate the associated files -->
-    <receiver header="lib/SOURCE_HEADER" classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Receiver.java"
-        excludes="**/InvocationReceiver.java"/>
-    </receiver>
-  </target>
-
-  <!-- adds readField and writeField methods to Stremable classes -->
-  <target name="procstream">
-    <taskdef name="instream" classpathref="classpath"
-             classname="com.threerings.presents.tools.InstrumentStreamableTask"/>
-    <!-- now instrument the associated files -->
-    <instream outdir="${classes.dir}">
-      <path refid="classpath"/>
-      <fileset dir="${classes.dir}" includes="**/data/*.class"/>
-      <fileset dir="${classes.dir}" includes="**/net/*.class"/>
-      <fileset dir="${classes.dir}" includes="**/dobj/*.class"/>
-      <fileset dir="${classes.dir}" includes="**/util/*.class"/>
-    </instream>
-  </target>
-
-  <!-- generates ActionScript versions of our Streamable classes -->
-  <target name="genascript">
-    <taskdef name="genscript" classpathref="classpath"
-             classname="com.threerings.presents.tools.GenActionScriptTask"/>
-    <genscript header="lib/SOURCE_HEADER" asroot="src/as">
-      <fileset dir="src/java" includes="**/data/*.java"/>
-    </genscript>
-  </target>
-
   <!-- prepares the application directories -->
   <target name="prepare">
     <mkdir dir="${deploy.dir}"/>
@@ -143,6 +42,18 @@
     </copy>
   </target>
 
+  <!-- makes sure our tools are compiled and defines the ant tasks -->
+  <target name="preptools" depends="prepare">
+    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="{$build.optimize}" deprecation="on" source="1.5" target="1.5">
+      <classpath refid="classpath"/>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+      <include name="com/threerings/presents/tools/**"/>
+    </javac>
+    <taskdef resource="com/threerings/presents/tools/presents.properties" classpathref="classpath"/>
+  </target>
+
   <!-- cleans out the intermediate build files -->
   <target name="clean" depends="common-clean">
     <delete dir="${deploy.dir}/classes"/>
@@ -303,23 +214,132 @@
     <ant dir="tests" target="compile"/>
     <!-- build our various jar files -->
     <jar destfile="${deploy.dir}/${lib.name}-base.jar">
-      <fileset dir="${classes.dir}" includes="com/threerings/NaryaLog**"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/io/**"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/util/**"
-          excludes="**/*.c,**/Makefile,**/*.h"/>
+      <fileset dir="${classes.dir}">
+        <include name="com/threerings/NaryaLog**"/>
+        <include name="com/threerings/io/**"/>
+        <include name="com/threerings/util/**"/>
+        <exclude name="com/threerings/**/tools/**"/>
+        <exclude name="**/*.c,**/Makefile,**/*.h"/>
+      </fileset>
     </jar>
     <jar destfile="${deploy.dir}/${lib.name}-distrib.jar">
-      <fileset dir="${classes.dir}" includes="com/threerings/presents/**"
-               excludes="**/*.html,**/*.png"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/crowd/**"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/admin/**"/>
-      <fileset dir="${classes.dir}" includes="com/threerings/bureau/**"/>
+      <fileset dir="${classes.dir}">
+        <include name="com/threerings/presents/**"/>
+        <include name="com/threerings/crowd/**"/>
+        <include name="com/threerings/admin/**"/>
+        <include name="com/threerings/bureau/**"/>
+        <exclude name="com/threerings/**/tools/**"/>
+        <exclude name="**/*.html,**/*.png"/>
+      </fileset>
+    </jar>
+    <jar destfile="${deploy.dir}/${lib.name}-tools.jar">
+      <fileset dir="${classes.dir}">
+        <include name="com/threerings/io/**"/>
+        <include name="com/threerings/presents/annotation/**"/>
+        <include name="com/threerings/presents/dobj/**"/>
+        <include name="com/threerings/**/tools/**"/>
+      </fileset>
+      <zipfileset src="${deploy.dir}/lib/samskivert.jar"/>
+      <zipfileset src="${deploy.dir}/lib/velocity-1.5-dev.jar"/>
+      <zipfileset src="${deploy.dir}/lib/javassist.jar"/>
+      <zipfileset src="${deploy.dir}/lib/google-collect.jar"/>
     </jar>
     <jar destfile="${deploy.dir}/${lib.name}-tests.jar">
       <fileset dir="tests/${classes.dir}" includes="com/threerings/**"/>
     </jar>
   </target>
 
+  <!-- generates fields for persistent record classes -->
+  <target name="genrecord" depends="prepare">
+    <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
+             classpathref="classpath"/>
+    <!-- make sure the record class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}" debug="on" optimize="${build.optimize}"
+           deprecation="on" source="1.5" target="1.5">
+      <classpath refid="classpath"/>
+      <include name="**/*Record.java"/>
+    </javac>
+    <!-- now update the source files -->
+    <grecord classpathref="classpath">
+      <fileset dir="src/java" includes="**/*Record.java"/>
+    </grecord>
+  </target>
+
+  <!-- generates additional methods for distributed object classes -->
+  <target name="gendobj" depends="preptools"> 
+    <!-- make sure the dobject class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
+           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
+      <classpath refid="classpath"/>
+      <include name="**/*Object.java"/>
+    </javac>
+    <!-- now generate the associated files -->
+    <gendobj classpathref="classpath">
+      <fileset dir="src/java" includes="**/*Object.java"/>
+    </gendobj>
+  </target>
+
+  <!-- generates marshaller and dispatcher classes for all invocation service declarations -->
+  <target name="genservice" depends="preptools"> 
+    <!-- make sure the service class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
+           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
+      <classpath refid="classpath"/>
+      <include name="**/*Service.java"/>
+      <exclude name="**/InvocationService.java"/>
+    </javac>
+    <!-- now generate the associated files -->
+    <genservice header="lib/SOURCE_HEADER" asroot="src/as" classpathref="classpath">
+      <fileset dir="src/java" includes="**/*Service.java">
+        <exclude name="**/InvocationService.java"/>
+        <exclude name="**/peer/**"/>
+        <exclude name="**/admin/**"/>
+      </fileset>
+      <providerless service="ChatService"/>
+      <providerless service="SimulatorService"/>
+      <providerless service="TimeBaseService"/>
+    </genservice>
+    <genservice header="lib/SOURCE_HEADER" classpathref="classpath">
+      <fileset dir="src/java" includes="**/peer/**/*Service.java"/>
+      <fileset dir="src/java" includes="**/admin/**/*Service.java"/>
+    </genservice>
+  </target>
+
+  <!-- generates sender and decoder classes for all invocation receiver declarations -->
+  <target name="genreceiver" depends="preptools">
+    <!-- make sure the receiver class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
+      <classpath refid="classpath"/>
+      <include name="**/*Receiver.java"/>
+      <exclude name="**/InvocationReceiver.java"/>
+    </javac>
+    <!-- now generate the associated files -->
+    <genreceiver header="lib/SOURCE_HEADER" classpathref="classpath">
+      <fileset dir="src/java" includes="**/*Receiver.java"
+        excludes="**/InvocationReceiver.java"/>
+    </genreceiver>
+  </target>
+
+  <!-- adds readField and writeField methods to Stremable classes -->
+  <target name="procstream" depends="preptools">
+    <!-- now instrument the associated files -->
+    <instream outdir="${classes.dir}">
+      <path refid="classpath"/>
+      <fileset dir="${classes.dir}" includes="**/data/*.class"/>
+      <fileset dir="${classes.dir}" includes="**/net/*.class"/>
+      <fileset dir="${classes.dir}" includes="**/dobj/*.class"/>
+      <fileset dir="${classes.dir}" includes="**/util/*.class"/>
+    </instream>
+  </target>
+
+  <!-- generates ActionScript versions of our Streamable classes -->
+  <target name="genascript" depends="preptools">
+    <genascript header="lib/SOURCE_HEADER" asroot="src/as">
+      <fileset dir="src/java" includes="**/data/*.java"/>
+    </genascript>
+  </target>
+
   <!-- various bits used by the retroweaver tasks -->
   <property name="inpre" value="${deploy.dir}/${lib.name}"/>
   <property name="outpre" value="${deploy.dir}/retro/${lib.name}"/>
diff --git a/src/java/com/threerings/presents/tools/presents.properties b/src/java/com/threerings/presents/tools/presents.properties
new file mode 100644
index 000000000..6c63c9a68
--- /dev/null
+++ b/src/java/com/threerings/presents/tools/presents.properties
@@ -0,0 +1,5 @@
+gendobj=com.threerings.presents.tools.GenDObjectTask
+genservice=com.threerings.presents.tools.GenServiceTask
+genreceiver=com.threerings.presents.tools.GenReceiverTask
+instream=com.threerings.presents.tools.InstrumentStreamableTask
+genascript=com.threerings.presents.tools.GenActionScriptTask