Fixes to Ivy-based build.

build-ivy.xml

@@ -7,7 +7,7 @@
   <property name="copyright.holder" value="Michael Bayne"/>
 
   <!-- various directories used when building things -->
-  <property name="src.dir"     value="src/java"/>
+  <property name="src.dir"     value="src/main/java"/>
   <property name="test.dir"    value="src/test/java"/>
   <property name="deploy.dir"  value="dist"/>
   <property name="classes.dir" value="${deploy.dir}/classes"/>
@@ -94,7 +94,7 @@
     </javac>
   </target>
 
-  <target name="genrecord" depends="-prepare"
+  <target name="genrecord" depends="tools-compile,test-compile"
           description="Regenerates persistent record boilerplate.">
     <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask">
       <classpath>
@@ -102,18 +102,11 @@
         <path refid="compile.classpath"/>
       </classpath>
     </taskdef>
-    <!-- make sure the record class files are all compiled -->
+    <path id="genrec.classpath">
-    <javac srcdir="src/java" destdir="${classes.dir}"
+      <pathelement location="${classes.dir}"/>
-           debug="on" optimize="${build.optimize}" deprecation="on">
+      <pathelement location="${tclasses.dir}"/>
-      <classpath refid="compile.classpath"/>
+    </path>
-      <include name="**/*Record.java"/>
+    <grecord classpathref="genrec.classpath">
-    </javac>
-    <!-- now update the source files -->
-    <grecord>
-      <classpath>
-        <pathelement location="${classes.dir}"/>
-        <pathelement location="${tclasses.dir}"/>
-      </classpath>
       <fileset dir="${src.dir}" includes="**/*Record.java"/>
       <fileset dir="${test.dir}" includes="**/*Record.java"/>
     </grecord>