Commit emails of the iDok project

["AFS account Stadler Hans Christian" <stadler_h AT savannah.psi.ch>]

Author: stadler_h
Date: Thu Aug 14 13:29:29 2008
New Revision: 172

Log:
This ant script was left behind in an unusable state when the new directory 
layout was implemented

Modified:
   trunk/sites/psi/scripts/admin/dmsd/build.xml

Modified: trunk/sites/psi/scripts/admin/dmsd/build.xml
==============================================================================
--- trunk/sites/psi/scripts/admin/dmsd/build.xml        (original)
+++ trunk/sites/psi/scripts/admin/dmsd/build.xml        Thu Aug 14 13:29:29 
2008
@@ -10,7 +10,7 @@
                target uses the checkout target to fetch the sources from svn.
                
                The copy target uses an existing svn working copy to fetch 
the sources
-               and assumes your current directory is dms/dmsd.
+               and assumes your current directory is dms.
                For the checkout target, access to 
/afs/psi.ch/project/dms/svn/dms/trunk
                is required, do a klog.openafs first, if necessary.
        </description>
@@ -20,9 +20,15 @@
        
        <!-- SVN properties for dmsd -->
        <property name="svnurl" 
value="file:///afs/psi.ch/project/dms/svn/dms/trunk"/>
-       <property name="svncommon" value="common"/>
-       <property name="svndmsd" value="dmsd"/>
+       <property name="svnjava" value="java"/>
+       <property name="extra" value="dmsd"/>
+       <property name="svnextra" value="sites/psi/scripts/admin/${extra}"/>
        <property name="svnlib" value="lib"/>
+       <property name="common" value="ch/idok/common"/>
+       <property name="svncommon" value="${svnjava}/${common}"/>
+       <property name="dmsd" value="ch/idok/dmsd"/>
+       <property name="svndmsd" value="${svnjava}/${dmsd}"/>
+       <property name="svnrelroot" value="../../../../.."/>
        
        <!-- directories for source, build, and install image binary and 
library files -->
        <property name="tmp" location="/tmp/dmsd"/>
@@ -52,14 +58,15 @@
        <property name="uno-4" value="${unodir}/jurt.jar"/>
        <property name="exif" value="${distlib}/exif.jar"/>
        <property name="tar" value="${distlib}/tar.jar"/>
-       <property name="libcommon" value="${distlib}/${svncommon}.jar"/>
+       <property name="htmlparser" value="${distlib}/htmlparser.jar"/>
        
        <!-- Library sets -->
        <property name="uno-all" value="${uno-1}:${uno-2}:${uno-3}:${uno-4}"/>
-       <property name="lib-all" 
value="${libcommon}:${jsvn}:${lucene}:${pdf}:${fontbox}:${bcprov}:${bcmail}:${uno-all}:${exif}:${tar}"/>
+       <property name="lib-all" 
value="${jsvn}:${lucene}:${pdf}:${fontbox}:${bcprov}:${bcmail}:${uno-all}:${exif}:${tar}:${htmlparser}"/>
        
        <target name="init" description="Initialize timestamp properties and 
create necessary directories">
                <echo message="initializing"/>
+               <exec executable="pwd" failonerror="true"/>
                <tstamp/>
                <mkdir dir="${src}"/>
                <mkdir dir="${build}"/>
@@ -76,80 +83,66 @@
        </target>
        
        <target name="copy-lib" depends="init" description="Copy the jar 
files in lib from existing working copy">
-               <echo message="rsync -av --exclude .svn --delete ../lib 
${src}"/>
+               <echo message="rsync -av --exclude .svn --delete 
${svnrelroot}/${svnlib} ${src}"/>
                <exec executable="rsync" logError="true" failonerror="true">
-                       <arg line="-av --exclude .svn --delete ../lib 
${src}"/>
+                       <arg line="-av --exclude .svn --delete 
${svnrelroot}/${svnlib} ${src}"/>
                </exec>         
        </target>
                
        <target name="build-lib" depends="init" description="Copy libraries 
to build dir">
                <echo message="Copying libraries to build dir"/>
                <copy todir="${distlib}" overwrite="true">
-                       <fileset dir="${srclib}" casesensitive="yes" 
excludes="ulc*" includes="*.jar"/>
+                       <fileset dir="${srclib}" casesensitive="yes" 
includes="*.jar"/>
                </copy>
        </target>
        
-       <!-- Build common -->
-       <target name="checkout-common" depends="init" description="Checkout 
sources in common from svn repository">
-               <echo message="svn co ${svnurl}/${svncommon}"/>
+       <!-- Get common and dmsd java source -->
+       <target name="checkout-java" depends="init" description="Checkout 
java sources in common and dmsd from svn repository">
+               <echo message="svn co ${svnurl}/${svnjava}"/>
                <exec executable="svn" dir="${src}" logError="true" 
failonerror="true">
                        <arg value="co"/>
-                       <arg value="${svnurl}/${svncommon}"/>
+                       <arg value="${svnurl}/${svnjava}"/>
                </exec>
        </target>
 
-       <target name="copy-common" depends="init" description="Copy the 
sources in common from existing working copy">
-               <echo message="rsync -av --exclude .svn --delete ../common 
${src}"/>
+       <target name="copy-source" depends="init" description="Copy the java 
sources in common and dmsd from existing working copy">
+               <echo message="rsync -av --exclude .svn --delete 
${svnrelroot}/${svnjava} ${src}"/>
                <exec executable="rsync" logError="true" failonerror="true">
-                       <arg line="-av --exclude .svn --delete ../common 
${src}"/>
+                       <arg line="-av --exclude .svn --delete 
${svnrelroot}/${svnjava} ${src}"/>
+               </exec>         
+               <exec executable="rsync" logError="true" failonerror="true">
+                       <arg line="-av --exclude .svn --delete 
${svnrelroot}/${svnextra} ${src}"/>
                </exec>         
        </target>
-                       
+
+       <!-- Compile the common library -->
        <target name="compile-common" depends="build-lib" 
description="Compiles sources in common">
                <echo message="compiling common"/>
                <mkdir dir="${src}/${svncommon}"/>
                <mkdir dir="${build}/${svncommon}"/>
-               <javac srcdir="${src}/${svncommon}" 
destdir="${build}/${svncommon}" classpath="${jsvn}:${lucene}"
-                      includeAntRuntime="no" includeJavaRuntime="yes" 
listfiles="yes"  debug="${debug}"
-                          excludes="**/*Test.java,**/*TestBase.java"/>
-       </target>
-       
-       <target name="build-common" depends="compile-common" 
description="Build common jarfile">
-               <echo message="building common"/>
-               <jar jarfile="${distlib}/${svncommon}.jar" 
basedir="${build}/${svncommon}"/>
-       </target>
-       
-       <!-- Build dmsd -->
-       <target name="checkout-dmsd" depends="init" description="Checkout the 
sources in dmsd from svn repository">
-               <echo message="svn co ${svnurl}/${svndmsd}"/>
-               <exec executable="svn" dir="${src}" logError="true" 
failonerror="true">
-                       <arg value="co"/>
-                       <arg value="${svnurl}/${svndmsd}"/>
-               </exec>
+               <javac srcdir="${src}/${svnjava}" 
destdir="${build}/${svnjava}" classpath="${jsvn}:${lucene}"
+                       includeAntRuntime="no" includeJavaRuntime="yes" 
listfiles="yes"  debug="${debug}"
+                       includes="${common}/**/*.java" 
excludes="**/*Test.java,**/*TestBase.java"/>
        </target>
        
-       <target name="copy-dmsd" depends="init" description="Copy the sources 
in dmsd from existing working copy">
-               <echo message="rsync -av --exclude .svn --delete ../dmsd 
${src}"/>
-               <exec executable="rsync" logError="true" failonerror="true">
-                       <arg line="-av --exclude .svn --delete ../dmsd 
${src}"/>
-               </exec>         
-       </target>
-                       
-       <target name="compile-dmsd" depends="build-common" 
description="Compile sources in dmsd">
+       <!-- Compile dmsd -->
+       <target name="compile-dmsd" depends="compile-common" 
description="Compile sources in dmsd">
                <echo message="compiling dmsd"/>
                <mkdir dir="${src}/${svndmsd}"/>
                <mkdir dir="${build}/${svndmsd}"/>
-               <javac srcdir="${src}/${svndmsd}" 
destdir="${build}/${svndmsd}" classpath="${lib-all}"
-                          includeAntRuntime="no" includeJavaRuntime="yes" 
listfiles="yes" debug="${debug}"/>
-               <copy file="${src}/${svndmsd}/MANIFEST.MF" todir="${build}" 
overwrite="true"/>
+               <javac srcdir="${src}/${svnjava}" 
destdir="${build}/${svnjava}" classpath="${build}/${svnjava}:${lib-all}"
+                       includeAntRuntime="no" includeJavaRuntime="yes" 
listfiles="yes" debug="${debug}"
+                       includes="${dmsd}/**/*.java"/>
+               <copy file="${src}/${extra}/MANIFEST.MF" todir="${build}" 
overwrite="true"/>
        </target>
        
+       <!-- Build dmsd -->
        <target name="build-dmsd" depends="compile-dmsd" description="Build 
dmsd jarfile">
                <echo message="building dmsd"/>
-               <jar jarfile="${dist}/${svndmsd}.jar" 
basedir="${build}/${svndmsd}"
-                    manifest="${build}/MANIFEST.MF"/>
+               <jar jarfile="${dist}/dmsd.jar" basedir="${build}/${svnjava}"
+                       manifest="${build}/MANIFEST.MF"/>
                <copy todir="${dist}" overwrite="true">
-                       <fileset dir="${src}/${svndmsd}/dist" 
casesensitive="yes" includes="*"/>
+                       <fileset dir="${src}/${extra}/dist" 
casesensitive="yes" includes="*"/>
                </copy>
                <replace file="${dist}/dmsd" token="DEFINE_DMSD_DIR" 
value="DMSD_DIR=${dest}"/>
                <replace file="${dist}/dmsd.config" token="DEFINE_CLASS_PATH" 
value="${lib-all}"/>
@@ -165,13 +158,7 @@
                </copy>
        </target>
        
-       <target name="install-common" depends="build-common" 
description="Install common library">
-               <echo message="installing common"/>
-               <mkdir dir="${destlib}"/>
-               <copy file="${distlib}/${svncommon}.jar" todir="${destlib}" 
overwrite="true"/>
-       </target>
-       
-       <target name="install-dmsd" 
depends="install-lib,install-common,build-dmsd" description="Install dmsd">
+       <target name="install-dmsd" depends="install-lib,build-dmsd" 
description="Install dmsd">
                <echo message="installing dmsd"/>
                <mkdir dir="${dest}"/>
                <copy todir="${dest}" overwrite="true">
@@ -186,9 +173,9 @@
        </target>
        
        <!-- Do it all -->
-       <target name="checkout" 
depends="checkout-lib,checkout-common,checkout-dmsd" description="Checkout 
all sources from svn repository"/>
+       <target name="checkout" depends="checkout-lib,checkout-java" 
description="Checkout all sources from svn repository"/>
        
-       <target name="copy" depends="copy-lib,copy-common,copy-dmsd" 
description="Copy all sources from existing working copy"/>
+       <target name="copy" depends="copy-lib,copy-source" description="Copy 
all sources from existing working copy"/>
 
        <target name="build" depends="build-dmsd" description="Build 
everything"/>