From 6c9e1243ab3d052c8bdfefe644611b42340ee896 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 14 Oct 2010 01:00:19 +0000
Subject: [PATCH] Get tools from narya-tools-full, but keep it out of our
 normal classpath.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1018 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml         | 12 +++---------
 etc/libs-incl.xml |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index 5dacca62..903756ed 100644
--- a/build.xml
+++ b/build.xml
@@ -46,14 +46,8 @@
 
   <!-- 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.properties" classpathref="classpath"/>
+    <taskdef resource="com/threerings/presents/tools.properties"
+             classpath="${libs.dir}/narya-tool-sfull.jar"/>
   </target>
 
   <!-- cleans out the intermediate build files -->
@@ -95,7 +89,7 @@
   <!-- adds readField and writeField methods to Stremable classes -->
   <target name="procstream" depends="prepare">
     <taskdef resource="com/threerings/presents/tools.properties"
-             classpath="${deploy.dir}/lib/narya-tools.jar"/>
+             classpath="${libs.dir}/narya-tools-full.jar"/>
     <instream outdir="${classes.dir}">
       <path refid="classpath"/>
       <fileset dir="${classes.dir}" includes="**/data/*.class"/>
diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index 5af74ff8..523fc5f3 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -18,7 +18,6 @@
     <include name="samskivert.jar"/>
     <include name="narya-base*.jar"/>
     <include name="narya-distrib*.jar"/>
-    <include name="narya-tools*.jar"/>
     <!-- these LWJGL, JME and JME-BUI libraries are optional -->
     <include name="lwjgl.jar"/>
     <include name="lwjgl_util.jar"/>