--- projects/cms/source/server/build.xml	2001/05/14 02:43:23	1.2
+++ projects/cms/source/server/build.xml	2001/05/18 00:40:34	1.4
@@ -6,8 +6,8 @@
       build/jar util package
       install target
       cvs version build (including cleanup)
-      javadoc
       sql table generation
+      drop shortcut targets
   -->
   
   <!-- 
@@ -58,6 +58,10 @@
     <antcall target="fullcleanup"/>
   </target>
   
+  <target name="javadoc">
+    <antcall target="javadocapi"/>
+  </target>
+  
   <!-- 
     =====================================================
       Fetch required libraries (not in dependency tree)
@@ -68,27 +72,27 @@
   <!-- fullcleanup target has same problem -->
   <target name="getlibs" depends="config">
     <get
-      src="http://killigrew.ukc.ac.uk/crimson.jar"
+      src="${LIBURL}/crimson.jar"
       dest="${LIBDIR}/crimson.jar"
       verbose="true" usetimestamp="true"
     />
     <get
-      src="http://killigrew.ukc.ac.uk/idl.jar"
+      src="${LIBURL}/idl.jar"
       dest="${LIBDIR}/idl.jar"
       verbose="true" usetimestamp="true"
     />
     <get
-      src="http://killigrew.ukc.ac.uk/jacorb.jar"
+      src="${LIBURL}/jacorb.jar"
       dest="${LIBDIR}/jacorb.jar"
       verbose="true" usetimestamp="true"
     />
     <get
-      src="http://killigrew.ukc.ac.uk/jaxp.jar"
+      src="${LIBURL}/jaxp.jar"
       dest="${LIBDIR}/jaxp.jar"
       verbose="true" usetimestamp="true"
     />
     <get
-      src="http://killigrew.ukc.ac.uk/mm.mysql-2.0.4-bin.jar"
+      src="${LIBURL}/mm.mysql-2.0.4-bin.jar"
       dest="${LIBDIR}/mm.mysql-2.0.4-bin.jar"
       verbose="true" usetimestamp="true"
     />
@@ -196,6 +200,7 @@ Class-Path: ${MFCLPATH}
     <delete file="${BUILDDIR}/${TARFILE}"/>
     <delete file="${BUILDDIR}/${TARGZFILE}"/>
     <delete file="${BUILDDIR}/${ZIPFILE}"/>
+    <delete dir="${JDOCDIR}"/>
   </target>
   
   <target name="fullcleanup" depends="cleanup">
@@ -211,12 +216,42 @@ Class-Path: ${MFCLPATH}
     =====================================================
   -->
   
-  <!-- is this really the best way to do this? -->
+  <!-- is this really the best way to do this? no... -->
   <target name="runserver" depends="config">
     <java classname="${MFMAINCLASS}" dir="${BUILDDIR}" fork="yes">
       <arg line="-f ${RUNFILTERNAME}"/>
       <classpath path="${BUILDDIR}/${SERVERJAR}"/>
     </java>
+  </target>
+  
+  <!-- 
+    =====================================================
+      Javadoc (not in dependency tree)
+    =====================================================
+  -->
+  
+  <target name="javadocapi" depends="config, genidl">
+    <mkdir dir="${JDOCDIR}"/>
+    <!-- link in here requires a live net link! -->
+    <javadoc
+      packagenames="${JDOCPKGS}"
+      destdir="${JDOCDIR}"
+      classpath="${JCCLASSPATH}"
+      author="true"
+      version="true"
+      private="true"
+      use="true"
+      windowtitle="${JDOCTITLE}"
+      header="${JDOCHEADER}"
+      bottom="${JDOCBOTTOM}"
+      link="${JDOCJAPI}"
+    >
+      <!-- need to do idl generated source too -->
+      <sourcepath>
+        <pathelement path="${SOURCEROOT}"/>
+        <pathelement path="${IDLDIR}"/>
+      </sourcepath>
+    </javadoc>
   </target>
   
 </project>