Changeset 15799 for greenstone3


Ignore:
Timestamp:
2008-05-29T15:17:17+12:00 (16 years ago)
Author:
ak19
Message:

Corrected build.xml overwrite on commit between r15190 and r15229 by adding in all the changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/build.xml

    r15369 r15799  
    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 -->
    51 
     50  -->
     51
     52 
    5253  <!--the first two properties have to be put on the top to be used by build.properties-->
    5354  <property name="src.packages.home" value="${basedir}/src/packages"/>
    … …  
    5859  <!-- get properties from the environment -->
    5960  <property environment="env"/>
     61
     62   
     63  <!-- version properties for external packages -->
     64  <property name="tomcat.version" value="apache-tomcat-5.5.25"/>
     65  <property name="axis.zip.version" value="axis-bin-1_2_1.zip"/>
     66  <property name="axis.dir.version" value="axis-1_2_1"/>
     67  <property name="gdbm.version" value="gdbm-1.8.3"/>
     68
    6069  <property name="build.home" value="${basedir}/build"/>
    6170  <property name="src.home" value="${basedir}/src/java"/>
    … …  
    7584  <!-- jni libraries and java wrappers go here -->
    7685  <property name="lib.jni" value="${basedir}/lib/jni"/>
    77    
     86 
    7887  <property name="javadocs" value="${basedir}/docs/javadoc"/>
    7988
    … …  
    155164  </condition>
    156165
    157     <!-- where is search4j tool -->
    158     <condition property="search4j.exec" value="bin/search4j.exe">
    159         <isset property="current.os.iswindows"/>
     166  <!-- where is search4j tool -->
     167  <condition property="search4j.exec" value="bin/search4j.exe">
     168    <isset property="current.os.iswindows"/>
    160169  </condition>
    161170  <property name="search4j.exec" value="bin/search4j"/>
    162171
    163    
     172 
    164173  <!-- ============= Base dirs for each package and component ============ -->
    165174  <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/>
    … …  
    169178  <property name="gli.home" value="${basedir}/gli"/>
    170179  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
    171  
     180  
    172181  <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">-->
    173182  <condition property="indexers.home" value="${basedir}/src/packages/indexers">
    … …  
    184193  <property name="lucene.home" value="${indexers.home}/lucene-gs"/>
    185194
    186  
    187 <!--  ==================== Compilation Control Options ==================== -->
    188 
    189 <!--
     195  <!--  ==================== Compilation Control Options ==================== -->
     196
     197  <!--
    190198
    191199  These properties control option settings on the Javac compiler when it
    … …  
    198206  compile.optimize     Should compilation include the optimize option?
    199207
    200 -->
     208  -->
    201209
    202210  <property name="compile.debug"       value="true"/>
    … …  
    204212  <property name="compile.optimize"    value="true"/>
    205213
    206 <!--
     214  <!--
    207215
    208216  Rather than relying on the CLASSPATH environment variable, Ant includes
    … …  
    213221  that you explicitly added.
    214222
    215 -->
     223  -->
    216224
    217225  <path id="compile.classpath">
    … …  
    229237    <!-- Include the axis jar files -->
    230238    <!--<fileset dir="${basedir}/comms/soap/axis/lib">
    231       <include name="*.jar"/>
    232     </fileset>-->
     239    <include name="*.jar"/>
     240  </fileset>-->
    233241   
    234242    <!-- include the jar files from the source packages -->
    … …  
    277285    <echo>os.unix: ${os.unix}</echo>
    278286  </target>
    279 <!-- ==================== Primary and Global Targets ============================= -->
     287  <!-- ==================== Primary and Global Targets ============================= -->
    280288
    281289  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
    … …  
    283291  <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"
    284292    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"
     293    <!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
    286294    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.">-->
    287295
    … …  
    295303    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
    296304 
    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."/>-->
     305  <!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
     306  description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>-->
    299307  <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web"
    300308    description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/>
    … …  
    307315    description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/>
    308316
    309   <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
     317  <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building,clean-gdbm"
    310318    description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
     319 
     320  <target name="distclean" depends="init,distclean-packages,clean-core,distclean-gs2building,distclean-gdbm"
     321    description="Remove all compiled code and also any Makefiles etc generated during configure-c++. Includes core, packages, gs2building as necessary"/>
    311322 
    312323  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
    313324    description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
    314    
     325 
    315326  <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile"
    316     description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile."/>
     327    description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile. To do this without any SVN updates, run it like 'ant -Dnosvn.mode=yes update'"/>
    317328
    318329  <target name="start" depends="init,start-tomcat"
    319330    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 -->   
     331    <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>
     332    <echo>Tomcat:   ${catalina.home}</echo>
     333    <echo>Java: ${java.home}</echo>
     334    <echo>URL:  http://${tomcat.server}:${tomcat.port}${app.path}/</echo>
     335    <!-- assuming that index.html is not needed here -->   
    325336  </target>
    326337
    … …  
    331342
    332343
    333 <!-- =========== Help targets ===================================  -->
     344  <!-- =========== Help targets ===================================  -->
    334345 
    335346  <property name="install-command" value="ant [options] prepare install"/>
    … …  
    339350    <echo message="  Execute 'ant -help' for Ant help."/>
    340351    <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.
     352      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.
     353      To log the output, use the '-logfile build.log' option.
     354      The README.txt file has more information about the ant targets and install process.
    344355    </echo>
    345356  </target>
    … …  
    351362  </target>
    352363
    353 <!-- ====== initialization and setup targets ================== -->
     364  <!-- ====== initialization and setup targets ================== -->
    354365
    355366  <target name="accept-properties" unless="properties.accepted">
    356367    <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]? />
     368      tomcat.server=${tomcat.server}
     369      tomcat.port=${tomcat.port}
     370      tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
     371      proxy.host=${proxy.host}
     372      proxy.port=${proxy.port}
     373      If these are not acceptable, please change them and rerun this target. Continue [y/n]? />
    363374    </input>
    364375    <condition property="do.abort">
    … …  
    368379  </target>
    369380
    370 <!--  <target name="check-cvsroot">
    371     <condition property="svnroot.notset">
    372       <or>
    373             <not>
    374               <isset property="env.CVSROOT"/>
    375             </not>
    376             <equals arg1="" arg2="${env.CVSROOT}"/>
    377       </or>
    378     </condition>
    379     <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/>
    380   </target> -->
    381381
    382382  <!-- this sets up some initial properties -->
    … …  
    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      <!-- gsdl2.installed.path appears not to be set, so wrap in if block -->
    411         <if>
    412             <bool><isset property="gsdl2.installed.path"/></bool>
    413             <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo>
    414         </if>
     407    <echo>tomcat.port = ${tomcat.port}</echo>
     408    <echo>gli.present = ${gli.present}</echo>
     409    <echo>gs2build.present = ${gs2build.present}</echo>
     410    <!-- gsdl2.installed.path appears not to be set, so wrap in if block -->
     411    <if>
     412        <bool><isset property="gsdl2.installed.path"/></bool>
     413        <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo>
     414    </if>
    415415
    416416    <condition property="proxy.present">
    … …  
    443443    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
    444444  </target>
    445      
    446  <!-- ========== Web app Targets ================================ -->
     445 
     446  <!-- ========== Web app Targets ================================ -->
    447447 
    448448  <target name="prepare-web" depends="init,configure-java-version">
    … …  
    455455    description="Activates or deactivates some jar libraries as needed depending on your java version">
    456456
    457         <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/>
     457    <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/>
    458458    <condition property="need.xalan.jar">
    459             <or>
    460                 <equals arg1="1.5" arg2="${ant.java.version}"/>
    461                 <equals arg1="1.6" arg2="${ant.java.version}"/>
    462             </or>
    463         </condition>
    464 
    465         <!-- if they have xalan.jar but dont need it -->
    466         <if>
    467             <bool>
    468                 <and>
    469                     <isset property="have.xalan.jar"/>
    470                     <not><isset property="need.xalan.jar"/></not>
    471                 </and>
    472             </bool>
    473             <antcall target="deactivate-xalan-jar"/>
    474         </if>
    475 
    476         <!-- if they need xalan.jar but dont have it -->
    477         <if>
    478             <bool>
    479                 <and>
    480                     <not><isset property="have.xalan.jar"/></not>
    481                     <isset property="need.xalan.jar"/>
    482                 </and>
    483             </bool>
    484             <antcall target="activate-xalan-jar"/>
    485         </if>
     459      <or>
     460    <equals arg1="1.5" arg2="${ant.java.version}"/>
     461    <equals arg1="1.6" arg2="${ant.java.version}"/>
     462      </or>
     463    </condition>
     464
     465    <!-- if they have xalan.jar but dont need it -->
     466    <if>
     467      <bool>
     468    <and>
     469      <isset property="have.xalan.jar"/>
     470      <not><isset property="need.xalan.jar"/></not>
     471    </and>
     472      </bool>
     473      <antcall target="deactivate-xalan-jar"/>
     474    </if>
     475
     476    <!-- if they need xalan.jar but dont have it -->
     477    <if>
     478      <bool>
     479    <and>
     480      <not><isset property="have.xalan.jar"/></not>
     481      <isset property="need.xalan.jar"/>
     482    </and>
     483      </bool>
     484      <antcall target="activate-xalan-jar"/>
     485    </if>
    486486
    487487  </target>
    488488 
    489489  <target name="activate-xalan-jar">
    490         <echo>activating xalan.jar</echo>
     490    <echo>activating xalan.jar</echo>
    491491    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
    492         <if><bool><isset property="current.os.ismac"/></bool>
    493             <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>
    494         </if>
    495   </target>
    496 
    497     <!-- to delete -->
     492    <if><bool><isset property="current.os.ismac"/></bool>
     493      <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>
     494    </if>
     495  </target>
     496
     497  <!-- to delete -->
    498498  <target name="copy-xalan-for-mac"></target>
    499499
    500500  <target name="deactivate-xalan-jar">
    501         <echo>deactivating xalan.jar</echo>
     501    <echo>deactivating xalan.jar</echo>
    502502    <delete file="${web.lib}/xalan.jar"/>
    503503  </target>
     504
     505<!--
     506<target name="prepare-collections" depends="init">
     507    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
     508<echo message="installing collections..."/>
     509<antcall target="gs2mgdemo-install"/>
     510<antcall target="gs2mgppdemo-install"/>
     511<antcall target="gberg-install"/>
     512
     513</target>
     514
     515<target name="gs2mgdemo-prepare" if="collect.dir">
     516 <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/>
     517 <property name="gs2mgdemo.import.zip" value="$import.zip"/>
     518  <property name="gs2mgdemo.metadata.zip" value="$metadata.zip"/>
     519  <property name="gs2mgdemo.index.zip" value="index/index.zip"/>
     520
     521<fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}">
     522    <include name="${gs2mgdemo.import.zip}"/>
     523    <include name="${gs2mgdemo.metadata.zip}"/>
     524    <include name="${gs2mgdemo.index.zip}"/>
     525</fileset>
     526
     527<condition property="gs2mgdemo.present">
     528    <and>
     529    <available file="${gs2mgdemo.import.zip}"/>
     530    <available file="${gs2mgdemo.metadata.zip}"/>
     531        <available file="${gs2mgdemo.index.zip}"/>
     532    </and>
     533  </condition>
     534</target>
     535
     536<target name="gs2mgdemo-install" if="gs2mgdemo.present"  depends="gs2mgdemo-prepare">
     537<echo> installing gs2mgdemo</echo>
     538<unzip dest="${gs2mgdemo.dir}">
     539    <fileset refid="gs2mgdemofiles"/>
     540</unzip>
     541<delete>
     542    <fileset refid="gs2mgdemofiles"/>
     543</delete>
     544<echo>collection gs2mgdemo installed</echo>
     545</target>
     546
     547<target name="gs2mgppdemo-prepare" if="collect.dir">
     548 <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/>
     549 <property name="gs2mgppdemo.import.zip" value="${gs2mgppdemo.dir}/import.zip"/>
     550  <property name="gs2mgppdemo.metadata.zip" value="${gs2mgppdemo.dir}/metadata.zip"/>
     551  <property name="gs2mgppdemo.index.zip" value="${gs2mgppdemo.dir}/index.zip"/>
     552
     553<fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}">
     554        <include name="${gs2mgppdemo.import.zip}"/>
     555        <include name="${gs2mgppdemo.metadata.zip}"/>
     556        <include name="${gs2mgppdemo.index.zip}"/>
     557</fileset>
     558
     559<condition property="gs2mgppdemo.present">
     560    <and>
     561        <available file="${gs2mgppdemo.import.zip}"/>
     562        <available file="${gs2mgppdemo.metadata.zip}"/>
     563        <available file="${gs2mgppdemo.index.zip}"/>
     564    </and>
     565  </condition>
     566</target>
     567
     568<target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare">
     569<unzip dest="${gs2mgppdemo.dir}">
     570        <fileset refid="gs2mgppdemofiles"/>
     571</unzip>
     572<delete>
     573        <fileset refid="gs2mgppdemofiles"/>
     574</delete>
     575<echo>collection gs2mgppdemo installed</echo>
     576</target>   
     577
     578<target name="gberg-prepare" if="collect.dir">
     579 <property name="gberg.dir" value="${collect.dir}/gberg"/>
     580 <property name="gberg.index.zip" value="${gberg.dir}/index.zip"/>
     581
     582<fileset id="gbergfiles" dir="${gberg.dir}">
     583        <include name="${gberg.index.zip}"/>
     584</fileset>
     585<available file="${gberg.index.zip}" property="gberg.present"/>
     586</target>
     587
     588<target name="gberg-install" if="gberg.present" depends="gberg-prepare">
     589<unzip dest="${gberg.dir}">
     590        <fileset refid="gbergfiles"/>
     591</unzip>
     592<delete>
     593        <fileset refid="gbergfiles"/>
     594</delete>
     595<echo>collection gberg installed</echo>
     596</target>
     597
     598-->
     599
    504600
    505601  <target name="prepare-collections" depends="init">
    506602    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
    507     <!-- gs2mgdemo -->
     603   
    508604    <unzip src="${collect.dir}/gs2mgdemo/import.zip"
    509605      dest="${collect.dir}/gs2mgdemo"/>
    … …  
    515611    <delete file="${collect.dir}/gs2mgdemo/metadata.zip"/>
    516612    <delete file="${collect.dir}/gs2mgdemo/index/index.zip"/>
    517     <!-- gs2mgppdemo -->
     613   
    518614    <unzip src="${collect.dir}/gs2mgppdemo/import.zip"
    519615      dest="${collect.dir}/gs2mgppdemo"/>
    … …  
    525621    <delete file="${collect.dir}/gs2mgppdemo/metadata.zip"/>
    526622    <delete file="${collect.dir}/gs2mgppdemo/index/index.zip"/>
    527     <!-- gberg -->
     623 
    528624    <unzip src="${collect.dir}/gberg/index/index.zip"
    529625      dest="${collect.dir}/gberg/index"/>
    530626    <delete file="${collect.dir}/gberg/index/index.zip"/>
    531627  </target>
     628
    532629
    533630 
    … …  
    560657  </target>
    561658
    562     <target name="svnupdate-web" unless="nosvn.mode">
    563         <svn>
    564             <update dir="${web.home}"/>
    565         </svn>
    566     </target>
     659  <target name="svnupdate-web" unless="nosvn.mode">
     660    <svn>
     661      <update dir="${web.home}"/>
     662    </svn>
     663  </target>
    567664
    568665  <target name="update-web" depends="init,svnupdate-web,configure-web"
    … …  
    570667
    571668
    572 <!-- ======================= Tomcat Targets ========================== -->
     669  <!-- ======================= Tomcat Targets ========================== -->
    573670 
    574671  <!-- this target downloads and installs Tomcat -->
    … …  
    578675    <!-- check that packages dir is there -->
    579676    <mkdir dir="${packages.home}"/>
    580     <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25.zip"
    581       dest="${packages.home}/apache-tomcat-5.5.25.zip"
     677    <get src="http://www.greenstone.org/gs3files/${tomcat.version}.zip"
     678      dest="${packages.home}/${tomcat.version}.zip"
    582679      usetimestamp="true"/>
    583     <unzip src="${packages.home}/apache-tomcat-5.5.25.zip"
     680    <unzip src="${packages.home}/${tomcat.version}.zip"
    584681      dest="${packages.home}"/>
    585     <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25-compat.zip"
    586       dest="${packages.home}/apache-tomcat-5.5.25-compat.zip"
     682    <get src="http://www.greenstone.org/gs3files/${tomcat.version}-compat.zip"
     683      dest="${packages.home}/${tomcat.version}-compat.zip"
    587684      usetimestamp="true"/>
    588     <unzip src="${packages.home}/apache-tomcat-5.5.25-compat.zip"
     685    <unzip src="${packages.home}/${tomcat.version}-compat.zip"
    589686      dest="${packages.home}"/>
    590687    <!-- delete any existing tomcat -->
    591688    <delete dir="${packages.home}/tomcat"/>
    592689    <move todir="${packages.home}/tomcat">
    593       <fileset dir="${packages.home}/apache-tomcat-5.5.25"/>
     690      <fileset dir="${packages.home}/${tomcat.version}"/>
    594691    </move>
    595692    <copy file="${basedir}/resources/tomcat/setclasspath.bat"
    … …  
    617714    <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true">
    618715      <filterset>
    619     <filter token="gsdl3webhome" value="${basedir}/web"/>
     716    <filter token="gsdl3webhome" value="${web.home}"/>
    620717      </filterset>
    621718    </copy>
    … …  
    626723    <!-- need to edit the config file, or do we get the user to do this???-->
    627724  </target>
    628    
     725 
    629726  <target name="start-tomcat" description="Startup only Tomcat" depends="init,configure-java-version" if="tomcat.islocal">
    630    <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
     727    <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
    631728    <property name="tomcat.path" refid="local.tomcat.path"/>
    632729    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
    … …  
    691788
    692789
    693 <!-- ======================= ant Targets ============================ -->
     790
     791
     792
     793
     794  <!-- ======================= ant Targets ============================ -->
    694795  <target name="prepare-ant" depends="init">
    695796    <get src="http://www.greenstone.org/gs3files/apache-ant-1.7.0-bin.zip"
    … …  
    703804  </target>
    704805
    705 <!-- ======================= Axis Targets ============================ -->
     806  <!-- ======================= Axis Targets ============================ -->
    706807
    707808  <target name="prepare-axis" depends="init">
    708     <get src="http://www.greenstone.org/gs3files/axis-bin-1_2_1.zip"
    709       dest="${packages.home}/axis-bin-1_2_1.zip"
     809    <get src="http://www.greenstone.org/gs3files/${axis.zip.version}"
     810      dest="${packages.home}/${axis.zip.version}"
    710811      usetimestamp="true"/>
    711     <unzip src="${packages.home}/axis-bin-1_2_1.zip"
     812    <unzip src="${packages.home}/${axis.zip.version}"
    712813      dest="${packages.home}"/>
    713814    <move todir="${packages.home}/axis">
    714       <fileset dir="${packages.home}/axis-1_2_1"/>
     815      <fileset dir="${packages.home}/${axis.dir.version}"/>
    715816    </move>
    716817    <!-- install axis into greenstone web app -->
    … …  
    736837  <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,get-webservices,create-deployment-files,deploy-site"
    737838    description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/>
    738  
    739   <target name="deploy-site">
     839   
     840    <target name="deploy-site">
    740841    <java classname="org.apache.axis.client.AdminClient">
    741842      <classpath refid="compile.classpath"/>
    … …  
    761862    </java>
    762863    <delete file="${basedir}/resources/soap/undeploy.wsdd"/> <!--clean up, no longer used-->
    763   </target>
    764 
    765   <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server
     864  </target> 
     865
     866 <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server
    766867with the default servicename of localsite-->
    767868  <target name="deploy-localsite" depends="init"
    … …  
    781882    <echo>The Greenstone server has been started up. If you do not want it running, please type: ant stop.</echo>
    782883  </target>
    783  
    784   <target name="get-sitename" unless="axis.sitename">
     884   
     885<target name="get-sitename" unless="axis.sitename">
    785886    <input addproperty="axis.sitename" defaultvalue="localsite">What site do you want to deploy services for?
    786887Press Enter for default:localsite</input>
    … …  
    818919    </condition>
    819920 </target>
    820 
    821   <target name="create-deployment-files" depends="set-soapmethod" if="axis.sitename">
     921   
     922 <target name="create-deployment-files" depends="set-soapmethod" if="axis.sitename">
    822923    <filter token="sitename" value="${axis.sitename}"/>
    823924    <filter token="siteuri" value="${axis.siteuri}"/>
    … …  
    843944    </javac>
    844945    <mkdir dir="${web.classes}/org/greenstone/gsdl3"/>
    845     <copy file="${build.home}/org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.class"        tofile="${web.classes}/org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.class"
    846           overwrite="true" />
    847   </target>
    848    
    849 
    850 <!-- ====================== Core targets ============================== -->
    851 <!-- core targets refer to the core gsdl3 java src -->
    852  
    853   <target name="prepare-core" unless="nocvs.mode">
     946    <copy file="${build.home}/org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.class"
     947      tofile="${web.classes}/org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.class"
     948      overwrite="true" />
     949  </target>
     950 
     951
     952  <!-- ====================== Core targets ============================== -->
     953  <!-- core targets refer to the core gsdl3 java src -->
     954 
     955  <target name="prepare-core" unless="nosvn.mode">
    854956    <!-- just get rid of empty directories-->
    855957    <svn>
    856         <update dir="."/>
    857     </svn>
     958      <update dir="."/>
     959    </svn>
    858960  </target>
    859961 
    … …  
    863965    description="Update only the Greenstone core" />
    864966 
    865   <target name="svnupdate-core" unless="nocvs.mode">
    866 
    867     <svn>
    868         <update dir="." recurse="false"/>
    869     </svn>
    870 
    871    <svn>
    872         <update dir="bin"/>
    873         <update dir="comms"/>
    874         <update dir="dist-resources"/>
    875         <update dir="docs"/>
    876         <update dir="lib"/>
    877         <update dir="resources"/>
    878         <update dir="src"/>
    879         <update dir="winutil"/>
    880     </svn>
     967  <target name="svnupdate-core" unless="nosvn.mode">
     968
     969    <svn>
     970      <update dir="." recurse="false"/>
     971    </svn>
     972
     973    <svn>
     974      <update dir="bin"/>
     975      <update dir="comms"/>
     976      <update dir="dist-resources"/>
     977      <update dir="docs"/>
     978      <update dir="lib"/>
     979      <update dir="resources"/>
     980      <update dir="src"/>
     981      <update dir="winutil"/>
     982    </svn>
    881983
    882984  </target>
    … …  
    887989  </target>
    888990
    889    <target name="compile-core" depends="init"
     991  <target name="compile-core" depends="init"
    890992    description="Compile only the Greenstone core">
    891993    <mkdir dir="${build.home}"/>
    … …  
    9211023      </manifest>
    9221024    </jar>
    923      
     1025   
    9241026    <jar destfile="${build.home}/phind.jar">
    9251027      <fileset dir="${build.home}">
    … …  
    9641066    <copy file="${build.home}/server.jar" todir="${basedir}"/>
    9651067  </target>
    966  
    967 <!-- ================== Packages targets ================================ -->
     1068  
     1069  <!-- ================== Packages targets ================================ -->
    9681070  <!-- these targets refer to the greenstone source packages - these need
    9691071  updating less often, so are in  separate targets to the core -->
    9701072  <target name="prepare-packages" depends="init,prepare-indexers"/>
    9711073 
    972   <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nocvs.mode">
    973 <!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> -->
     1074  <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nosvn.mode">
    9741075    <svn>
    975         <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/>
    976     </svn>
     1076      <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/>
     1077    </svn>
    9771078  </target>
    9781079 
    … …  
    9841085    description="Update only the source packages"/>
    9851086
    986   <target name="svnupdate-packages" unless="nocvs.mode">
    987    <svn>
    988         <update dir="${src.packages.home}"/>
    989     </svn>
     1087  <target name="svnupdate-packages" unless="nosvn.mode">
     1088    <svn>
     1089      <update dir="${src.packages.home}"/>
     1090    </svn>
    9901091  </target>
    9911092 
    … …  
    10061107      <arg value="--prefix=${basedir}"/>
    10071108      <arg value="--libdir=${lib.jni}"/>
    1008      <arg value="--with-gdbm=${gdbm.installed.path}"/>
     1109      <arg value="--with-gdbm=${gdbm.installed.path}"/>
    10091110    </exec>   
    10101111  </target>
    10111112
    1012 <!-- Message from oran. I removed the condition from this line becuase it meant
    1013     the indexers would only be configured if collection building was DISabled.
    1014     Shouldn't they be configured when collection building is ENabled? -->
    1015 
    1016 <!--    <target name="configure-indexers" depends="init" if="independent-indexers"> -->
    1017 <target name="configure-indexers" depends="init">
    1018         <echo>Configuring Indexers</echo>
    1019         <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}">
    1020             <arg value="--prefix=${basedir}"/>
    1021             <arg value="--libdir=${lib.jni}"/>
    1022         </exec>         
    1023     </target>
     1113  <!-- Message from oran. I removed the condition from this line becuase it meant
     1114  the indexers would only be configured if collection building was DISabled.
     1115  Shouldn't they be configured when collection building is ENabled? -->
     1116
     1117  <!--  <target name="configure-indexers" depends="init" if="independent-indexers"> -->
     1118  <target name="configure-indexers" depends="init">
     1119    <echo>Configuring Indexers</echo>
     1120    <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}">
     1121      <arg value="--prefix=${basedir}"/>
     1122      <arg value="--libdir=${lib.jni}"/>
     1123    </exec>         
     1124  </target>
    10241125
    10251126  <target name="clean-packages" depends="init,clean-javagdbm,clean-indexers" description="Clean only the packages"/>
    … …  
    10381139    </exec>
    10391140    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}"
    1040        dir="${indexers.home}">
    1041        <arg value="clean"/>
    1042     </exec>
    1043 
    1044   </target>
    1045    
    1046     <target name="compile-packages" description="Compile only the source packages">
    1047          
    1048         <!-- javagdbm -->
    1049         <echo>compile javagdbm</echo>
    1050         <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/>
    1051         <exec executable="make" os="${os.unix}" dir="${javagdbm.home}">
    1052             <arg value="install"/>
    1053         </exec>
    1054 
    1055         <!-- windows: just the java stuff. -->
    1056         <echo>Windows: compile javagdbm (java only)</echo>
    1057         <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}">
    1058             <arg value="compile"/>
    1059             <arg value="javaonly"/>
    1060         </exec>
    1061 
    1062         <!-- install the jar file -->
    1063         <echo>Install the javagdbm jar file</echo>
    1064         <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
    1065 
    1066         <!-- Indexers -->
    1067 
    1068         <!-- this may be in gs2build - we will be recompiling, but never mind -->
    1069         <echo>Indexers: make (from ${indexers.home})</echo>
    1070         <exec executable="make" os="${os.unix}" dir="${indexers.home}"/>
    1071         <echo>Indexers: make install</echo>
    1072         <exec executable="make" os="${os.unix}" dir="${indexers.home}">
    1073             <arg value="install"/>
    1074         </exec>
    1075 
    1076         <echo>Indexers: make</echo>
    1077         <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
    1078             <arg value="all"/>
    1079         </exec>
    1080         <echo>Indexers: make install</echo>
    1081         <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
    1082             <arg value="install"/>
    1083         </exec>
    1084 
    1085         <!-- install the jar and jni files -->
    1086         <echo>Install the indexers' jar and jni files</echo>
    1087         <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
    1088         <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
    1089         <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
    1090         <antcall target="install-jni-files"/>
    1091     </target>
     1141      dir="${indexers.home}">
     1142      <arg value="clean"/>
     1143    </exec>
     1144
     1145  </target>
     1146  <target name="distclean-packages" depends="init,distclean-javagdbm,distclean-indexers" description="Distclean only the packages"/>
     1147
     1148  <target name="distclean-javagdbm" depends="init">
     1149    <exec executable="make" os="${os.unix}"
     1150      dir="${javagdbm.home}">
     1151      <arg value="distclean"/>
     1152    </exec>
     1153  </target>
     1154 
     1155  <target name="distclean-indexers" depends="init" if="independent-indexers">
     1156    <exec executable="make" os="${os.unix}"
     1157      dir="${indexers.home}">
     1158      <arg value="distclean"/>
     1159    </exec>
     1160    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}"
     1161      dir="${indexers.home}">
     1162      <arg value="clean"/>
     1163    </exec>
     1164
     1165  </target>
     1166 
     1167  <target name="compile-packages" description="Compile only the source packages">
     1168   
     1169    <!-- javagdbm -->
     1170    <echo>compile javagdbm</echo>
     1171    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/>
     1172    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}">
     1173      <arg value="install"/>
     1174    </exec>
     1175
     1176    <!-- windows: just the java stuff. -->
     1177    <echo>Windows: compile javagdbm (java only)</echo>
     1178    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}">
     1179      <arg value="compile"/>
     1180      <arg value="javaonly"/>
     1181    </exec>
     1182
     1183    <!-- install the jar file -->
     1184    <echo>Install the javagdbm jar file</echo>
     1185    <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
     1186
     1187    <!-- Indexers -->
     1188
     1189    <!-- this may be in gs2build - we will be recompiling, but never mind -->
     1190    <echo>Indexers: make (from ${indexers.home})</echo>
     1191    <exec executable="make" os="${os.unix}" dir="${indexers.home}"/>
     1192    <echo>Indexers: make install</echo>
     1193    <exec executable="make" os="${os.unix}" dir="${indexers.home}">
     1194      <arg value="install"/>
     1195    </exec>
     1196
     1197    <echo>Indexers: make</echo>
     1198    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
     1199      <arg value="all"/>
     1200    </exec>
     1201    <echo>Indexers: make install</echo>
     1202    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
     1203      <arg value="install"/>
     1204    </exec>
     1205
     1206    <!-- install the jar and jni files -->
     1207    <echo>Install the indexers' jar and jni files</echo>
     1208    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
     1209    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
     1210    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
     1211    <antcall target="install-jni-files"/>
     1212  </target>
    10921213
    10931214  <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/>
    10941215
    1095     <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
     1216  <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
    10961217    <copy file="${mg.home}/jni/libmgretrievejni.so" todir="${lib.jni}"/>
    10971218    <copy file="${mg.home}/jni/libmgsearchjni.so" todir="${lib.jni}"/>
    1098      <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
     1219    <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
    10991220    <copy file="${mgpp.home}/jni/libmgppretrievejni.so" todir="${lib.jni}"/>
    11001221    <copy file="${mgpp.home}/jni/libmgppsearchjni.so" todir="${lib.jni}"/>
    1101      <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
    1102    </target>
    1103    <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">
     1222    <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
     1223  </target>
     1224  <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">
    11041225    <copy file="${mg.home}/jni/mgretrievejni.dll" todir="${lib.jni}"/>
    11051226    <copy file="${mg.home}/jni/mgsearchjni.dll" todir="${lib.jni}"/>
    1106      <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>
     1227    <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>
    11071228    <copy file="${mgpp.home}/jni/mgppretrievejni.dll" todir="${lib.jni}"/>
    11081229    <copy file="${mgpp.home}/jni/mgppsearchjni.dll" todir="${lib.jni}"/>
    1109      <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>
    1110    </target>
    1111    <target name="install-jni-files-macos" depends="init" if="current.os.ismac">
     1230    <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>
     1231  </target>
     1232  <target name="install-jni-files-macos" depends="init" if="current.os.ismac">
    11121233    <copy file="${mg.home}/jni/libmgretrievejni.jnilib" todir="${lib.jni}"/>
    11131234    <copy file="${mg.home}/jni/libmgsearchjni.jnilib" todir="${lib.jni}"/>
    1114      <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>
     1235    <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>
    11151236    <copy file="${mgpp.home}/jni/libmgppretrievejni.jnilib" todir="${lib.jni}"/>
    11161237    <copy file="${mgpp.home}/jni/libmgppsearchjni.jnilib" todir="${lib.jni}"/>
    1117      <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
    1118    </target>
    1119  
     1238    <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
     1239  </target>
     1240  
    11201241  <!-- ================== gs2building targets ===============-->
    11211242
    … …  
    11251246    description="Update only the Greenstone 2 building components"/>
    11261247
    1127   <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nocvs.mode">
    1128   </target>
    1129 
    1130   <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nocvs.mode">
    1131         <!-- please keep this function in sync with checkout-gs2build -->
    1132 
    1133         <echo>updating gs2build</echo>
    1134         <!-- svn updates -->
    1135         <svn>
    1136             <!-- perllib -->
    1137             <update dir="gs2build/perllib" revision="${branch.revision}"/>
     1248  <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nosvn.mode">
     1249  </target>
     1250
     1251  <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nosvn.mode">
     1252    <!-- please keep this function in sync with checkout-gs2build -->
     1253
     1254    <echo>updating gs2build</echo>
     1255    <!-- svn updates -->
     1256    <svn>
     1257      <!-- perllib -->
     1258      <update dir="gs2build/perllib" revision="${branch.revision}"/>
    11381259
    11391260            <!-- selected packages -->
    … …  
    11581279            <update dir="gs2build/src/gdbmedit/txt2db" revision="${branch.revision}" />
    11591280
    1160             <!-- bin -->
    1161             <update dir="gs2build/bin/script" revision="${branch.revision}" />
    1162 
    1163             <!-- mappings -->
    1164             <update dir="gs2build/mappings" revision="${branch.revision}"/>
    1165 
    1166             <!-- etc/packages -->
    1167             <update dir="gs2build/etc/packages" revision="${branch.revision}"/>
    1168    
    1169             <!-- collect -->
    1170             <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/>
    1171 
    1172             <!-- gs2build-extra -->
    1173             <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/>
    1174 
    1175             <!-- indexers -->
    1176             <update dir="gs2build/indexers" revision="${branch.revision}"/>
    1177 
    1178             <!-- single files -->
    1179            
    1180             <!-- some files from lib -->
    1181             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
    1182             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
    1183             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
    1184 
    1185             <!-- some files from etc -->
    1186             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
    1187             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
    1188             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
    1189             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
    1190 
    1191             <!-- some files from the gsdl root directory -->
    1192             <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
    1193             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
    1194             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
    1195             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
    1196             <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
    1197             <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
    1198             <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
    1199             <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
    1200             <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
    1201         </svn>
    1202   </target>
    1203  
    1204   <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nocvs.mode">
     1281      <!-- bin -->
     1282      <update dir="gs2build/bin/script" revision="${branch.revision}" />
     1283
     1284      <!-- mappings -->
     1285      <update dir="gs2build/mappings" revision="${branch.revision}"/>
     1286
     1287      <!-- etc/packages -->
     1288      <update dir="gs2build/etc/packages" revision="${branch.revision}"/>
     1289     
     1290      <!-- collect -->
     1291      <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/>
     1292
     1293      <!-- gs2build-extra -->
     1294      <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/>
     1295
     1296      <!-- indexers -->
     1297      <update dir="gs2build/indexers" revision="${branch.revision}"/>
     1298
     1299      <!-- single files -->
     1300     
     1301      <!-- some files from lib -->
     1302      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
     1303      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
     1304      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
     1305
     1306      <!-- some files from etc -->
     1307      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
     1308      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
     1309      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
     1310      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
     1311
     1312      <!-- some files from the gsdl root directory -->
     1313      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
     1314      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
     1315      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
     1316      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
     1317      <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
     1318      <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
     1319      <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
     1320      <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
     1321      <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
     1322    </svn>
     1323  </target>
     1324 
     1325  <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nosvn.mode">
    12051326    <svn>
    1206         <update dir="${gli.home}" revision="${branch.revision}"/>
    1207     </svn>
     1327      <update dir="${gli.home}" revision="${branch.revision}"/>
     1328    </svn>
    12081329  </target>
    12091330
    12101331  <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled">
    12111332  </target>
    1212     <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
    1213         <!-- please keep this function in sync with update-gs2build -->
    1214         <echo>checking out gs2build</echo>
    1215 
    1216         <!-- this has to be created first to avoid errors when trying to export to it later -->
    1217         <mkdir dir="${basedir}/gs2build/lib"/>
    1218 
    1219         <!-- svn checkouts -->
    1220         <svn>
    1221             <!-- perllib -->
    1222             <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/>
     1333  <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nosvn.mode">
     1334    <!-- please keep this function in sync with update-gs2build -->
     1335    <echo>checking out gs2build</echo>
     1336
     1337    <!-- this has to be created first to avoid errors when trying to export to it later -->
     1338    <mkdir dir="${basedir}/gs2build/lib"/>
     1339
     1340    <!-- svn checkouts -->
     1341    <svn>
     1342      <!-- perllib -->
     1343      <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/>
    12231344
    12241345            <!-- selected packages -->
    … …  
    12431364            <checkout url="${svn.root}/gsdl/${branch.path}/src/gdbmedit/txt2db" destPath="gs2build/src/gdbmedit/txt2db" revision="${branch.revision}" />
    12441365
    1245             <!-- bin -->
    1246             <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" />
    1247 
    1248             <!-- mappings -->
    1249             <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/>
    1250 
    1251             <!-- etc/packages -->
    1252             <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/>
    1253    
    1254             <!-- collect -->
    1255             <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/>
    1256 
    1257             <!-- gs2build-extra -->
    1258             <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/>
    1259 
    1260             <!-- indexers -->
    1261             <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/>
    1262 
    1263             <!-- single files -->
    1264            
    1265             <!-- some files from lib -->
    1266             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
    1267             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
    1268             <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
    1269 
    1270             <!-- some files from etc -->
    1271             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
    1272             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
    1273             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
    1274             <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
    1275 
    1276             <!-- some files from the gsdl root directory -->
    1277             <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
    1278             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
    1279             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
    1280             <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
    1281             <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
    1282             <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
    1283             <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
    1284             <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
    1285             <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
    1286         </svn>
    1287     </target>
     1366      <!-- bin -->
     1367      <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" />
     1368
     1369      <!-- mappings -->
     1370      <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/>
     1371
     1372      <!-- etc/packages -->
     1373      <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/>
     1374     
     1375      <!-- collect -->
     1376      <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/>
     1377
     1378      <!-- gs2build-extra -->
     1379      <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/>
     1380
     1381      <!-- indexers -->
     1382      <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/>
     1383
     1384      <!-- single files -->
     1385     
     1386      <!-- some files from lib -->
     1387      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
     1388      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
     1389      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
     1390
     1391      <!-- some files from etc -->
     1392      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
     1393      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
     1394      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
     1395      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
     1396
     1397      <!-- some files from the gsdl root directory -->
     1398      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
     1399      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
     1400      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
     1401      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
     1402      <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
     1403      <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
     1404      <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
     1405      <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
     1406      <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
     1407    </svn>
     1408  </target>
    12881409
    12891410  <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present">
    … …  
    12981419
    12991420  <target name="checkout-winbin" depends="init" if="current.os.iswindows"
    1300     unless="nocvs.mode">
     1421    unless="nosvn.mode">
    13011422    <svn>
    1302         <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/>
    1303     </svn> 
    1304   </target>
    1305 
    1306   <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nocvs.mode">
    1307         <svn>
    1308             <update dir="winbin"/>
    1309         </svn> 
    1310     </target>
     1423      <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/>
     1424    </svn> 
     1425  </target>
     1426
     1427  <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nosvn.mode">
     1428    <svn>
     1429      <update dir="winbin"/>
     1430    </svn> 
     1431  </target>
    13111432 
    13121433  <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows">
    … …  
    13211442  <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows"> 
    13221443    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip"
    1323     dest="${gs2build.home}/packages/windows/gdbm"/>
    1324    <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
    1325     dest="${gs2build.home}/packages/windows/crypt"/>
    1326        <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
    1327     dest="${gs2build.home}/packages/windows/expat"/>
    1328    </target>
     1444      dest="${gs2build.home}/packages/windows/gdbm"/>
     1445    <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
     1446      dest="${gs2build.home}/packages/windows/crypt"/>
     1447    <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
     1448      dest="${gs2build.home}/packages/windows/expat"/>
     1449  </target>
    13291450 
    13301451  <!-- downloads a good XML-Parser -->
    … …  
    13361457-->
    13371458    <echo>Nothing extra currently needed for MacOs prepare</echo>
    1338   </target> 
    1339 
    1340   <!-- untars the XML-Parser. need to do this after compiling in gs2build-->
     1459  </target>
     1460
     1461<!-- untars the XML-Parser. need to do this after compiling in gs2build-->
    13411462  <target name="install-macos-extra" depends="init,get-macos-extra" if="need.macos.extra">
    13421463    <!-- make sure these directories are present, otherwise chmod craps out
    … …  
    13711492      <filterset>
    13721493    <filter token="gsdlhome" value="${gs2build.home.windows}"/>
    1373      </filterset>
     1494      </filterset>
    13741495    </move> 
    13751496    <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" />
    … …  
    13991520  </target>
    14001521 
    1401 <!--  <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> -->
    1402   <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nocvs.mode">
     1522  <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nosvn.mode">
    14031523    <echo>checking out gli</echo>
    14041524    <svn>
    1405         <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/>
    1406     </svn>
    1407   </target>
    1408    
     1525      <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/>
     1526    </svn>
     1527  </target>
     1528 
    14091529  <target name="configure-gs2building" depends="init" if="collection.building.enabled"
    14101530    description="Configure only the Greenstone 2 building components">
    … …  
    14441564    <!-- run the setup script -->
    14451565    <!--<exec executable="${compile.windows.c++.setup}" os="${os.windows}" />-->
    1446     <!--Above does not work:
    1447     even though vcvars.bat executes, the env changes it makes don't get saved. Need user to     run vcvars.bat first before calling ant-->
     1566    <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant-->
    14481567    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" >
    1449      <arg value="/f"/>
    1450      <arg value="win32.mak"/>
    1451      <arg value="clean"/>
    1452     </exec>
    1453   </target>
    1454  
     1568      <arg value="/f"/>
     1569      <arg value="win32.mak"/>
     1570      <arg value="clean"/>
     1571    </exec>
     1572  </target>
     1573 
     1574  <target name="distclean-gs2building" depends="init,clean-gli,clean-gs2build,distclean-gs2build"
     1575    description="Distclean only the Greenstone 2 building components"
     1576    if="collection.building.enabled"/>
     1577
    14551578  <target name="distclean-gs2build" depends="init" if="collection.building.enabled">
    1456     <!-- gs2build -->
    1457     <!--linux:  -->
    14581579    <exec executable="make" os="${os.unix}" dir="${gs2build.home}">
    14591580      <arg value="distclean"/>
    14601581    </exec>
    1461     <!-- windows: -->   
    14621582  </target>
    14631583 
    … …  
    14701590    <property name="gli.home" value="${basedir}/gli"/>
    14711591
    1472         <!-- change the version number -->
    1473         <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;"/>
     1592    <!-- change the version number -->
     1593    <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;"/>
    14741594    <!-- linux -->
    14751595    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/>
    1476      <!--remote gli-->
    1477      <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
     1596    <!--remote gli-->
     1597    <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
    14781598      resolveExecutable="true"/>
    14791599    <!-- windows -->
    14801600    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/>
    14811601    <!--remote gli-->
    1482      <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
     1602    <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
    14831603      resolveExecutable="true"/>
    1484      <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
     1604    <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
    14851605  </target>
    14861606 
    … …  
    14941614    </exec>
    14951615    <!-- run the setup script -->
    1496     <!--<exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>-->
    1497     <!--Above does not work:
    1498     even though vcvars.bat executes, the env changes it makes don't get saved. Need user to     run vcvars.bat first before calling ant-->
     1616    <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>-->
     1617     <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant-->
    14991618    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}">
    1500      <arg value="/f"/>
    1501      <arg value="win32.mak"/>
     1619      <arg value="/f"/>
     1620      <arg value="win32.mak"/>
    15021621    </exec>
    15031622    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}">
    1504      <arg value="/f"/>
    1505      <arg value="win32.mak"/>
    1506      <arg value="install"/>
     1623      <arg value="/f"/>
     1624      <arg value="win32.mak"/>
     1625      <arg value="install"/>
    15071626    </exec>
    15081627    <!-- LuceneWrapper jar file not installed by default -->
    … …  
    15381657    </echo>
    15391658  </target>
    1540  
    1541 
    1542 <!-- ======================== TESTING Targets ========================= -->
     1659  
     1660
     1661  <!-- ======================== TESTING Targets ========================= -->
    15431662 
    15441663  <target name="test" description="Run the (incomplete) JUnit test suite "
    … …  
    15631682    <echo>
    15641683      *********************************************
    1565        Test output can be found in directory 'test'
     1684      Test output can be found in directory 'test'
    15661685      *********************************************
    15671686    </echo>
    15681687  </target>
     1688
     1689  <!-- ======================== FLAX Targets ========================= -->
    15691690  <target name="prepare-flax" description="check out flax source code from another repository" if="install.flax">
    15701691    <echo>checking out flax ...</echo>
    15711692    <mkdir dir="${basedir}/src/java/org/flax"/>
    15721693    <mkdir dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
    1573     <mkdir dir="${basedir}/web/WEB-INF/classes/flax"/>
    1574     <mkdir dir="${basedir}/web/interfaces/flax"/>
    1575     <mkdir dir="${basedir}/web/sites/flax"/>
     1694    <mkdir dir="${web.home}/WEB-INF/classes/flax"/>
     1695    <mkdir dir="${web.home}/interfaces/flax"/>
     1696    <mkdir dir="${web.home}/sites/flax"/>
    15761697    <mkdir dir="${basedir}/flax-resources"/>
    15771698    <mkdir dir="${basedir}/flax-lib"/>
    15781699    <svn>
    15791700      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/" 
    1580                 destPath="${basedir}/src/java/org/flax"/>
     1701    destPath="${basedir}/src/java/org/flax"/>
    15811702      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/greenstone/gsdl3/flax/"
    1582                 destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
     1703    destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
    15831704      <checkout url="${flax.svn.root}/flax1.0/trunk/web/WEB-INF/classes/flax/"
    1584                 destPath="${basedir}/web/WEB-INF/classes/flax"/>
     1705    destPath="${web.home}/WEB-INF/classes/flax"/>
    15851706      <checkout url="${flax.svn.root}/flax1.0/trunk/web/interfaces/flax/"
    1586                 destPath="${basedir}/web/interfaces/flax"/>
     1707    destPath="${web.home}/interfaces/flax"/>
    15871708      <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/"
    1588                 destPath="${basedir}/web/sites/flax"/>
     1709    destPath="${web.home}/sites/flax"/>
    15891710      <checkout url="${flax.svn.root}/flax1.0/trunk/flax-resources"
    1590                 destPath="${basedir}/flax-resources"/>
     1711    destPath="${basedir}/flax-resources"/>
    15911712      <checkout url="${flax.svn.root}/flax1.0/trunk/lib"
    1592                 destPath="${basedir}/flax-lib"/>
     1713    destPath="${basedir}/flax-lib"/>
    15931714    </svn>
    1594      <echo>prepare flax files...</echo>
    1595     <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/>
     1715    <echo>prepare flax files...</echo>
     1716    <move file="${web.home}/WEB-INF/web.xml" tofile="${web.home}/WEB-INF/web.xml.greenstone3backup"/>
    15961717    <antcall target="flax-copy-files" />
    15971718    <antcall target="unzip-flax-collections" />
    15981719    <antcall target="unzip-flax-resources" />
    1599    </target>
     1720  </target>
    16001721
    16011722  <target name="update-flax" description="update flax from repository">
    1602       <echo>updating flax ...</echo>
    1603       <svn>
    1604         <update dir="${basedir}/src/java/org/flax"/>
    1605         <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
    1606         <update dir="${basedir}/web/WEB-INF/classes/flax"/>
    1607         <update dir="${basedir}/web/interfaces/flax"/>
    1608         <update dir="${basedir}/web/sites/flax"/>
    1609       </svn>
    1610      <antcall target="flax-copy-files" />
     1723    <echo>updating flax ...</echo>
     1724    <svn>
     1725      <update dir="${basedir}/src/java/org/flax"/>
     1726      <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
     1727      <update dir="${web.home}/WEB-INF/classes/flax"/>
     1728      <update dir="${web.home}/interfaces/flax"/>
     1729      <update dir="${web.home}/sites/flax"/>
     1730    </svn>
     1731    <antcall target="flax-copy-files" />
    16111732    <antcall target="unzip-flax-collections" />       
    1612    </target>
    1613 
    1614    <target name="unzip-flax-collections" >
    1615     <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/>
     1733  </target>
     1734
     1735  <target name="unzip-flax-collections" >
     1736    <property name="coll.dir" value="${web.home}/sites/flax/collect"/>
    16161737    <unzip dest="${coll.dir}"> 
    16171738      <fileset dir="${coll.dir}">
    16181739    <include name="*.zip"/>
    1619        </fileset>   
     1740      </fileset>   
    16201741    </unzip>   
    16211742    <delete>
    … …  
    16241745  </target>
    16251746
    1626  <target name="unzip-flax-resources" >
    1627     <property name="classes.dir" value="${basedir}/web//WEB-INF/classes/flax"/>
     1747  <target name="unzip-flax-resources" >
     1748    <property name="classes.dir" value="${web.home}/WEB-INF/classes/flax"/>
    16281749    <unzip dest="${classes.dir}"> 
    16291750      <fileset dir="${classes.dir}">
    16301751    <include name="*.zip"/>
    1631        </fileset>   
     1752      </fileset>   
    16321753    </unzip>   
    16331754    <delete>
    … …  
    16351756    </delete>
    16361757  </target>
    1637    
    1638    <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
    1639       <echo>copying flax files ...</echo>
    1640       <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" overwrite="true" />
    1641       <!-- A configuration file containing web service binding information for the axis engine -->
    1642            <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" />
    1643            <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" />
    1644            <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${basedir}/web/WEB-INF/lib" overwrite="true" />   
    1645    </target>
    1646       <!--install gdbm stuff -->
    1647 
    1648   <!-- downloads the gdbm library -->
     1758 
     1759  <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
     1760    <echo>copying flax files ...</echo>
     1761    <copy file="${web.home}/WEB-INF/classes/flax/web.xml" todir="${web.home}/WEB-INF" overwrite="true" />
     1762    <!-- A configuration file containing web service binding information for the axis engine -->
     1763    <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" />
     1764    <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" />
     1765    <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${web.home}/WEB-INF/lib" overwrite="true" />   
     1766  </target>
     1767
     1768
     1769  <!-- ======================== GDBM Targets ========================= -->
     1770
    16491771  <target name="prepare-gdbm" depends="init" if="install.gdbm">
    1650       <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz"
    1651        dest="${src.packages.home}/gdbm-1.8.3.tar.gz"  usetimestamp="true"/>
    1652       <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" /> 
    1653       <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" />
    1654       <antcall target="configure-gdbm" />
    1655       <antcall target="compile-gdbm" />
     1772    <get src="http://www.greenstone.org/gs3files/${gdbm.version}.tar.gz"
     1773      dest="${src.packages.home}/${gdbm.version}.tar.gz"  usetimestamp="true"/>
     1774    <untar compression= "gzip" src="${src.packages.home}/${gdbm.version}.tar.gz" dest="${src.packages.home}" /> 
     1775    <chmod dir="${src.packages.home}/${gdbm.version}" perm="ugo+wrx" includes="**" />
     1776    <antcall target="configure-gdbm" />
     1777    <antcall target="compile-gdbm" />
    16561778  </target> 
    16571779
    1658    <target name="configure-gdbm" if="install.gdbm">
     1780  <target name="configure-gdbm" if="install.gdbm">
    16591781    <echo>
    16601782      Configuring GDBM
    … …  
    16641786      <arg value="--prefix=${gdbm.home}"/>
    16651787    </exec>   
    1666    </target>
    1667 
    1668  <target name="clean-gdbm" depends="init"  if="install.gdbm">   
     1788  </target>
     1789
     1790  <target name="clean-gdbm" depends="init"  if="install.gdbm">   
    16691791    <echo>clean GDBM</echo>
    1670     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}" >
    1671      <arg value="clean"/>
     1792    <exec executable="make" os="${os.unix}" dir="${gdbm.home}" >
     1793      <arg value="clean"/>
    16721794    </exec>
    16731795  </target>
    16741796
    1675  
     1797
     1798  <target name="distclean-gdbm" depends="init"  if="install.gdbm">   
     1799    <echo>distclean GDBM</echo>
     1800    <exec executable="make" os="${os.unix}" dir="${gdbm.home}" >
     1801      <arg value="distclean"/>
     1802    </exec>
     1803  </target>
     1804
    16761805  <target name="compile-gdbm" depends="init"  if="install.gdbm">   
    16771806    <echo>compile GDBM</echo>
    1678     <exec executable="groups" outputproperty="usergroups"/>
    1679     <exec executable="awk" inputstring="${usergroups}" outputproperty="firstgroup">
     1807    <exec executable="groups" os="${os.unix}" outputproperty="usergroups"/>
     1808    <exec executable="awk" os="${os.unix}" inputstring="${usergroups}" outputproperty="firstgroup">
    16801809      <arg line="'{print $1}'"/>
    16811810    </exec>
    16821811
    1683     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}"/>
    1684     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}">
     1812    <exec executable="make" os="${os.unix}" dir="${gdbm.home}"/>
     1813    <exec executable="make" os="${os.unix}" dir="${gdbm.home}">
    16851814      <arg value="BINOWN=${env.USER}"/>
    16861815      <arg value="BINGRP=${firstgroup}"/>
    … …  
    16891818  </target>
    16901819
    1691 
    1692 
    16931820</project>
    16941821
Note: See TracChangeset for help on using the changeset viewer.