From 028b55b461f56b9dfcf294ebd0d376b0a61d0e00 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 14 Oct 2010 01:01:10 +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/vilya/trunk@978 c613c5cb-e716-0410-b11b-feb51c14d237
---
 build.xml         | 10 ++--------
 etc/libs-incl.xml |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index 2be97c0f..9e437a69 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-tools-full.jar"/>
   </target>
 
   <!-- cleans out the intermediate build files -->
diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index bad6e2ff..09b608d6 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -19,7 +19,6 @@
     <include name="narya-base*.jar"/>
     <include name="narya-distrib*.jar"/>
     <include name="narya-tests*.jar"/>
-    <include name="narya-tools*.jar"/>
     <include name="nenya-cast*.jar"/>
     <include name="nenya-media*.jar"/>
     <include name="nenya-miso*.jar"/>