Build file changes to make Nenya work with the new build world order.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@50 ed5b42cb-e716-0410-a449-f6a68f950b19

build.xml

@@ -17,7 +17,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>
 
   <!-- checks the availability of certain libraries -->
@@ -51,6 +51,7 @@
   <!-- prepares the application directories -->
   <target name="prepare">
     <mkdir dir="${deploy.dir}"/>
+    <mkdir dir="${deploy.dir}/lib"/>
     <mkdir dir="${classes.dir}"/>
     <mkdir dir="${classes.dir}/rsrc"/>
     <mkdir dir="${javadoc.home}"/>
@@ -61,6 +62,9 @@
     <copy todir="${classes.dir}/rsrc">
       <fileset dir="rsrc" includes="**/*"/>
     </copy>
+    <copy todir="${deploy.dir}/lib">
+      <fileset dir="lib" includes="**/*.jar"/>
+    </copy>
   </target>
 
   <!-- cleans out the installed application -->
@@ -160,14 +164,13 @@
     </jar>
   </target>
 
-  <!-- various bits used by the retroweaver tasks -->
-  <taskdef name="weave" classpathref="classpath"
-           classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
-  <property name="inpre" value="${deploy.dir}/${app.name}"/>
-  <property name="outpre" value="${deploy.dir}/retro/${app.name}"/>
-
   <!-- a helper task for 'retro' -->
   <target name="vweave">
+    <!-- various bits used by the retroweaver tasks -->
+    <taskdef name="weave" classpathref="classpath"
+             classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
+    <property name="inpre" value="${deploy.dir}/${app.name}"/>
+    <property name="outpre" value="${deploy.dir}/retro/${app.name}"/>
     <path id="retrocp">
       <pathelement location="/usr/local/jdk1.4/jre/lib/rt.jar"/>
       <fileset dir="lib" includes="**/*.jar"/>

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>
 
   <!-- checks the availability of certain libraries -->