Commit emails of the iDok project

["AFS account Roman Geus" <geus AT savannah.psi.ch>]

Author: geus
Date: Fri Mar  7 14:10:03 2008
New Revision: 29

Log:
Refactored "dist" target of ant build file

Modified:
   trunk/build.xml

Modified: trunk/build.xml
==============================================================================
--- trunk/build.xml     (original)
+++ trunk/build.xml     Fri Mar  7 14:10:03 2008
@@ -1,6 +1,6 @@
 <project name="idok" default="dist" basedir=".">
 
-       <dirname property="idok.basedir" file="${ant.file.idok}"/>
+       <dirname property="idok.basedir" file="${ant.file.idok}" />
 
        <!-- set global properties for this build -->
        <property name="idlj.exec" value="idlj" />
@@ -11,8 +11,10 @@
        <property name="report.dir" location="ant_report" />
        <property name="junit.out.dir.xml" value="${report.dir}/junit/xml" />
        <property name="junit.out.dir.html" value="${report.dir}/junit/html" 
/>
-       <property name="revinfo.file" 
value="java/ch/idok/common/util/RevisionInfo.java" />
-       <property name="keystore.file" 
value="java/ch/idok/service/common/dms.jks" />
+       <property name="revinfo.file"
+                 value="java/ch/idok/common/util/RevisionInfo.java" />
+       <property name="keystore.file"
+                 value="java/ch/idok/service/common/dms.jks" />
        <property name="keystore.passwd" value="P7GXtm6rPr5pT988N4Gm" />
 
        <!-- jar files needed at runtime -->
@@ -58,15 +60,29 @@
                <include name="**/translations/*.qm" />
        </patternset>
 
-       <target name="clean-idl" depends="" description="delete Java files 
generated from CORBA IDL files">
-               <delete dir="java/ch/idok/service/common/common/corba/obj" 
quiet="true" includeEmptyDirs="true" />
-               <delete 
dir="java/ch/idok/service/common/clienthandler/corba/obj" quiet="true" 
includeEmptyDirs="true" />
-               <delete dir="java/ch/idok/service/common/cli/corba/obj" 
quiet="true" includeEmptyDirs="true" />
-               <delete dir="java/ch/idok/service/common/search/corba/obj" 
quiet="true" includeEmptyDirs="true" />
-               <delete dir="java/ch/idok/service/common/admin/corba/obj" 
quiet="true" includeEmptyDirs="true" />
+       <target name="clean-idl"
+               depends=""
+               description="delete Java files generated from CORBA IDL 
files">
+               <delete dir="java/ch/idok/service/common/common/corba/obj"
+                       quiet="true"
+                       includeEmptyDirs="true" />
+               <delete 
dir="java/ch/idok/service/common/clienthandler/corba/obj"
+                       quiet="true"
+                       includeEmptyDirs="true" />
+               <delete dir="java/ch/idok/service/common/cli/corba/obj"
+                       quiet="true"
+                       includeEmptyDirs="true" />
+               <delete dir="java/ch/idok/service/common/search/corba/obj"
+                       quiet="true"
+                       includeEmptyDirs="true" />
+               <delete dir="java/ch/idok/service/common/admin/corba/obj"
+                       quiet="true"
+                       includeEmptyDirs="true" />
        </target>
 
-       <target name="idlj" depends="clean-idl" description="generate Java 
files from CORBA IDL files">
+       <target name="idlj"
+               depends="clean-idl"
+               description="generate Java files from CORBA IDL files">
                <exec executable="${idlj.exec}">
                        <arg line="-i corba -td java -fall -emitAll 
-pkgTranslate clienthandler ch.idok.service.common.clienthandler.corba.obj 
-pkgTranslate cli ch.idok.service.common.cli.corba.obj -pkgTranslate common 
ch.idok.service.common.common.corba.obj -v corba/cli.idl" />
                </exec>
@@ -78,33 +94,46 @@
                </exec>
        </target>
 
-       <target name="clean-juic" depends="" description="delete Java files 
generated by juic">
+       <target name="clean-juic"
+               depends=""
+               description="delete Java files generated by juic">
                <delete>
                        <fileset dir="java" includes="**/Ui_*.java" />
                </delete>
        </target>
 
-       <target name="juic" depends="clean-juic" description="generate Qt 
Jambi UI classes">
+       <target name="juic"
+               depends="clean-juic"
+               description="generate Qt Jambi UI classes">
                <exec dir="java" executable="${juic.exec}">
                        <arg line="-a -cp ." />
                </exec>
        </target>
 
-       <target name="generate-revinfo" description="generate revision info 
Java file">
-               <mkdir dir="${build.dir}"/>
-               
+       <target name="generate-revinfo"
+               description="generate revision info Java file">
+               <mkdir dir="${build.dir}" />
+
                <!-- Compile GetRevisionInfo class -->
-               <javac srcdir="java" includes="**/GetRevisionInfo.java" 
target="1.5" debug="true" destdir="${build.dir}">
+               <javac srcdir="java"
+                      includes="**/GetRevisionInfo.java"
+                      target="1.5"
+                      debug="true"
+                      destdir="${build.dir}">
                        <classpath>
                                <fileset refid="idok.libs.runtime" />
                        </classpath>
                </javac>
 
                <!-- Obtain revision number and date of working copy project 
directory -->
-               <java classname="ch.idok.tools.GetRevisionInfo" 
classpath="lib/svnkit.jar:${build.dir}" outputproperty="revinfo.revision">
+               <java classname="ch.idok.tools.GetRevisionInfo"
+                     classpath="lib/svnkit.jar:${build.dir}"
+                     outputproperty="revinfo.revision">
                        <arg value="revision" />
                </java>
-               <java classname="ch.idok.tools.GetRevisionInfo" 
classpath="lib/svnkit.jar:${build.dir}" outputproperty="revinfo.date">
+               <java classname="ch.idok.tools.GetRevisionInfo"
+                     classpath="lib/svnkit.jar:${build.dir}"
+                     outputproperty="revinfo.date">
                        <arg value="date" />
                </java>
 
@@ -132,13 +161,19 @@
                </echo>
        </target>
 
-       <target name="compile" depends="juic,idlj,generate-revinfo" 
description="compile the source">
+       <target name="compile"
+               depends="juic,idlj,generate-revinfo"
+               description="compile the source">
                <!-- Delete build directory to force full recompile -->
                <delete dir="${build.dir}" />
                <mkdir dir="${build.dir}" />
 
                <!-- Compile the java code into ${build.dir} -->
-               <javac srcdir="java" source="1.5" target="1.5" debug="true" 
destdir="${build.dir}">
+               <javac srcdir="java"
+                      source="1.5"
+                      target="1.5"
+                      debug="true"
+                      destdir="${build.dir}">
                        <classpath>
                                <fileset refid="idok.libs.runtime" />
                                <fileset refid="idok.libs.dev" />
@@ -148,31 +183,51 @@
                <!-- Copy resources to build directory -->
                <copy todir="${build.dir}" overwrite="y">
                        <fileset dir="java">
-                               <patternset refid="resources.pattern"/>
+                               <patternset refid="resources.pattern" />
                        </fileset>
                </copy>
        </target>
 
-       <target name="dist" depends="compile" description="generate the 
distribution">
-
-               <path id="src.dir.client.thin">
-                       <!-- Source directories for thin client -->
-                       <dirset dir="java">
-                               <include name="ch/idok/common/config" />
-                               <include name="ch/idok/common/client" />
-                               <include name="ch/idok/common/errorhandling" 
/>
-                               <include name="ch/idok/common/util" />
-                               <include name="ch/idok/service/client" />
-                               <include name="ch/idok/service/common" />
-                       </dirset>
-               </path>
+       <target name="dist-common"
+               depends="compile"
+               description="prepare the distribution">
+
+               <fileset id="client.thin.jar.fileset"
+                        dir="${build.dir}"
+                        description="Java classes and resources for 
idok_thin.jar">
+                       <include name="ch/idok/common/config/**" />
+                       <include name="ch/idok/common/client/**" />
+                       <include name="ch/idok/common/errorhandling/**" />
+                       <include name="ch/idok/common/util/**" />
+                       <include name="ch/idok/service/client/**" />
+                       <include name="ch/idok/service/common/**" />
+                       <exclude name="**/*Test.class" />
+                       <exclude name="**/*TestBase.class" />
+               </fileset>
+
+               <fileset id="idok.jar.fileset"
+                        dir="${build.dir}"
+                        description="Java classes and resources for 
idok.jar">
+                       <include name="**" />
+                       <exclude name="**/*Test.class" />
+                       <exclude name="**/*TestBase.class" />
+                       <exclude name="ch/idok/qtgui/**" />
+                       <exclude name="com/trolltech/**" />
+               </fileset>
 
                <!-- Clean distribution directory ${dist.dir} -->
                <delete dir="${dist.dir}" />
                <mkdir dir="${dist.dir}" />
+       </target>
 
-               <!-- Put everything in ${build.dir} into the idok.jar file -->
-               <jar destfile="${dist.dir}/idok.jar" basedir="${build.dir}" 
excludes="**/*Test.class **/*TestBase.class ch/idok/qtgui/** 
com/trolltech/**" />
+       <target name="dist"
+               depends="dist-common"
+               description="generate the distribution">
+
+               <jar destfile="${dist.dir}/idok.jar"
+                    description="jar file for servers and fat clients">
+                       <fileset refid="client.thin.jar.fileset" />
+               </jar>
 
                <!-- Qt Jambi GUI related code -->
                <jar destfile="${dist.dir}/qtgui.jar">
@@ -186,18 +241,8 @@
 
                <!-- jar file for the thin client -->
                <jar destfile="${dist.dir}/idok_thin.jar">
-                       <fileset dir="${build.dir}">
-                               <include name="ch/idok/common/config/**" />
-                               <include name="ch/idok/common/client/**" />
-                               <include 
name="ch/idok/common/errorhandling/**" />
-                               <include name="ch/idok/common/util/**" />
-                               <include name="ch/idok/service/client/**" />
-                               <include name="ch/idok/service/common/**" />
-                               <exclude name="**/*Test.class" />
-                               <exclude name="**/*TestBase.class" />
-                       </fileset>
+                       <fileset refid="client.thin.jar.fileset" />
                </jar>
-
        </target>
 
        <target name="test" description="run unit tests" depends="compile">
@@ -232,18 +277,21 @@
 
        </target>
 
-       <target name="clean" depends="clean-idl" description="delete files 
generated by ant">
+       <target name="clean"
+               depends="clean-idl"
+               description="delete files generated by ant">
                <delete dir="${build.dir}" />
                <delete dir="${dist.dir}" />
                <delete dir="${report.dir}" />
        </target>
 
-       <target name="generate-api-doc" description="generate API 
documentation from source">
+       <target name="generate-api-doc"
+               description="generate API documentation from source">
                <mkdir dir="doc/images" />
                <exec executable="${doxygen.exec}">
                        <arg value="scripts/admin/doxygen/Doxyfile" />
                </exec>
                <echo>Doxygen warnings (if any) can be found within the 
doc/warn.log text file</echo>
        </target>
-       
+
 </project>