Bring build file up to date with latest template. It would be neat if

there was some easy way to include the default template. Will have to look
into that.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@447 6335cc39-0255-0410-8fd6-9bcaacd3b74c

projects/viztool/build.xml

@@ -2,22 +2,24 @@
 <project name="viztool" default="compile" basedir=".">
 
   <!-- things you may want to change -->
-  <property name="build.compiler" value="jikes"/>
-  <property name="java.libraries" value="/usr/share/java"/>
+  <property name="app.name"         value="viztool"/>
+  <property name="doc.packages"     value="com.samskivert.*"/>
+  <property name="doc.overview"     value="com/samskivert/overview.html"/>
+  <property name="copyright.holder" value="Michael Bayne"/>
+  <property name="build.compiler"   value="jikes"/>
+  <property name="java.libraries"   value="/usr/share/java"/>
 
   <!-- things you probably don't want to change -->
-  <property name="app.name"         value="viztool"/>
-  <property name="deploy.dir"       value="dist"/>
-  <property name="dist.jar"         value="${app.name}.jar"/>
-  <property name="javadoc.dir"      value="${deploy.dir}/docs"/>
-  <property name="doc.packages"     value="com.samskivert.*"/>
-  <property name="copyright.holder" value="Michael Bayne"/>
+  <property name="src.dir"     value="src/java"/>
+  <property name="deploy.dir"  value="dist"/>
+  <property name="dist.jar"    value="${app.name}.jar"/>
+  <property name="javadoc.dir" value="${deploy.dir}/docs"/>
 
   <!-- declare our classpath -->
   <path id="classpath">
-    <fileset dir="${java.libraries}" includes="**/*.jar"/>
-    <fileset dir="lib" includes="**/*.jar"/>
     <pathelement location="${deploy.dir}/classes"/>
+    <fileset dir="lib" includes="**/*.jar"/>
+    <fileset dir="${java.libraries}" includes="**/*.jar"/>
   </path>
 
   <!-- prepares the application directories -->
@@ -26,7 +28,7 @@
     <mkdir dir="${deploy.dir}/classes"/>
     <mkdir dir="${javadoc.dir}"/>
     <copy todir="${deploy.dir}/classes">
-      <fileset dir="src/java" includes="**/*.properties"/>
+      <fileset dir="${src.dir}" includes="**/*.properties"/>
     </copy>
   </target>
 
@@ -37,7 +39,7 @@
 
   <!-- build the java class files -->
   <target name="compile" depends="prepare">
-    <javac srcdir="src/java" destdir="${deploy.dir}/classes"
+    <javac srcdir="${src.dir}" destdir="${deploy.dir}/classes"
            debug="on" optimize="off" deprecation="off">
       <classpath refid="classpath"/>
     </javac>
@@ -45,25 +47,25 @@
 
   <!-- build the javadoc documentation -->
   <target name="javadoc" depends="prepare">
-    <javadoc sourcepath="src/java"
+    <javadoc sourcepath="${src.dir}"
              packagenames="${doc.packages}"
              windowtitle="${app.name} API"
              doctitle="${app.name} API"
-             overview="src/java/com/samskivert/viztool/overview.html"
+             overview="${src.dir}/${doc.overview}"
              bottom="Copyright &#169; 2001 ${copyright.holder}. All Rights Reserved."
              destdir="${javadoc.dir}">
       <classpath refid="classpath"/>
-      <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
       <link href="http://www.waywardgeeks.org/code/samskivert/javadoc"/>
+      <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
     </javadoc>
   </target>
 
-  <!-- the default target is to rebuild everything -->
-  <target name="all" depends="clean,prepare,compile,javadoc"/>
+  <!-- a target for rebuilding everything -->
+  <target name="all" depends="clean,prepare,compile,javadoc,dist"/>
 
   <!-- builds our distribution files (war and jar) -->
   <target name="dist" depends="prepare,compile">
-    <jar jarfile="${deploy.dir}/${dist.jar}"
+    <jar file="${deploy.dir}/${dist.jar}"
          basedir="${deploy.dir}/classes"/>
   </target>