--- projects/cms/source/server/build.xml	2001/05/18 01:32:15	1.7
+++ projects/cms/source/server/build.xml	2001/05/18 02:12:33	1.8
@@ -1,10 +1,6 @@
 <!-- build file for server -->
 <project name="iscream-server" default="usage">
   
-  <!--
-    TODO: cvs version build (including cleanup)
-  -->
-  
   <!-- 
     =====================================================
       Initialisation & Configuration
@@ -31,15 +27,22 @@
      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
-     install      - install server (use -Dprefix=/path/ switch)
-     run          - run the server
     </echo>
   </target>
   
@@ -181,12 +184,17 @@ Class-Path: ${MFCLPATH}
   <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}"/>
+    <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="distclean" depends="clean">
@@ -293,6 +301,41 @@ Class-Path: ${MFCLPATH}
       </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>