--- projects/cms/source/server/build.xml	2001/05/18 00:40:34	1.4
+++ projects/cms/source/server/build.xml	2001/05/18 01:01:11	1.5
@@ -1,13 +1,11 @@
 <!-- build file for server -->
-<project name="iscream-server" default="package">
+<project name="iscream-server" default="usage">
   
   <!--
     TODO:
-      build/jar util package
       install target
       cvs version build (including cleanup)
-      sql table generation
-      drop shortcut targets
+      sql table generation -- to be removed
   -->
   
   <!-- 
@@ -26,42 +24,31 @@
   
   <!-- 
     =====================================================
-      Main targets (shortcuts essentially)
+      Usage
     ===================================================== 
   -->
   
-  <target name="fetch">
-    <antcall target="getlibs"/>
+  <target name="usage">
+    <echo>
+    
+     These are the targets supported by this ANT build script:
+     
+     fetch        - fetch all the JAR library files
+     idl          - generate java source from IDL
+     build        - compile all source code
+     package      - generate JAR package and distributions
+     packageutil  - generate UTIL JAR package
+     javadoc      - generate javadoc API
+     clean        - clean all generated files
+     distclean    - remove 'fetched' libraries + clean
+     run          - run the server
+    </echo>
   </target>
   
-  <target name="idl">
-    <antcall target="genidl"/>
+  <target name="help">
+    <antcall target="usage"/>
   </target>
   
-  <target name="build">
-    <antcall target="compile"/>
-  </target>
-  
-  <target name="package">
-    <antcall target="makedist"/>
-  </target>
-  
-  <target name="run">
-    <antcall target="runserver"/>
-  </target>
-  
-  <target name="clean">
-    <antcall target="cleanup"/>
-  </target>
-  
-  <target name="distclean">
-    <antcall target="fullcleanup"/>
-  </target>
-  
-  <target name="javadoc">
-    <antcall target="javadocapi"/>
-  </target>
-  
   <!-- 
     =====================================================
       Fetch required libraries (not in dependency tree)
@@ -70,7 +57,7 @@
   
   <!-- this uses static names, which is messy -->
   <!-- fullcleanup target has same problem -->
-  <target name="getlibs" depends="config">
+  <target name="fetch" depends="config">
     <get
       src="${LIBURL}/crimson.jar"
       dest="${LIBDIR}/crimson.jar"
@@ -106,7 +93,7 @@
   -->
   
   <!-- generate java code from idl files -->
-  <target name="genidl" depends="config">
+  <target name="idl" depends="config">
     <echo message="Generating Java source from IDL"/>
     <java classname="${IDLPARSER}">
       <arg line="-d ${IDLDIR} ${IDLFILE}"/>
@@ -120,7 +107,7 @@
     =====================================================
   -->
 
-  <target name="compileidl" depends="genidl">
+  <target name="buildidl" depends="idl">
     <javac
       srcdir="${IDLDIR}"
       destdir="${BUILDDIR}"
@@ -132,7 +119,7 @@
     />
   </target>
   
-  <target name="compile" depends="compileidl">
+  <target name="build" depends="buildidl">
     <javac
       srcdir="${SOURCEROOT}"
       destdir="${BUILDDIR}"
@@ -150,7 +137,7 @@
     =====================================================
   -->
   
-  <target name="makejar" depends="compile">
+  <target name="makejar" depends="build">
     <echo file="${BUILDDIR}/MANIFEST_TMP"
 >Manifest-Version: 1.0
 Created-By: www.i-scream.org.uk
@@ -185,7 +172,7 @@ Class-Path: ${MFCLPATH}
     />
   </target>
   
-  <target name="makedist" depends="maketardist, makezipdist"/>
+  <target name="package" depends="maketardist, makezipdist"/>
   
   <!-- 
     =====================================================
@@ -193,17 +180,18 @@ Class-Path: ${MFCLPATH}
     =====================================================
   -->
   
-  <target name="cleanup" depends="config">
+  <target name="clean" depends="config">
     <delete dir="${IDLDIR}/${ROOTPKG}"/>
     <delete dir="${BUILDDIR}/${ROOTPKG}"/>
     <delete file="${BUILDDIR}/${SERVERJAR}"/>
+    <delete file="${BUILDDIR}/${UTILJAR}"/>
     <delete file="${BUILDDIR}/${TARFILE}"/>
     <delete file="${BUILDDIR}/${TARGZFILE}"/>
     <delete file="${BUILDDIR}/${ZIPFILE}"/>
     <delete dir="${JDOCDIR}"/>
   </target>
   
-  <target name="fullcleanup" depends="cleanup">
+  <target name="distclean" depends="clean">
     <!-- this is messy, we should only delete specific jars -->
     <delete>
       <fileset dir="${LIBDIR}" includes="*.jar"/>
@@ -212,12 +200,12 @@ Class-Path: ${MFCLPATH}
   
   <!-- 
     =====================================================
-      Running (not in dependency tree)
+      Running
     =====================================================
   -->
   
   <!-- is this really the best way to do this? no... -->
-  <target name="runserver" depends="config">
+  <target name="run" depends="config">
     <java classname="${MFMAINCLASS}" dir="${BUILDDIR}" fork="yes">
       <arg line="-f ${RUNFILTERNAME}"/>
       <classpath path="${BUILDDIR}/${SERVERJAR}"/>
@@ -226,11 +214,11 @@ Class-Path: ${MFCLPATH}
   
   <!-- 
     =====================================================
-      Javadoc (not in dependency tree)
+      Javadoc
     =====================================================
   -->
   
-  <target name="javadocapi" depends="config, genidl">
+  <target name="javadoc" depends="config, idl">
     <mkdir dir="${JDOCDIR}"/>
     <!-- link in here requires a live net link! -->
     <javadoc
@@ -252,6 +240,33 @@ Class-Path: ${MFCLPATH}
         <pathelement path="${IDLDIR}"/>
       </sourcepath>
     </javadoc>
+  </target>
+  
+  <!-- 
+    =====================================================
+      Util Package
+    =====================================================
+  -->
+  
+  <!-- MUST clean here to ensure util package is tidy -->
+  <target name="buildutil" depends="config, clean">
+    <javac
+      srcdir="${SOURCEROOT}"
+      destdir="${BUILDDIR}"
+      classpath="${JCCLASSPATH}"
+      includes="${UTILSRC}"
+      debug="${JCDEBUG}"
+      optimize="${JCOPTIM}"
+      deprecation="${JCDEPRE}"
+    />
+  </target>
+  
+  <target name="packageutil" depends="buildutil">
+    <jar
+      jarfile="${BUILDDIR}/${UTILJAR}"
+      basedir="${BUILDDIR}"
+      includes="uk/**/*.class"
+    />
   </target>
   
 </project>