From cade4b643538ce15667dc911dd87da540be9a68c Mon Sep 17 00:00:00 2001
From: Jonathan Le Plastrier <jonathan@threerings.net>
Date: Tue, 26 Sep 2006 20:23:05 +0000
Subject: [PATCH] Narya now builds using from dist/lib. Also, the weave taskdef
 reports a warning if it cannot find the retroweaver jars, instead of
 preventing ant from running. These changes will need to happen on the other
 rings as well.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4379 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 build.xml       | 8 ++++++--
 tests/build.xml | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 238cf798d..fa858666d 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,7 @@
   <!-- declare our classpath business -->
   <path id="classpath">
     <pathelement location="${classes.dir}"/>
-    <fileset dir="lib" includes="**/*.jar"/>
+    <fileset dir="${deploy.dir}/lib" includes="**/*.jar"/>
   </path>
 
   <!-- generates additional methods for distributed object classes -->
@@ -88,12 +88,16 @@
   <!-- prepares the application directories -->
   <target name="prepare">
     <mkdir dir="${deploy.dir}"/>
+    <mkdir dir="${deploy.dir}/lib"/>
     <mkdir dir="${classes.dir}"/>
     <mkdir dir="${javadoc.home}"/>
     <copy todir="${classes.dir}">
       <fileset dir="src/java" includes="**/*.properties"/>
       <fileset dir="src/java" includes="**/*.tmpl"/>
     </copy>
+    <copy todir="${deploy.dir}/lib">
+      <fileset dir="lib" includes="**/*.jar"/>
+    </copy>
   </target>
 
   <!-- cleans out the installed application -->
@@ -173,7 +177,7 @@
   </target>
 
   <!-- various bits used by the retroweaver tasks -->
-  <taskdef name="weave" classpathref="classpath"
+  <taskdef name="weave" classpathref="classpath" onerror="report"
            classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
   <property name="inpre" value="${deploy.dir}/${app.name}"/>
   <property name="outpre" value="${deploy.dir}/retro/${app.name}"/>
diff --git a/tests/build.xml b/tests/build.xml
index 4a795fde7..0d0d1c496 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -18,7 +18,7 @@
   <path id="classpath">
     <pathelement location="${classes.dir}"/>
     <pathelement location="${narya.classes.dir}"/>
-    <fileset dir="../lib" includes="**/*.jar"/>
+    <fileset dir="../${deploy.dir}/lib" includes="**/*.jar"/>
   </path>
 
   <!-- generates additional methods for distributed object classes -->