Changeset 15183

Show
Ignore:
Timestamp:
14.04.2008 10:09:13 (11 years ago)
Author:
kjdon
Message:

just tidied up the indentation using emacs, no other changes

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r15139 r15183  
    99<project name="greenstone3" default="usage" basedir="."> 
    1010 
    11     <!-- ============ classpath =================== --> 
    12     <path id="project.classpath"> 
    13        <fileset dir="lib/java"> 
    14           <include name="**/*.jar"/> 
    15        </fileset> 
    16     </path> 
    17  
    18     <!-- ============ self defined tasks =================== --> 
    19     <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpathref="project.classpath"/> 
    20     <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpathref="project.classpath"/> 
    21     <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/> 
    22     <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/> 
    23     <taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/> 
    24     <taskdef name="try" classname="ise.antelope.tasks.TryTask" classpathref="project.classpath"/> 
    25  
    26 <!-- ===================== Property Definitions =========================== --> 
    27  
    28 <!-- 
     11  <!-- ============ classpath =================== --> 
     12  <path id="project.classpath"> 
     13    <fileset dir="lib/java"> 
     14      <include name="**/*.jar"/> 
     15    </fileset> 
     16  </path> 
     17   
     18  <!-- ============ self defined tasks =================== --> 
     19  <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpathref="project.classpath"/> 
     20  <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpathref="project.classpath"/> 
     21  <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/> 
     22  <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/> 
     23  <taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/> 
     24  <taskdef name="try" classname="ise.antelope.tasks.TryTask" classpathref="project.classpath"/> 
     25   
     26  <!-- ===================== Property Definitions =========================== --> 
     27   
     28  <!-- 
    2929 
    3030  Each of the following properties are used in the build script. 
     
    3535 
    3636  * Definitions from a "build.properties" file in the top level 
    37     source directory of this application. 
     37  source directory of this application. 
    3838 
    3939  * Definitions from a "build.properties" file in the user's 
    40     home directory. 
     40  home directory. 
    4141 
    4242  * Default definitions in this build.xml file. 
     
    4848  "build.properties" files as well as in the "build.xml" script. 
    4949 
    50 --> 
     50  --> 
    5151 
    5252  <!--the first two properties have to be put on the top to be used by build.properties--> 
     
    7575  <!-- jni libraries and java wrappers go here --> 
    7676  <property name="lib.jni" value="${basedir}/lib/jni"/> 
    77      
     77   
    7878  <property name="javadocs" value="${basedir}/docs/javadoc"/> 
    7979 
     
    155155  </condition> 
    156156 
    157     <!-- where is search4j tool --> 
    158     <condition property="search4j.exec" value="bin/search4j.exe">  
    159         <isset property="current.os.iswindows"/> 
     157  <!-- where is search4j tool --> 
     158  <condition property="search4j.exec" value="bin/search4j.exe">  
     159    <isset property="current.os.iswindows"/> 
    160160  </condition> 
    161161  <property name="search4j.exec" value="bin/search4j"/> 
    162162 
    163      
     163   
    164164  <!-- ============= Base dirs for each package and component ============ --> 
    165165  <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/> 
     
    169169  <property name="gli.home" value="${basedir}/gli"/> 
    170170  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/> 
    171   
     171   
    172172  <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">--> 
    173173  <condition property="indexers.home" value="${basedir}/src/packages/indexers"> 
     
    185185 
    186186 
    187 <!--  ==================== Compilation Control Options ==================== --> 
    188  
    189 <!-- 
     187  <!--  ==================== Compilation Control Options ==================== --> 
     188 
     189  <!-- 
    190190 
    191191  These properties control option settings on the Javac compiler when it 
     
    198198  compile.optimize     Should compilation include the optimize option? 
    199199 
    200 --> 
     200  --> 
    201201 
    202202  <property name="compile.debug"       value="true"/> 
     
    204204  <property name="compile.optimize"    value="true"/> 
    205205 
    206 <!-- 
     206  <!-- 
    207207 
    208208  Rather than relying on the CLASSPATH environment variable, Ant includes 
     
    213213  that you explicitly added. 
    214214 
    215 --> 
     215  --> 
    216216 
    217217  <path id="compile.classpath"> 
     
    229229    <!-- Include the axis jar files --> 
    230230    <!--<fileset dir="${basedir}/comms/soap/axis/lib"> 
    231       <include name="*.jar"/> 
    232     </fileset>--> 
     231    <include name="*.jar"/> 
     232  </fileset>--> 
    233233     
    234234    <!-- include the jar files from the source packages --> 
     
    277277    <echo>os.unix: ${os.unix}</echo> 
    278278  </target> 
    279 <!-- ==================== Primary and Global Targets ============================= --> 
     279  <!-- ==================== Primary and Global Targets ============================= --> 
    280280 
    281281  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? --> 
     
    283283  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections,prepare-gdbm, prepare-flax" 
    284284    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this."> 
    285 <!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections" 
     285    <!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections" 
    286286    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this.">--> 
    287287 
     
    295295    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/> 
    296296   
    297 <!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web" 
    298     description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>--> 
     297  <!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web" 
     298  description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>--> 
    299299  <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web" 
    300300    description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/> 
     
    312312  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building" 
    313313    description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/> 
    314      
     314   
    315315  <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile"  
    316316    description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile."/> 
     
    318318  <target name="start" depends="init,start-tomcat" 
    319319    description="Startup the Tomcat server." > 
    320     <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>  
    321     <echo>Tomcat:   ${catalina.home}</echo>  
    322     <echo>Java: ${java.home}</echo> 
    323         <echo>URL:  http://${tomcat.server}:${tomcat.port}${app.path}/</echo> 
    324         <!-- assuming that index.html is not needed here -->    
     320    <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>  
     321    <echo>Tomcat:   ${catalina.home}</echo>  
     322    <echo>Java: ${java.home}</echo> 
     323    <echo>URL:  http://${tomcat.server}:${tomcat.port}${app.path}/</echo> 
     324    <!-- assuming that index.html is not needed here -->    
    325325  </target> 
    326326 
     
    331331 
    332332 
    333 <!-- =========== Help targets ===================================  --> 
     333  <!-- =========== Help targets ===================================  --> 
    334334   
    335335  <property name="install-command" value="ant [options] prepare install"/> 
     
    339339    <echo message="  Execute 'ant -help' for Ant help."/> 
    340340    <echo>To install Greenstone3, run '${install-command}'.  
    341 There are properties defined in build.properties. The install process will ask you if these properties are set correctly. To avoid this prompt, use the '-Dproperties.accepted=yes' option. 
    342 To log the output, use the '-logfile build.log' option. 
    343 The README.txt file has more information about the ant targets and install process. 
     341      There are properties defined in build.properties. The install process will ask you if these properties are set correctly. To avoid this prompt, use the '-Dproperties.accepted=yes' option. 
     342      To log the output, use the '-logfile build.log' option. 
     343      The README.txt file has more information about the ant targets and install process. 
    344344    </echo> 
    345345  </target> 
     
    351351  </target> 
    352352 
    353 <!-- ====== initialization and setup targets ================== --> 
     353  <!-- ====== initialization and setup targets ================== --> 
    354354 
    355355  <target name="accept-properties" unless="properties.accepted"> 
    356356    <input addproperty="properties.ok" validargs="y,n">The following properties (among others) are being used from a build.properties file found in this directory: 
    357 tomcat.server=${tomcat.server} 
    358 tomcat.port=${tomcat.port}  
    359 tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed) 
    360 proxy.host=${proxy.host} 
    361 proxy.port=${proxy.port} 
    362 If these are not acceptable, please change them and rerun this target. Continue [y/n]? /> 
     357      tomcat.server=${tomcat.server} 
     358      tomcat.port=${tomcat.port}  
     359      tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed) 
     360      proxy.host=${proxy.host} 
     361      proxy.port=${proxy.port} 
     362      If these are not acceptable, please change them and rerun this target. Continue [y/n]? /> 
    363363    </input> 
    364364    <condition property="do.abort">  
     
    368368  </target> 
    369369 
    370 <!--  <target name="check-cvsroot"> 
    371     <condition property="svnroot.notset"> 
    372       <or> 
    373             <not> 
    374               <isset property="env.CVSROOT"/> 
     370  <!--  <target name="check-cvsroot"> 
     371  <condition property="svnroot.notset"> 
     372  <or> 
     373  <not> 
     374  <isset property="env.CVSROOT"/> 
    375375            </not> 
    376             <equals arg1="" arg2="${env.CVSROOT}"/> 
     376  <equals arg1="" arg2="${env.CVSROOT}"/> 
    377377      </or> 
    378378    </condition> 
    379     <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/> 
     379  <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/> 
    380380  </target> --> 
    381381 
     
    405405    </condition> 
    406406     
    407       <echo>tomcat.port = ${tomcat.port}</echo> 
    408       <echo>gli.present = ${gli.present}</echo>  
    409       <echo>gs2build.present = ${gs2build.present}</echo> 
    410       <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo> 
    411      <!-- gsdl2.installed.path appears not to be set? --> 
     407    <echo>tomcat.port = ${tomcat.port}</echo> 
     408    <echo>gli.present = ${gli.present}</echo>  
     409    <echo>gs2build.present = ${gs2build.present}</echo> 
     410    <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo> 
     411    <!-- gsdl2.installed.path appears not to be set? --> 
    412412 
    413413    <condition property="proxy.present"> 
     
    440440    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/> 
    441441  </target> 
    442       
    443  <!-- ========== Web app Targets ================================ --> 
     442   
     443  <!-- ========== Web app Targets ================================ --> 
    444444   
    445445  <target name="prepare-web" depends="init,configure-java-version"> 
     
    452452    description="Activates or deactivates some jar libraries as needed depending on your java version"> 
    453453 
    454         <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/> 
     454    <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/> 
    455455    <condition property="need.xalan.jar"> 
    456             <or> 
    457                 <equals arg1="1.5" arg2="${ant.java.version}"/> 
    458                 <equals arg1="1.6" arg2="${ant.java.version}"/> 
    459             </or> 
    460         </condition> 
    461  
    462         <!-- if they have xalan.jar but dont need it --> 
    463         <if> 
    464             <bool> 
    465                 <and> 
    466                     <isset property="have.xalan.jar"/> 
    467                     <not><isset property="need.xalan.jar"/></not> 
    468                 </and> 
    469             </bool> 
    470             <antcall target="deactivate-xalan-jar"/> 
    471         </if> 
    472  
    473         <!-- if they need xalan.jar but dont have it --> 
    474         <if> 
    475             <bool> 
    476                 <and> 
    477                     <not><isset property="have.xalan.jar"/></not> 
    478                     <isset property="need.xalan.jar"/> 
    479                 </and> 
    480             </bool> 
    481             <antcall target="activate-xalan-jar"/> 
    482         </if> 
     456      <or> 
     457    <equals arg1="1.5" arg2="${ant.java.version}"/> 
     458    <equals arg1="1.6" arg2="${ant.java.version}"/> 
     459      </or> 
     460    </condition> 
     461 
     462    <!-- if they have xalan.jar but dont need it --> 
     463    <if> 
     464      <bool> 
     465    <and> 
     466      <isset property="have.xalan.jar"/> 
     467      <not><isset property="need.xalan.jar"/></not> 
     468    </and> 
     469      </bool> 
     470      <antcall target="deactivate-xalan-jar"/> 
     471    </if> 
     472 
     473    <!-- if they need xalan.jar but dont have it --> 
     474    <if> 
     475      <bool> 
     476    <and> 
     477      <not><isset property="have.xalan.jar"/></not> 
     478      <isset property="need.xalan.jar"/> 
     479    </and> 
     480      </bool> 
     481      <antcall target="activate-xalan-jar"/> 
     482    </if> 
    483483 
    484484  </target> 
    485485   
    486486  <target name="activate-xalan-jar"> 
    487         <echo>activating xalan.jar</echo> 
     487    <echo>activating xalan.jar</echo> 
    488488    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/> 
    489         <if><bool><isset property="current.os.ismac"/></bool> 
    490             <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>  
    491         </if> 
    492   </target> 
    493  
    494     <!-- to delete --> 
     489    <if><bool><isset property="current.os.ismac"/></bool> 
     490      <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>  
     491    </if> 
     492  </target> 
     493 
     494  <!-- to delete --> 
    495495  <target name="copy-xalan-for-mac"></target> 
    496496 
    497497  <target name="deactivate-xalan-jar"> 
    498         <echo>deactivating xalan.jar</echo> 
     498    <echo>deactivating xalan.jar</echo> 
    499499    <delete file="${web.lib}/xalan.jar"/> 
    500500  </target> 
     
    557557  </target> 
    558558 
    559     <target name="svnupdate-web" unless="nosvn.mode"> 
    560         <svn> 
    561             <update dir="${web.home}"/> 
    562         </svn> 
    563     </target> 
     559  <target name="svnupdate-web" unless="nosvn.mode"> 
     560    <svn> 
     561      <update dir="${web.home}"/> 
     562    </svn> 
     563  </target> 
    564564 
    565565  <target name="update-web" depends="init,svnupdate-web,configure-web" 
     
    567567 
    568568 
    569 <!-- ======================= Tomcat Targets ========================== --> 
     569  <!-- ======================= Tomcat Targets ========================== --> 
    570570   
    571571  <!-- this target downloads and installs Tomcat --> 
     
    623623    <!-- need to edit the config file, or do we get the user to do this???--> 
    624624  </target> 
    625      
     625   
    626626  <target name="start-tomcat" description="Startup only Tomcat" depends="init,configure-java-version" if="tomcat.islocal"> 
    627    <property name="tomcat.classpath" refid="local.tomcat.classpath"/> 
     627    <property name="tomcat.classpath" refid="local.tomcat.classpath"/> 
    628628    <property name="tomcat.path" refid="local.tomcat.path"/> 
    629629    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/> 
     
    692692 
    693693 
    694 <!-- ======================= ant Targets ============================ -->  
     694  <!-- ======================= ant Targets ============================ -->  
    695695  <target name="prepare-ant" depends="init"> 
    696696    <get src="http://www.greenstone.org/gs3files/apache-ant-1.7.0-bin.zip" 
     
    704704  </target> 
    705705 
    706 <!-- ======================= Axis Targets ============================ -->  
     706  <!-- ======================= Axis Targets ============================ -->  
    707707 
    708708  <target name="prepare-axis" depends="init"> 
     
    784784      </and> 
    785785    </condition> 
    786    </target>  
     786  </target>  
    787787 
    788788  <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files"  
     
    793793      tofile="${basedir}/resources/soap/${axis.sitename}.wsdd" 
    794794      filtering="true"/> 
    795      <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template" 
     795    <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template" 
    796796      tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd" 
    797797      filtering="true"/> 
     
    812812    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" /> 
    813813  </target> 
    814      
    815  
    816 <!-- ====================== Core targets ============================== --> 
    817 <!-- core targets refer to the core gsdl3 java src --> 
     814   
     815 
     816  <!-- ====================== Core targets ============================== --> 
     817  <!-- core targets refer to the core gsdl3 java src --> 
    818818   
    819819  <target name="prepare-core" unless="nocvs.mode"> 
    820820    <!-- just get rid of empty directories--> 
    821821    <svn> 
    822         <update dir="."/> 
    823     </svn> 
     822      <update dir="."/> 
     823    </svn> 
    824824  </target> 
    825825   
     
    831831  <target name="svnupdate-core" unless="nocvs.mode"> 
    832832 
    833     <svn> 
    834         <update dir="." recurse="false"/> 
    835     </svn> 
    836  
    837    <svn> 
    838         <update dir="bin"/> 
    839         <update dir="comms"/> 
    840         <update dir="dist-resources"/> 
    841         <update dir="docs"/> 
    842         <update dir="lib"/> 
    843         <update dir="resources"/> 
    844         <update dir="src"/> 
    845         <update dir="winutil"/> 
    846     </svn> 
     833    <svn> 
     834      <update dir="." recurse="false"/> 
     835    </svn> 
     836 
     837    <svn> 
     838      <update dir="bin"/> 
     839      <update dir="comms"/> 
     840      <update dir="dist-resources"/> 
     841      <update dir="docs"/> 
     842      <update dir="lib"/> 
     843      <update dir="resources"/> 
     844      <update dir="src"/> 
     845      <update dir="winutil"/> 
     846    </svn> 
    847847 
    848848  </target> 
     
    853853  </target> 
    854854 
    855    <target name="compile-core" depends="init"  
     855  <target name="compile-core" depends="init"  
    856856    description="Compile only the Greenstone core"> 
    857857    <mkdir dir="${build.home}"/> 
     
    887887      </manifest> 
    888888    </jar> 
    889        
     889     
    890890    <jar destfile="${build.home}/phind.jar"> 
    891891      <fileset dir="${build.home}"> 
     
    930930    <copy file="${build.home}/server.jar" todir="${basedir}"/> 
    931931  </target> 
    932   
    933 <!-- ================== Packages targets ================================ --> 
     932   
     933  <!-- ================== Packages targets ================================ --> 
    934934  <!-- these targets refer to the greenstone source packages - these need  
    935935  updating less often, so are in  separate targets to the core --> 
     
    937937   
    938938  <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nocvs.mode"> 
    939 <!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> --> 
     939    <!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> --> 
    940940    <svn> 
    941         <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/> 
    942     </svn> 
     941      <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/> 
     942    </svn> 
    943943  </target> 
    944944   
     
    951951 
    952952  <target name="svnupdate-packages" unless="nocvs.mode">  
    953    <svn> 
    954         <update dir="${src.packages.home}"/> 
    955     </svn> 
     953    <svn> 
     954      <update dir="${src.packages.home}"/> 
     955    </svn> 
    956956  </target> 
    957957   
     
    972972      <arg value="--prefix=${basedir}"/> 
    973973      <arg value="--libdir=${lib.jni}"/> 
    974      <arg value="--with-gdbm=${gdbm.installed.path}"/> 
     974      <arg value="--with-gdbm=${gdbm.installed.path}"/> 
    975975    </exec>     
    976976  </target> 
    977977 
    978 <!-- Message from oran. I removed the condition from this line becuase it meant 
    979     the indexers would only be configured if collection building was DISabled. 
    980     Shouldn't they be configured when collection building is ENabled? --> 
    981  
    982 <!--    <target name="configure-indexers" depends="init" if="independent-indexers"> --> 
    983 <target name="configure-indexers" depends="init"> 
    984         <echo>Configuring Indexers</echo> 
    985         <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}"> 
    986             <arg value="--prefix=${basedir}"/> 
    987             <arg value="--libdir=${lib.jni}"/> 
    988         </exec>           
    989     </target> 
     978  <!-- Message from oran. I removed the condition from this line becuase it meant 
     979  the indexers would only be configured if collection building was DISabled. 
     980  Shouldn't they be configured when collection building is ENabled? --> 
     981 
     982  <!--  <target name="configure-indexers" depends="init" if="independent-indexers"> --> 
     983  <target name="configure-indexers" depends="init"> 
     984    <echo>Configuring Indexers</echo> 
     985    <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}"> 
     986      <arg value="--prefix=${basedir}"/> 
     987      <arg value="--libdir=${lib.jni}"/> 
     988    </exec>           
     989  </target> 
    990990 
    991991  <target name="clean-packages" depends="init,clean-javagdbm,clean-indexers" description="Clean only the packages"/> 
     
    10041004    </exec> 
    10051005    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" 
    1006        dir="${indexers.home}"> 
    1007        <arg value="clean"/> 
    1008     </exec> 
    1009  
    1010   </target> 
    1011     
    1012     <target name="compile-packages" description="Compile only the source packages"> 
    1013           
    1014         <!-- javagdbm --> 
    1015         <echo>compile javagdbm</echo> 
    1016         <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/> 
    1017         <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"> 
    1018             <arg value="install"/> 
    1019         </exec> 
    1020  
    1021         <!-- windows: just the java stuff. --> 
    1022         <echo>Windows: compile javagdbm (java only)</echo> 
    1023         <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}"> 
    1024             <arg value="compile"/> 
    1025             <arg value="javaonly"/> 
    1026         </exec> 
    1027  
    1028         <!-- install the jar file --> 
    1029         <echo>Install the javagdbm jar file</echo> 
    1030         <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/> 
    1031  
    1032         <!-- Indexers --> 
    1033  
    1034         <!-- this may be in gs2build - we will be recompiling, but never mind --> 
    1035         <echo>Indexers: make (from ${indexers.home})</echo> 
    1036         <exec executable="make" os="${os.unix}" dir="${indexers.home}"/> 
    1037         <echo>Indexers: make install</echo> 
    1038         <exec executable="make" os="${os.unix}" dir="${indexers.home}"> 
    1039             <arg value="install"/> 
    1040         </exec> 
    1041  
    1042         <echo>Indexers: make</echo> 
    1043         <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 
    1044             <arg value="all"/> 
    1045         </exec> 
    1046         <echo>Indexers: make install</echo> 
    1047         <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 
    1048             <arg value="install"/> 
    1049         </exec> 
    1050  
    1051         <!-- install the jar and jni files --> 
    1052         <echo>Install the indexers' jar and jni files</echo> 
    1053         <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 
    1054         <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 
    1055         <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/> 
    1056         <antcall target="install-jni-files"/> 
    1057     </target> 
     1006      dir="${indexers.home}"> 
     1007      <arg value="clean"/> 
     1008    </exec> 
     1009 
     1010  </target> 
     1011   
     1012  <target name="compile-packages" description="Compile only the source packages"> 
     1013     
     1014    <!-- javagdbm --> 
     1015    <echo>compile javagdbm</echo> 
     1016    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/> 
     1017    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"> 
     1018      <arg value="install"/> 
     1019    </exec> 
     1020 
     1021    <!-- windows: just the java stuff. --> 
     1022    <echo>Windows: compile javagdbm (java only)</echo> 
     1023    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}"> 
     1024      <arg value="compile"/> 
     1025      <arg value="javaonly"/> 
     1026    </exec> 
     1027 
     1028    <!-- install the jar file --> 
     1029    <echo>Install the javagdbm jar file</echo> 
     1030    <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/> 
     1031 
     1032    <!-- Indexers --> 
     1033 
     1034    <!-- this may be in gs2build - we will be recompiling, but never mind --> 
     1035    <echo>Indexers: make (from ${indexers.home})</echo> 
     1036    <exec executable="make" os="${os.unix}" dir="${indexers.home}"/> 
     1037    <echo>Indexers: make install</echo> 
     1038    <exec executable="make" os="${os.unix}" dir="${indexers.home}"> 
     1039      <arg value="install"/> 
     1040    </exec> 
     1041 
     1042    <echo>Indexers: make</echo> 
     1043    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 
     1044      <arg value="all"/> 
     1045    </exec> 
     1046    <echo>Indexers: make install</echo> 
     1047    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 
     1048      <arg value="install"/> 
     1049    </exec> 
     1050 
     1051    <!-- install the jar and jni files --> 
     1052    <echo>Install the indexers' jar and jni files</echo> 
     1053    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 
     1054    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 
     1055    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/> 
     1056    <antcall target="install-jni-files"/> 
     1057  </target> 
    10581058 
    10591059  <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/> 
    10601060 
    1061     <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac"> 
     1061  <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac"> 
    10621062    <copy file="${mg.home}/jni/libmgretrievejni.so" todir="${lib.jni}"/> 
    10631063    <copy file="${mg.home}/jni/libmgsearchjni.so" todir="${lib.jni}"/> 
    1064      <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/> 
     1064    <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/> 
    10651065    <copy file="${mgpp.home}/jni/libmgppretrievejni.so" todir="${lib.jni}"/> 
    10661066    <copy file="${mgpp.home}/jni/libmgppsearchjni.so" todir="${lib.jni}"/> 
    1067      <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/> 
    1068    </target> 
    1069    <target name="install-jni-files-windows" depends="init" if="current.os.iswindows"> 
     1067    <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/> 
     1068  </target> 
     1069  <target name="install-jni-files-windows" depends="init" if="current.os.iswindows"> 
    10701070    <copy file="${mg.home}/jni/mgretrievejni.dll" todir="${lib.jni}"/> 
    10711071    <copy file="${mg.home}/jni/mgsearchjni.dll" todir="${lib.jni}"/> 
    1072      <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/> 
     1072    <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/> 
    10731073    <copy file="${mgpp.home}/jni/mgppretrievejni.dll" todir="${lib.jni}"/> 
    10741074    <copy file="${mgpp.home}/jni/mgppsearchjni.dll" todir="${lib.jni}"/> 
    1075      <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/> 
    1076    </target> 
    1077    <target name="install-jni-files-macos" depends="init" if="current.os.ismac"> 
     1075    <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/> 
     1076  </target> 
     1077  <target name="install-jni-files-macos" depends="init" if="current.os.ismac"> 
    10781078    <copy file="${mg.home}/jni/libmgretrievejni.jnilib" todir="${lib.jni}"/> 
    10791079    <copy file="${mg.home}/jni/libmgsearchjni.jnilib" todir="${lib.jni}"/> 
    1080      <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/> 
     1080    <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/> 
    10811081    <copy file="${mgpp.home}/jni/libmgppretrievejni.jnilib" todir="${lib.jni}"/> 
    10821082    <copy file="${mgpp.home}/jni/libmgppsearchjni.jnilib" todir="${lib.jni}"/> 
    1083      <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/> 
    1084    </target> 
    1085   
     1083    <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/> 
     1084  </target> 
     1085   
    10861086  <!-- ================== gs2building targets ===============--> 
    10871087 
     
    10951095 
    10961096  <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nocvs.mode"> 
    1097         <!-- please keep this function in sync with checkout-gs2build --> 
    1098  
    1099         <echo>updating gs2build</echo> 
    1100         <!-- svn updates --> 
    1101         <svn> 
    1102             <!-- perllib --> 
    1103             <update dir="gs2build/perllib" revision="${branch.revision}"/> 
    1104  
    1105             <!-- selected packages --> 
    1106             <update dir="gs2build/packages/cpan" revision="${branch.revision}" /> 
    1107             <update dir="gs2build/packages/expat" revision="${branch.revision}" /> 
    1108             <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" /> 
    1109             <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 
    1110             <update dir="gs2build/packages/kea" revision="${branch.revision}" /> 
    1111             <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 
    1112             <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 
    1113             <update dir="gs2build/packages/w3mir" revision="${branch.revision}" /> 
    1114             <update dir="gs2build/packages/wget" revision="${branch.revision}" /> 
    1115             <update dir="gs2build/packages/windows" revision="${branch.revision}" /> 
    1116             <update dir="gs2build/packages/wv" revision="${branch.revision}" /> 
    1117             <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" /> 
    1118             <update dir="gs2build/packages/yaz" revision="${branch.revision}" /> 
    1119              
    1120             <!-- some of src (db2txt hashfile phind txt2db) --> 
    1121             <update dir="gs2build/src/db2txt" revision="${branch.revision}" /> 
    1122             <update dir="gs2build/src/hashfile" revision="${branch.revision}" /> 
    1123             <update dir="gs2build/src/phind" revision="${branch.revision}" /> 
    1124             <update dir="gs2build/src/txt2db" revision="${branch.revision}" /> 
    1125  
    1126             <!-- bin --> 
    1127             <update dir="gs2build/bin/script" revision="${branch.revision}" /> 
    1128  
    1129             <!-- mappings --> 
    1130             <update dir="gs2build/mappings" revision="${branch.revision}"/> 
    1131  
    1132             <!-- etc/packages --> 
    1133             <update dir="gs2build/etc/packages" revision="${branch.revision}"/> 
    1134      
    1135             <!-- collect --> 
    1136             <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/> 
    1137  
    1138             <!-- gs2build-extra --> 
    1139             <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/> 
    1140  
    1141             <!-- indexers --> 
    1142             <update dir="gs2build/indexers" revision="${branch.revision}"/> 
    1143  
    1144             <!-- single files --> 
    1145              
    1146             <!-- some files from lib --> 
    1147             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 
    1148             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 
    1149             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 
    1150  
    1151             <!-- some files from etc --> 
    1152             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 
    1153             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 
    1154             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 
    1155             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 
    1156  
    1157             <!-- some files from the gsdl root directory --> 
    1158             <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 
    1159             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 
    1160             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 
    1161             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 
    1162             <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 
    1163             <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 
    1164             <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 
    1165             <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 
    1166             <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 
    1167         </svn> 
     1097    <!-- please keep this function in sync with checkout-gs2build --> 
     1098 
     1099    <echo>updating gs2build</echo> 
     1100    <!-- svn updates --> 
     1101    <svn> 
     1102      <!-- perllib --> 
     1103      <update dir="gs2build/perllib" revision="${branch.revision}"/> 
     1104 
     1105      <!-- selected packages --> 
     1106      <update dir="gs2build/packages/cpan" revision="${branch.revision}" /> 
     1107      <update dir="gs2build/packages/expat" revision="${branch.revision}" /> 
     1108      <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" /> 
     1109      <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 
     1110      <update dir="gs2build/packages/kea" revision="${branch.revision}" /> 
     1111      <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 
     1112      <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 
     1113      <update dir="gs2build/packages/w3mir" revision="${branch.revision}" /> 
     1114      <update dir="gs2build/packages/wget" revision="${branch.revision}" /> 
     1115      <update dir="gs2build/packages/windows" revision="${branch.revision}" /> 
     1116      <update dir="gs2build/packages/wv" revision="${branch.revision}" /> 
     1117      <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" /> 
     1118      <update dir="gs2build/packages/yaz" revision="${branch.revision}" /> 
     1119       
     1120      <!-- some of src (db2txt hashfile phind txt2db) --> 
     1121      <update dir="gs2build/src/db2txt" revision="${branch.revision}" /> 
     1122      <update dir="gs2build/src/hashfile" revision="${branch.revision}" /> 
     1123      <update dir="gs2build/src/phind" revision="${branch.revision}" /> 
     1124      <update dir="gs2build/src/txt2db" revision="${branch.revision}" /> 
     1125 
     1126      <!-- bin --> 
     1127      <update dir="gs2build/bin/script" revision="${branch.revision}" /> 
     1128 
     1129      <!-- mappings --> 
     1130      <update dir="gs2build/mappings" revision="${branch.revision}"/> 
     1131 
     1132      <!-- etc/packages --> 
     1133      <update dir="gs2build/etc/packages" revision="${branch.revision}"/> 
     1134       
     1135      <!-- collect --> 
     1136      <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/> 
     1137 
     1138      <!-- gs2build-extra --> 
     1139      <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/> 
     1140 
     1141      <!-- indexers --> 
     1142      <update dir="gs2build/indexers" revision="${branch.revision}"/> 
     1143 
     1144      <!-- single files --> 
     1145       
     1146      <!-- some files from lib --> 
     1147      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 
     1148      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 
     1149      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 
     1150 
     1151      <!-- some files from etc --> 
     1152      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 
     1153      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 
     1154      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 
     1155      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 
     1156 
     1157      <!-- some files from the gsdl root directory --> 
     1158      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 
     1159      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 
     1160      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 
     1161      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 
     1162      <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 
     1163      <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 
     1164      <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 
     1165      <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 
     1166      <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 
     1167    </svn> 
    11681168  </target> 
    11691169   
    11701170  <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nocvs.mode"> 
    11711171    <svn> 
    1172         <update dir="${gli.home}" revision="${branch.revision}"/> 
    1173     </svn> 
     1172      <update dir="${gli.home}" revision="${branch.revision}"/> 
     1173    </svn> 
    11741174  </target> 
    11751175 
    11761176  <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled"> 
    11771177  </target> 
    1178     <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 
    1179         <!-- please keep this function in sync with update-gs2build --> 
    1180         <echo>checking out gs2build</echo> 
    1181  
    1182         <!-- this has to be created first to avoid errors when trying to export to it later --> 
    1183         <mkdir dir="${basedir}/gs2build/lib"/> 
    1184  
    1185         <!-- svn checkouts --> 
    1186         <svn> 
    1187             <!-- perllib --> 
    1188             <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/> 
    1189  
    1190             <!-- selected packages --> 
    1191             <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" /> 
    1192             <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" /> 
    1193             <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" /> 
    1194             <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 
    1195             <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" /> 
    1196             <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 
    1197             <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 
    1198             <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" /> 
    1199             <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" /> 
    1200             <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" /> 
    1201             <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" /> 
    1202             <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" /> 
    1203             <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" /> 
    1204              
    1205             <!-- some of src (db2txt hashfile phind txt2db) --> 
    1206             <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt" revision="${branch.revision}" /> 
    1207             <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" /> 
    1208             <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" /> 
    1209             <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db" revision="${branch.revision}" /> 
    1210  
    1211             <!-- bin --> 
    1212             <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" /> 
    1213  
    1214             <!-- mappings --> 
    1215             <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/> 
    1216  
    1217             <!-- etc/packages --> 
    1218             <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/> 
    1219      
    1220             <!-- collect --> 
    1221             <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/> 
    1222  
    1223             <!-- gs2build-extra --> 
    1224             <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/> 
    1225  
    1226             <!-- indexers --> 
    1227             <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/> 
    1228  
    1229             <!-- single files --> 
    1230              
    1231             <!-- some files from lib --> 
    1232             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 
    1233             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 
    1234             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 
    1235  
    1236             <!-- some files from etc --> 
    1237             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 
    1238             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 
    1239             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 
    1240             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 
    1241  
    1242             <!-- some files from the gsdl root directory --> 
    1243             <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 
    1244             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 
    1245             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 
    1246             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 
    1247             <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 
    1248             <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 
    1249             <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 
    1250             <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 
    1251             <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 
    1252         </svn> 
    1253     </target> 
     1178  <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 
     1179    <!-- please keep this function in sync with update-gs2build --> 
     1180    <echo>checking out gs2build</echo> 
     1181 
     1182    <!-- this has to be created first to avoid errors when trying to export to it later --> 
     1183    <mkdir dir="${basedir}/gs2build/lib"/> 
     1184 
     1185    <!-- svn checkouts --> 
     1186    <svn> 
     1187      <!-- perllib --> 
     1188      <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/> 
     1189 
     1190      <!-- selected packages --> 
     1191      <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" /> 
     1192      <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" /> 
     1193      <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" /> 
     1194      <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 
     1195      <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" /> 
     1196      <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 
     1197      <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 
     1198      <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" /> 
     1199      <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" /> 
     1200      <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" /> 
     1201      <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" /> 
     1202      <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" /> 
     1203      <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" /> 
     1204       
     1205      <!-- some of src (db2txt hashfile phind txt2db) --> 
     1206      <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt" revision="${branch.revision}" /> 
     1207      <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" /> 
     1208      <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" /> 
     1209      <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db" revision="${branch.revision}" /> 
     1210 
     1211      <!-- bin --> 
     1212      <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" /> 
     1213 
     1214      <!-- mappings --> 
     1215      <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/> 
     1216 
     1217      <!-- etc/packages --> 
     1218      <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/> 
     1219       
     1220      <!-- collect --> 
     1221      <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/> 
     1222 
     1223      <!-- gs2build-extra --> 
     1224      <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/> 
     1225 
     1226      <!-- indexers --> 
     1227      <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/> 
     1228 
     1229      <!-- single files --> 
     1230       
     1231      <!-- some files from lib --> 
     1232      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 
     1233      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 
     1234      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 
     1235 
     1236      <!-- some files from etc --> 
     1237      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 
     1238      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 
     1239      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 
     1240      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 
     1241 
     1242      <!-- some files from the gsdl root directory --> 
     1243      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 
     1244      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 
     1245      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 
     1246      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 
     1247      <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 
     1248      <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 
     1249      <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 
     1250      <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 
     1251      <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 
     1252    </svn> 
     1253  </target> 
    12541254 
    12551255  <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present"> 
     
    12661266    unless="nocvs.mode"> 
    12671267    <svn> 
    1268         <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/> 
    1269     </svn>   
     1268      <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/> 
     1269    </svn>   
    12701270  </target> 
    12711271 
    12721272  <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nocvs.mode"> 
    1273         <svn> 
    1274             <update dir="winbin"/> 
    1275         </svn>   
    1276     </target> 
     1273    <svn> 
     1274      <update dir="winbin"/> 
     1275    </svn>   
     1276  </target> 
    12771277   
    12781278  <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows"> 
     
    12871287  <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows">   
    12881288    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip" 
    1289     dest="${gs2build.home}/packages/windows/gdbm"/> 
    1290    <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip" 
    1291     dest="${gs2build.home}/packages/windows/crypt"/> 
    1292        <unzip src="${gs2build.home}/packages/windows/expat/expat.zip" 
    1293     dest="${gs2build.home}/packages/windows/expat"/> 
    1294    </target> 
     1289      dest="${gs2build.home}/packages/windows/gdbm"/> 
     1290    <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip" 
     1291      dest="${gs2build.home}/packages/windows/crypt"/> 
     1292    <unzip src="${gs2build.home}/packages/windows/expat/expat.zip" 
     1293      dest="${gs2build.home}/packages/windows/expat"/> 
     1294  </target> 
    12951295   
    12961296  <!-- downloads a good XML-Parser --> 
    12971297  <target name="get-macos-extra" depends="init" if="need.macos.extra">   
    1298       <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz" 
     1298    <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz" 
    12991299      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" 
    13001300      usetimestamp="true"/> 
     
    13311331      <filterset> 
    13321332    <filter token="gsdlhome" value="${gs2build.home.windows}"/> 
    1333      </filterset> 
     1333      </filterset> 
    13341334    </move>   
    13351335    <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" /> 
     
    13591359  </target> 
    13601360   
    1361 <!--  <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> --> 
     1361  <!--  <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> --> 
    13621362  <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 
    13631363    <echo>checking out gli</echo> 
    13641364    <svn> 
    1365         <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/> 
    1366     </svn> 
    1367   </target> 
    1368      
     1365      <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/> 
     1366    </svn> 
     1367  </target> 
     1368   
    13691369  <target name="configure-gs2building" depends="init" if="collection.building.enabled" 
    13701370    description="Configure only the Greenstone 2 building components"> 
     
    14051405    <exec executable="${compile.windows.c++.setup}" os="${os.windows}" /> 
    14061406    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" > 
    1407      <arg value="/f"/> 
    1408      <arg value="win32.mak"/> 
    1409      <arg value="clean"/> 
     1407      <arg value="/f"/> 
     1408      <arg value="win32.mak"/> 
     1409      <arg value="clean"/> 
    14101410    </exec> 
    14111411  </target> 
     
    14281428    <property name="gli.home" value="${basedir}/gli"/> 
    14291429 
    1430         <!-- change the version number --> 
    1431         <rsr file="${gli.home}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*&quot;(.*)&quot;" replacement="$1String PROGRAM_VERSION = &quot;${app.version}&quot;"/> 
     1430    <!-- change the version number --> 
     1431    <rsr file="${gli.home}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*&quot;(.*)&quot;" replacement="$1String PROGRAM_VERSION = &quot;${app.version}&quot;"/> 
    14321432    <!-- linux --> 
    14331433    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/> 
    1434      <!--remote gli--> 
    1435      <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" 
     1434    <!--remote gli--> 
     1435    <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" 
    14361436      resolveExecutable="true"/> 
    14371437    <!-- windows --> 
    14381438    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/> 
    14391439    <!--remote gli--> 
    1440      <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" 
     1440    <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" 
    14411441      resolveExecutable="true"/>  
    1442      <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" /> 
     1442    <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" /> 
    14431443  </target> 
    14441444   
     
    14541454    <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/> 
    14551455    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}"> 
    1456      <arg value="/f"/> 
    1457      <arg value="win32.mak"/> 
     1456      <arg value="/f"/> 
     1457      <arg value="win32.mak"/> 
    14581458    </exec> 
    14591459    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}"> 
    1460      <arg value="/f"/> 
    1461      <arg value="win32.mak"/> 
    1462      <arg value="install"/> 
     1460      <arg value="/f"/> 
     1461      <arg value="win32.mak"/> 
     1462      <arg value="install"/> 
    14631463    </exec> 
    14641464    <!-- LuceneWrapper jar file not installed by default --> 
     
    14941494    </echo> 
    14951495  </target> 
    1496   
    1497  
    1498 <!-- ======================== TESTING Targets ========================= --> 
     1496   
     1497 
     1498  <!-- ======================== TESTING Targets ========================= --> 
    14991499   
    15001500  <target name="test" description="Run the (incomplete) JUnit test suite " 
     
    15191519    <echo> 
    15201520      ********************************************* 
    1521        Test output can be found in directory 'test' 
     1521      Test output can be found in directory 'test' 
    15221522      ********************************************* 
    15231523    </echo> 
     
    15341534    <svn> 
    15351535      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/"   
    1536                 destPath="${basedir}/src/java/org/flax"/> 
     1536    destPath="${basedir}/src/java/org/flax"/> 
    15371537      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/greenstone/gsdl3/flax/"  
    1538                 destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
     1538    destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    15391539      <checkout url="${flax.svn.root}/flax1.0/trunk/web/WEB-INF/classes/flax/"  
    1540                 destPath="${basedir}/web/WEB-INF/classes/flax"/> 
     1540    destPath="${basedir}/web/WEB-INF/classes/flax"/> 
    15411541      <checkout url="${flax.svn.root}/flax1.0/trunk/web/interfaces/flax/"  
    1542                 destPath="${basedir}/web/interfaces/flax"/> 
     1542    destPath="${basedir}/web/interfaces/flax"/> 
    15431543      <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/"  
    1544                 destPath="${basedir}/web/sites/flax"/> 
     1544    destPath="${basedir}/web/sites/flax"/> 
    15451545      <checkout url="${flax.svn.root}/flax1.0/trunk/flax-resources" 
    1546                 destPath="${basedir}/flax-resources"/> 
     1546    destPath="${basedir}/flax-resources"/> 
    15471547      <checkout url="${flax.svn.root}/flax1.0/trunk/lib" 
    1548                 destPath="${basedir}/flax-lib"/> 
     1548    destPath="${basedir}/flax-lib"/> 
    15491549    </svn> 
    1550      <echo>prepare flax files...</echo> 
     1550    <echo>prepare flax files...</echo> 
    15511551    <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/> 
    15521552    <antcall target="flax-copy-files" /> 
    15531553    <antcall target="unzip-flax-collections" /> 
    15541554    <antcall target="unzip-flax-resources" /> 
    1555    </target> 
     1555  </target> 
    15561556 
    15571557  <target name="update-flax" description="update flax from repository"> 
    1558       <echo>updating flax ...</echo> 
    1559       <svn> 
    1560         <update dir="${basedir}/src/java/org/flax"/> 
    1561         <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    1562         <update dir="${basedir}/web/WEB-INF/classes/flax"/> 
    1563         <update dir="${basedir}/web/interfaces/flax"/> 
    1564         <update dir="${basedir}/web/sites/flax"/> 
    1565       </svn> 
    1566      <antcall target="flax-copy-files" /> 
     1558    <echo>updating flax ...</echo> 
     1559    <svn> 
     1560      <update dir="${basedir}/src/java/org/flax"/> 
     1561      <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
     1562      <update dir="${basedir}/web/WEB-INF/classes/flax"/> 
     1563      <update dir="${basedir}/web/interfaces/flax"/> 
     1564      <update dir="${basedir}/web/sites/flax"/> 
     1565    </svn> 
     1566    <antcall target="flax-copy-files" /> 
    15671567    <antcall target="unzip-flax-collections" />        
    1568    </target> 
    1569  
    1570    <target name="unzip-flax-collections" > 
     1568  </target> 
     1569 
     1570  <target name="unzip-flax-collections" > 
    15711571    <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/> 
    15721572    <unzip dest="${coll.dir}">   
    15731573      <fileset dir="${coll.dir}"> 
    15741574    <include name="*.zip"/> 
    1575        </fileset>     
     1575      </fileset>     
    15761576    </unzip>     
    15771577    <delete> 
     
    15801580  </target> 
    15811581 
    1582  <target name="unzip-flax-resources" > 
     1582  <target name="unzip-flax-resources" > 
    15831583    <property name="classes.dir" value="${basedir}/web//WEB-INF/classes/flax"/> 
    15841584    <unzip dest="${classes.dir}">   
    15851585      <fileset dir="${classes.dir}"> 
    15861586    <include name="*.zip"/> 
    1587        </fileset>     
     1587      </fileset>     
    15881588    </unzip>     
    15891589    <delete> 
     
    15911591    </delete> 
    15921592  </target> 
    1593     
    1594    <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories"> 
    1595       <echo>copying flax files ...</echo> 
    1596       <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" overwrite="true" /> 
    1597       <!-- A configuration file containing web service binding information for the axis engine --> 
    1598            <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" /> 
    1599            <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" /> 
    1600            <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${basedir}/web/WEB-INF/lib" overwrite="true" />     
    1601    </target> 
    1602       <!--install gdbm stuff --> 
     1593   
     1594  <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories"> 
     1595    <echo>copying flax files ...</echo> 
     1596    <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" overwrite="true" /> 
     1597    <!-- A configuration file containing web service binding information for the axis engine --> 
     1598    <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" /> 
     1599    <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" /> 
     1600    <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${basedir}/web/WEB-INF/lib" overwrite="true" />     
     1601  </target> 
     1602  <!--install gdbm stuff --> 
    16031603 
    16041604  <!-- downloads the gdbm library --> 
    16051605  <target name="prepare-gdbm" depends="init" if="install.gdbm"> 
    1606       <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz" 
    1607        dest="${src.packages.home}/gdbm-1.8.3.tar.gz"  usetimestamp="true"/> 
    1608       <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" />   
    1609       <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" /> 
    1610       <antcall target="configure-gdbm" /> 
    1611       <antcall target="compile-gdbm" />  
     1606    <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz" 
     1607      dest="${src.packages.home}/gdbm-1.8.3.tar.gz"  usetimestamp="true"/> 
     1608    <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" />   
     1609    <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" /> 
     1610    <antcall target="configure-gdbm" /> 
     1611    <antcall target="compile-gdbm" />  
    16121612  </target>   
    16131613 
    1614    <target name="configure-gdbm" if="install.gdbm"> 
     1614  <target name="configure-gdbm" if="install.gdbm"> 
    16151615    <echo> 
    16161616      Configuring GDBM 
     
    16201620      <arg value="--prefix=${gdbm.home}"/> 
    16211621    </exec>     
    1622    </target> 
    1623  
    1624  <target name="clean-gdbm" depends="init"  if="install.gdbm">    
     1622  </target> 
     1623 
     1624  <target name="clean-gdbm" depends="init"  if="install.gdbm">    
    16251625    <echo>clean GDBM</echo> 
    16261626    <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}" > 
    1627      <arg value="clean"/> 
     1627      <arg value="clean"/> 
    16281628    </exec> 
    16291629  </target>