--- projects/cms/source/server/build.xml	2001/05/18 01:02:07	1.6
+++ projects/cms/source/server/build.xml	2002/02/02 19:40:38	1.12
@@ -1,12 +1,8 @@
-<!-- build file for server -->
+<!-- build file for i-scream CMS server -->
+<!-- $Id: build.xml,v 1.12 2002/02/02 19:40:38 tdb Exp $ -->
+
 <project name="iscream-server" default="usage">
   
-  <!--
-    TODO:
-      install target
-      cvs version build (including cleanup)
-  -->
-  
   <!-- 
     =====================================================
       Initialisation & Configuration
@@ -33,14 +29,26 @@
      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
-     run          - run the server
+     
+     Recommend to run the following target order:
+     
+     fetch packageutil package javadoc install
     </echo>
   </target>
   
@@ -55,7 +63,7 @@
   -->
   
   <!-- this uses static names, which is messy -->
-  <!-- fullcleanup target has same problem -->
+  <!-- distclean target has same problem -->
   <target name="fetch" depends="config">
     <get
       src="${LIBURL}/crimson.jar"
@@ -78,8 +86,8 @@
       verbose="true" usetimestamp="true"
     />
     <get
-      src="${LIBURL}/mm.mysql-2.0.4-bin.jar"
-      dest="${LIBDIR}/mm.mysql-2.0.4-bin.jar"
+      src="${LIBURL}/mm.mysql-2.0.11-bin.jar"
+      dest="${LIBDIR}/mm.mysql-2.0.11-bin.jar"
       verbose="true" usetimestamp="true"
     />
     <!-- also get jacorb.properties? -->
@@ -95,7 +103,7 @@
   <target name="idl" depends="config">
     <echo message="Generating Java source from IDL"/>
     <java classname="${IDLPARSER}">
-      <arg line="-d ${IDLDIR} ${IDLFILE}"/>
+      <arg line="-sloppy_names -d ${IDLDIR} ${IDLFILE}"/>
       <classpath path="${IDLPARSERJAR}"/>
     </java>
   </target>
@@ -182,12 +190,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">
@@ -266,6 +279,69 @@ Class-Path: ${MFCLPATH}
       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>