--- projects/cms/source/server/build.xml	2001/05/18 00:40:34	1.4
+++ projects/cms/source/server/build.xml	2001/05/18 02:12:33	1.8
@@ -1,15 +1,6 @@
 <!-- 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
-  -->
-  
   <!-- 
     =====================================================
       Initialisation & Configuration
@@ -26,42 +17,39 @@
   
   <!-- 
     =====================================================
-      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
+     
+     cvsbuild     - build from cvs tag 
+                      use -Drev=TAG switch to specify cvs tag
+     
+     javadoc      - generate javadoc API
+     install      - install server 
+                      use -Dprefix=/path/ switch to specify dest
+     run          - run the server
+     
+     clean        - clean all generated files
+     distclean    - remove 'fetched' libraries + clean
+    </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 +58,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 +94,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 +108,7 @@
     =====================================================
   -->
 
-  <target name="compileidl" depends="genidl">
+  <target name="buildidl" depends="idl">
     <javac
       srcdir="${IDLDIR}"
       destdir="${BUILDDIR}"
@@ -132,7 +120,7 @@
     />
   </target>
   
-  <target name="compile" depends="compileidl">
+  <target name="build" depends="buildidl">
     <javac
       srcdir="${SOURCEROOT}"
       destdir="${BUILDDIR}"
@@ -150,7 +138,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 +173,7 @@ Class-Path: ${MFCLPATH}
     />
   </target>
   
-  <target name="makedist" depends="maketardist, makezipdist"/>
+  <target name="package" depends="maketardist, makezipdist"/>
   
   <!-- 
     =====================================================
@@ -193,17 +181,23 @@ 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}/${TARFILE}"/>
-    <delete file="${BUILDDIR}/${TARGZFILE}"/>
-    <delete file="${BUILDDIR}/${ZIPFILE}"/>
     <delete dir="${JDOCDIR}"/>
+    <delete dir="${CVSBUILDTEMP}"/>
+    <delete>
+      <fileset dir="${BUILDDIR}">
+        <include name="${SERVERJAR}"/>
+        <include name="${UTILJAR}"/>
+        <include name="${ARCNAME}*${TAREXT}"/>
+        <include name="${ARCNAME}*${TARGZEXT}"/>
+        <include name="${ARCNAME}*${ZIPEXT}"/>
+      </fileset>
+    </delete>
   </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 +206,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 +220,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 +246,96 @@ 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>
+  
+  <!-- 
+    =====================================================
+      Install
+    =====================================================
+  -->
+  
+  <target name="install" depends="config, makejar">
+    <mkdir dir="${INSTALLDEST}"/>
+    <mkdir dir="${INSTALLDEST}/etc"/>
+    <mkdir dir="${INSTALLDEST}/lib"/>
+    <copy file="${BUILDDIR}/${SERVERJAR}" todir="${INSTALLDEST}"/>
+    <copy file="${BUILDDIR}/run.sh" todir="${INSTALLDEST}"/>
+    <copy file="${BUILDDIR}/run.bat" todir="${INSTALLDEST}"/>
+    <copy todir="${INSTALLDEST}/lib" >
+      <fileset dir="${LIBDIR}">
+        <include name="**/*.jar"/>
+        <exclude name="**/CVS/*"/>
+      </fileset>
+    </copy>
+    <copy todir="${INSTALLDEST}/etc" >
+      <fileset dir="${BUILDDIR}/etc">
+        <include name="**/*"/>
+        <exclude name="**/CVS/*"/>
+      </fileset>
+    </copy>
+    <copy file="${BUILDDIR}/README" todir="${INSTALLDEST}"/>
+  </target>
+  
+  <!-- 
+    =====================================================
+      CVS Build
+    =====================================================
+  -->
+  
+  <target name="cvsbuild" depends="config">
+    <mkdir dir="${CVSBUILDTEMP}"/>
+    <cvs
+      cvsRoot="${CVSROOT}"
+      command="export -d ${CVSBUILDTEMP}"
+      tag="${REVISION}"
+      package="${CVSMODULE}"
+    />
+    <!-- it would be IDEAL to use the ant target here.
+         BUT, it would need to use it's OWN properties.
+         exec is a poor substitute.
+         no idea about windows compatibility. -->
+    <exec executable="ant" dir="${CVSBUILDTEMP}">
+      <arg value="fetch"/>
+    </exec>
+    <exec executable="ant" dir="${CVSBUILDTEMP}">
+      <arg value="packageutil"/>
+    </exec>
+    <exec executable="ant" dir="${CVSBUILDTEMP}">
+      <arg value="package"/>
+    </exec>
+    <copy file="${CVSBUILDTEMP}/build/${TARGZFILE}"
+          tofile="${BUILDDIR}/${ARCNAME}-${REVISION}${TARGZEXT}"/>
+    <copy file="${CVSBUILDTEMP}/build/${ZIPFILE}"
+          tofile="${BUILDDIR}/${ARCNAME}-${REVISION}${ZIPEXT}"/>
+    <!-- should we be overwriting any old util jar here? -->
+    <copy file="${CVSBUILDTEMP}/build/${UTILJAR}" todir="${BUILDDIR}"/>
   </target>
   
 </project>