Ignore:
Timestamp:
2008-04-28T18:00:54+12:00 (16 years ago)
Author:
ak19
Message:
  1. Commented out property compile.windows.c++.setup since the env state after running vcvars.bat from ant isn't saved anyway. 2. Changed soap-deployment of localsite and other sites. Changes required additional targets.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/build.xml

    r15190 r15229  
    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 
    52  
     50-->
     51
    5352  <!--the first two properties have to be put on the top to be used by build.properties-->
    5453  <property name="src.packages.home" value="${basedir}/src/packages"/>
    … …  
    5958  <!-- get properties from the environment -->
    6059  <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 
    6960  <property name="build.home" value="${basedir}/build"/>
    7061  <property name="src.home" value="${basedir}/src/java"/>
    … …  
    8475  <!-- jni libraries and java wrappers go here -->
    8576  <property name="lib.jni" value="${basedir}/lib/jni"/>
    86  
     77   
    8778  <property name="javadocs" value="${basedir}/docs/javadoc"/>
    8879
    … …  
    164155  </condition>
    165156
    166   <!-- where is search4j tool -->
    167   <condition property="search4j.exec" value="bin/search4j.exe">
    168     <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"/>
    169160  </condition>
    170161  <property name="search4j.exec" value="bin/search4j"/>
    171162
    172  
     163   
    173164  <!-- ============= Base dirs for each package and component ============ -->
    174165  <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/>
    … …  
    178169  <property name="gli.home" value="${basedir}/gli"/>
    179170  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
    180   
     171 
    181172  <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">-->
    182173  <condition property="indexers.home" value="${basedir}/src/packages/indexers">
    … …  
    193184  <property name="lucene.home" value="${indexers.home}/lucene-gs"/>
    194185
    195 
    196   <!--  ==================== Compilation Control Options ==================== -->
    197 
    198   <!--
     186  <!--  ================ A list of all the available web services classes ============== -->
     187  <property name="web.services.list" value="SOAPServer, QBRSOAPServer"/>   
     188
     189<!--  ==================== Compilation Control Options ==================== -->
     190
     191<!--
    199192
    200193  These properties control option settings on the Javac compiler when it
    … …  
    207200  compile.optimize     Should compilation include the optimize option?
    208201
    209   -->
     202-->
    210203
    211204  <property name="compile.debug"       value="true"/>
    … …  
    213206  <property name="compile.optimize"    value="true"/>
    214207
    215   <!--
     208<!--
    216209
    217210  Rather than relying on the CLASSPATH environment variable, Ant includes
    … …  
    222215  that you explicitly added.
    223216
    224   -->
     217-->
    225218
    226219  <path id="compile.classpath">
    … …  
    238231    <!-- Include the axis jar files -->
    239232    <!--<fileset dir="${basedir}/comms/soap/axis/lib">
    240     <include name="*.jar"/>
    241   </fileset>-->
     233      <include name="*.jar"/>
     234    </fileset>-->
    242235   
    243236    <!-- include the jar files from the source packages -->
    … …  
    286279    <echo>os.unix: ${os.unix}</echo>
    287280  </target>
    288   <!-- ==================== Primary and Global Targets ============================= -->
     281<!-- ==================== Primary and Global Targets ============================= -->
    289282
    290283  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
    … …  
    292285  <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"
    293286    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.">
    294     <!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
     287<!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
    295288    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.">-->
    296289
    … …  
    304297    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
    305298 
    306   <!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
    307   description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>-->
     299<!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
     300    description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>-->
    308301  <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web"
    309302    description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/>
    … …  
    316309    description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/>
    317310
    318   <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building,clean-gdbm"
     311  <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
    319312    description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
    320  
    321   <target name="distclean" depends="init,distclean-packages,clean-core,distclean-gs2building,distclean-gdbm"
    322     description="Remove all compiled code and also any Makefiles etc generated during configure-c++. Includes core, packages, gs2building as necessary"/>
    323313 
    324314  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
    325315    description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
    326  
     316   
    327317  <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile"
    328     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'"/>
     318    description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile."/>
    329319
    330320  <target name="start" depends="init,start-tomcat"
    331321    description="Startup the Tomcat server." >
    332     <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>
    333     <echo>Tomcat:   ${catalina.home}</echo>
    334     <echo>Java: ${java.home}</echo>
    335     <echo>URL:  http://${tomcat.server}:${tomcat.port}${app.path}/</echo>
    336     <!-- assuming that index.html is not needed here -->   
     322    <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>
     323    <echo>Tomcat:   ${catalina.home}</echo>
     324    <echo>Java: ${java.home}</echo>
     325        <echo>URL:  http://${tomcat.server}:${tomcat.port}${app.path}/</echo>
     326        <!-- assuming that index.html is not needed here -->   
    337327  </target>
    338328
    … …  
    343333
    344334
    345   <!-- =========== Help targets ===================================  -->
     335<!-- =========== Help targets ===================================  -->
    346336 
    347337  <property name="install-command" value="ant [options] prepare install"/>
    … …  
    351341    <echo message="  Execute 'ant -help' for Ant help."/>
    352342    <echo>To install Greenstone3, run '${install-command}'.
    353       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.
    354       To log the output, use the '-logfile build.log' option.
    355       The README.txt file has more information about the ant targets and install process.
     343There 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.
     344To log the output, use the '-logfile build.log' option.
     345The README.txt file has more information about the ant targets and install process.
    356346    </echo>
    357347  </target>
    … …  
    363353  </target>
    364354
    365   <!-- ====== initialization and setup targets ================== -->
     355<!-- ====== initialization and setup targets ================== -->
    366356
    367357  <target name="accept-properties" unless="properties.accepted">
    368358    <input addproperty="properties.ok" validargs="y,n">The following properties (among others) are being used from a build.properties file found in this directory:
    369       tomcat.server=${tomcat.server}
    370       tomcat.port=${tomcat.port}
    371       tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
    372       proxy.host=${proxy.host}
    373       proxy.port=${proxy.port}
    374       If these are not acceptable, please change them and rerun this target. Continue [y/n]? />
     359tomcat.server=${tomcat.server}
     360tomcat.port=${tomcat.port}
     361tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
     362proxy.host=${proxy.host}
     363proxy.port=${proxy.port}
     364If these are not acceptable, please change them and rerun this target. Continue [y/n]? />
    375365    </input>
    376366    <condition property="do.abort">
    … …  
    380370  </target>
    381371
     372<!--  <target name="check-cvsroot">
     373    <condition property="svnroot.notset">
     374      <or>
     375            <not>
     376              <isset property="env.CVSROOT"/>
     377            </not>
     378            <equals arg1="" arg2="${env.CVSROOT}"/>
     379      </or>
     380    </condition>
     381    <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/>
     382  </target> -->
    382383
    383384  <!-- this sets up some initial properties -->
    … …  
    406407    </condition>
    407408   
    408     <echo>tomcat.port = ${tomcat.port}</echo>
    409     <echo>gli.present = ${gli.present}</echo>
    410     <echo>gs2build.present = ${gs2build.present}</echo>
    411     <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo>
    412     <!-- gsdl2.installed.path appears not to be set? -->
     409      <echo>tomcat.port = ${tomcat.port}</echo>
     410      <echo>gli.present = ${gli.present}</echo>
     411      <echo>gs2build.present = ${gs2build.present}</echo>
     412      <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo>
     413     <!-- gsdl2.installed.path appears not to be set? -->
    413414
    414415    <condition property="proxy.present">
    … …  
    441442    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
    442443  </target>
    443  
    444   <!-- ========== Web app Targets ================================ -->
     444     
     445 <!-- ========== Web app Targets ================================ -->
    445446 
    446447  <target name="prepare-web" depends="init,configure-java-version">
    … …  
    453454    description="Activates or deactivates some jar libraries as needed depending on your java version">
    454455
    455     <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/>
     456        <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/>
    456457    <condition property="need.xalan.jar">
    457       <or>
    458     <equals arg1="1.5" arg2="${ant.java.version}"/>
    459     <equals arg1="1.6" arg2="${ant.java.version}"/>
    460       </or>
    461     </condition>
    462 
    463     <!-- if they have xalan.jar but dont need it -->
    464     <if>
    465       <bool>
    466     <and>
    467       <isset property="have.xalan.jar"/>
    468       <not><isset property="need.xalan.jar"/></not>
    469     </and>
    470       </bool>
    471       <antcall target="deactivate-xalan-jar"/>
    472     </if>
    473 
    474     <!-- if they need xalan.jar but dont have it -->
    475     <if>
    476       <bool>
    477     <and>
    478       <not><isset property="have.xalan.jar"/></not>
    479       <isset property="need.xalan.jar"/>
    480     </and>
    481       </bool>
    482       <antcall target="activate-xalan-jar"/>
    483     </if>
     458            <or>
     459                <equals arg1="1.5" arg2="${ant.java.version}"/>
     460                <equals arg1="1.6" arg2="${ant.java.version}"/>
     461            </or>
     462        </condition>
     463
     464        <!-- if they have xalan.jar but dont need it -->
     465        <if>
     466            <bool>
     467                <and>
     468                    <isset property="have.xalan.jar"/>
     469                    <not><isset property="need.xalan.jar"/></not>
     470                </and>
     471            </bool>
     472            <antcall target="deactivate-xalan-jar"/>
     473        </if>
     474
     475        <!-- if they need xalan.jar but dont have it -->
     476        <if>
     477            <bool>
     478                <and>
     479                    <not><isset property="have.xalan.jar"/></not>
     480                    <isset property="need.xalan.jar"/>
     481                </and>
     482            </bool>
     483            <antcall target="activate-xalan-jar"/>
     484        </if>
    484485
    485486  </target>
    486487 
    487488  <target name="activate-xalan-jar">
    488     <echo>activating xalan.jar</echo>
     489        <echo>activating xalan.jar</echo>
    489490    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
    490     <if><bool><isset property="current.os.ismac"/></bool>
    491       <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>
    492     </if>
    493   </target>
    494 
    495   <!-- to delete -->
     491        <if><bool><isset property="current.os.ismac"/></bool>
     492            <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/>
     493        </if>
     494  </target>
     495
     496    <!-- to delete -->
    496497  <target name="copy-xalan-for-mac"></target>
    497498
    498499  <target name="deactivate-xalan-jar">
    499     <echo>deactivating xalan.jar</echo>
     500        <echo>deactivating xalan.jar</echo>
    500501    <delete file="${web.lib}/xalan.jar"/>
    501502  </target>
    502503
    503 <target name="prepare-collections" depends="init">
    504     <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
    505 <echo message="installing collections..."/>
    506 <antcall target="gs2mgdemo-install"/>
    507 <antcall target="gs2mgppdemo-install"/>
    508 <antcall target="gberg-install"/>
    509 
    510 </target>
    511 
    512 <target name="gs2mgdemo-prepare" if="collect.dir">
    513  <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/>
    514  <property name="gs2mgdemo.import.zip" value="${gs2mgdemo.dir}/import.zip"/>
    515   <property name="gs2mgdemo.metadata.zip" value="${gs2mgdemo.dir}/metadata.zip"/>
    516   <property name="gs2mgdemo.index.zip" value="${gs2mgdemo.dir}/index.zip"/>
    517 
    518 <fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}">
    519     <include name="${gs2mgdemo.import.zip}"/>
    520     <include name="${gs2mgdemo.metadata.zip}"/>
    521     <include name="${gs2mgdemo.index.zip}"/>
    522 </fileset>
    523 
    524 <condition property="gs2mgdemo.present">
    525     <and>
    526     <available file="${gs2mgdemo.import.zip}"/>
    527     <available file="${gs2mgdemo.metadata.zip}"/>
    528         <available file="${gs2mgdemo.index.zip}"/>
    529     </and>
    530   </condition>
    531 </target>
    532 
    533 <target name="gs2mgdemo-install" if="gs2mgdemo.present"  depends="gs2mgdemo-prepare">
    534 <echo> installing gs2mgdemo</echo>
    535 <unzip dest="${gs2mgdemo.dir}">
    536     <fileset refid="gs2mgdemofiles"/>
    537 </unzip>
    538 <delete>
    539     <fileset refid="gs2mgdemofiles"/>
    540 </delete>
    541 <echo>collection gs2mgdemo installed</echo>
    542 </target>
    543 
    544 <target name="gs2mgppdemo-prepare" if="collect.dir">
    545  <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/>
    546  <property name="gs2mgppdemo.import.zip" value="${gs2mgppdemo.dir}/import.zip"/>
    547   <property name="gs2mgppdemo.metadata.zip" value="${gs2mgppdemo.dir}/metadata.zip"/>
    548   <property name="gs2mgppdemo.index.zip" value="${gs2mgppdemo.dir}/index.zip"/>
    549 
    550 <fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}">
    551         <include name="${gs2mgppdemo.import.zip}"/>
    552         <include name="${gs2mgppdemo.metadata.zip}"/>
    553         <include name="${gs2mgppdemo.index.zip}"/>
    554 </fileset>
    555 
    556 <condition property="gs2mgppdemo.present">
    557     <and>
    558         <available file="${gs2mgppdemo.import.zip}"/>
    559         <available file="${gs2mgppdemo.metadata.zip}"/>
    560         <available file="${gs2mgppdemo.index.zip}"/>
    561     </and>
    562   </condition>
    563 </target>
    564 
    565 <target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare">
    566 <unzip dest="${gs2mgppdemo.dir}">
    567         <fileset refid="gs2mgppdemofiles"/>
    568 </unzip>
    569 <delete>
    570         <fileset refid="gs2mgppdemofiles"/>
    571 </delete>
    572 <echo>collection gs2mgppdemo installed</echo>
    573 </target>   
    574 
    575 <target name="gberg-prepare" if="collect.dir">
    576  <property name="gberg.dir" value="${collect.dir}/gberg"/>
    577  <property name="gberg.index.zip" value="${gberg.dir}/index.zip"/>
    578 
    579 <fileset id="gbergfiles" dir="${gberg.dir}">
    580         <include name="${gberg.index.zip}"/>
    581 </fileset>
    582 <available file="${gberg.index.zip}" property="gberg.present"/>
    583 </target>
    584 
    585 <target name="gberg-install" if="gberg.present" depends="gberg-prepare">
    586 <unzip dest="${gberg.dir}">
    587         <fileset refid="gbergfiles"/>
    588 </unzip>
    589 <delete>
    590         <fileset refid="gbergfiles"/>
    591 </delete>
    592 <echo>collection gberg installed</echo>
    593 </target>
    594 
    595 
    596 
    597 
    598 
    599 
    600 
    601 
    602 
    603 
    604 
    605 
    606 
    607 
    608 
    609 
    610 
    611 <!--
    612504  <target name="prepare-collections" depends="init">
    613505    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
    614    
     506    <!-- gs2mgdemo -->
    615507    <unzip src="${collect.dir}/gs2mgdemo/import.zip"
    616508      dest="${collect.dir}/gs2mgdemo"/>
    … …  
    622514    <delete file="${collect.dir}/gs2mgdemo/metadata.zip"/>
    623515    <delete file="${collect.dir}/gs2mgdemo/index/index.zip"/>
    624    
     516    <!-- gs2mgppdemo -->
    625517    <unzip src="${collect.dir}/gs2mgppdemo/import.zip"
    626518      dest="${collect.dir}/gs2mgppdemo"/>
    … …  
    632524    <delete file="${collect.dir}/gs2mgppdemo/metadata.zip"/>
    633525    <delete file="${collect.dir}/gs2mgppdemo/index/index.zip"/>
    634  
     526    <!-- gberg -->
    635527    <unzip src="${collect.dir}/gberg/index/index.zip"
    636528      dest="${collect.dir}/gberg/index"/>
    637529    <delete file="${collect.dir}/gberg/index/index.zip"/>
    638530  </target>
    639 -->
     531
    640532 
    641533  <target name="configure-web" depends="init"
    … …  
    667559  </target>
    668560
    669   <target name="svnupdate-web" unless="nosvn.mode">
    670     <svn>
    671       <update dir="${web.home}"/>
    672     </svn>
    673   </target>
     561    <target name="svnupdate-web" unless="nosvn.mode">
     562        <svn>
     563            <update dir="${web.home}"/>
     564        </svn>
     565    </target>
    674566
    675567  <target name="update-web" depends="init,svnupdate-web,configure-web"
    … …  
    677569
    678570
    679   <!-- ======================= Tomcat Targets ========================== -->
     571<!-- ======================= Tomcat Targets ========================== -->
    680572 
    681573  <!-- this target downloads and installs Tomcat -->
    … …  
    685577    <!-- check that packages dir is there -->
    686578    <mkdir dir="${packages.home}"/>
    687     <get src="http://www.greenstone.org/gs3files/${tomcat.version}.zip"
    688       dest="${packages.home}/${tomcat.version}.zip"
     579    <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25.zip"
     580      dest="${packages.home}/apache-tomcat-5.5.25.zip"
    689581      usetimestamp="true"/>
    690     <unzip src="${packages.home}/${tomcat.version}.zip"
     582    <unzip src="${packages.home}/apache-tomcat-5.5.25.zip"
    691583      dest="${packages.home}"/>
    692     <get src="http://www.greenstone.org/gs3files/${tomcat.version}-compat.zip"
    693       dest="${packages.home}/${tomcat.version}-compat.zip"
     584    <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25-compat.zip"
     585      dest="${packages.home}/apache-tomcat-5.5.25-compat.zip"
    694586      usetimestamp="true"/>
    695     <unzip src="${packages.home}/${tomcat.version}-compat.zip"
     587    <unzip src="${packages.home}/apache-tomcat-5.5.25-compat.zip"
    696588      dest="${packages.home}"/>
    697589    <!-- delete any existing tomcat -->
    698590    <delete dir="${packages.home}/tomcat"/>
    699591    <move todir="${packages.home}/tomcat">
    700       <fileset dir="${packages.home}/${tomcat.version}"/>
     592      <fileset dir="${packages.home}/apache-tomcat-5.5.25"/>
    701593    </move>
    702594    <copy file="${basedir}/resources/tomcat/setclasspath.bat"
    … …  
    733625    <!-- need to edit the config file, or do we get the user to do this???-->
    734626  </target>
    735  
     627   
    736628  <target name="start-tomcat" description="Startup only Tomcat" depends="init,configure-java-version" if="tomcat.islocal">
    737     <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
     629   <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
    738630    <property name="tomcat.path" refid="local.tomcat.path"/>
    739631    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
    … …  
    798690
    799691
    800 
    801 
    802 
    803 
    804   <!-- ======================= ant Targets ============================ -->
     692<!-- ======================= ant Targets ============================ -->
    805693  <target name="prepare-ant" depends="init">
    806694    <get src="http://www.greenstone.org/gs3files/apache-ant-1.7.0-bin.zip"
    … …  
    814702  </target>
    815703
    816   <!-- ======================= Axis Targets ============================ -->
     704<!-- ======================= Axis Targets ============================ -->
    817705
    818706  <target name="prepare-axis" depends="init">
    819     <get src="http://www.greenstone.org/gs3files/${axis.zip.version}"
    820       dest="${packages.home}/${axis.zip.version}"
     707    <get src="http://www.greenstone.org/gs3files/axis-bin-1_2_1.zip"
     708      dest="${packages.home}/axis-bin-1_2_1.zip"
    821709      usetimestamp="true"/>
    822     <unzip src="${packages.home}/${axis.zip.version}"
     710    <unzip src="${packages.home}/axis-bin-1_2_1.zip"
    823711      dest="${packages.home}"/>
    824712    <move todir="${packages.home}/axis">
    825       <fileset dir="${packages.home}/${axis.dir.version}"/>
     713      <fileset dir="${packages.home}/axis-1_2_1"/>
    826714    </move>
    827715    <!-- install axis into greenstone web app -->
    … …  
    845733  </target>
    846734
    847   <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,create-deployment-files,deploy-site"
     735  <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,get-webservices,create-deployment-files,deploy-site"
    848736    description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/>
    849737 
    … …  
    853741      <arg value="-l"/>
    854742      <arg value="http://${tomcat.server}:${tomcat.port}${app.path}/servlet/AxisServlet"/>
    855       <arg file="${basedir}/resources/soap/${axis.sitename}.wsdd"/>
    856     </java>   
    857   </target>
    858  
    859   <target name="soap-undeploy-site" depends="get-sitename"
     743      <arg file="${basedir}/resources/soap/deploy.wsdd"/>
     744    </java>
     745    <delete file="${basedir}/resources/soap/deploy.wsdd"/> <!--clean up, no longer used-->
     746  </target>
     747 
     748  <target name="soap-undeploy-site" depends="get-undeploy-service-name"
    860749    description="Undeploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work.">
     750    <filter token="servicesname" value="${axis.undeploy.servicename}"/>
     751    <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template"
     752      tofile="${basedir}/resources/soap/undeploy.wsdd"
     753      filtering="true"
     754      overwrite="true"/>
    861755    <java classname="org.apache.axis.client.AdminClient">
    862756      <classpath refid="compile.classpath"/>
    863757      <arg value="-l"/>
    864758      <arg value="http://${tomcat.server}:${tomcat.port}${app.path}/servlet/AxisServlet"/>
    865       <arg file="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"/>
     759      <arg file="${basedir}/resources/soap/undeploy.wsdd"/>
    866760    </java>
    867   </target>
    868 
    869   <!-- this target used to deploy the preprepared localsite server  -->
     761    <delete file="${basedir}/resources/soap/undeploy.wsdd"/> <!--clean up, no longer used-->
     762  </target>
     763
     764  <!-- this target used to deploy the default web service SOAPServer on the localsite server
     765with the default servicename of localsite-->
    870766  <target name="deploy-localsite" depends="init"
    871767    description="Deploy the SOAP server for localsite. Will start and stop Tomcat.">
    872768    <antcall target="start-tomcat"/>
     769    <echo>Deploying SOAPServer web services for localsite under service name: localsite</echo>
     770    <antcall target="create-deployment-files">
     771      <param name="axis.sitename" value="localsite"/>
     772      <param name="axis.servicesname" value="SOAPServer"/>
     773      <param name="axis.siteuri" value="localsite"/>
     774    </antcall>
    873775    <antcall target="deploy-site">
    874776      <param name="axis.sitename" value="localsite"/>
     777      <param name="axis.servicesname" value="SOAPServer"/>
     778      <param name="axis.siteuri" value="localsite"/>
    875779    </antcall>
    876     <antcall target="stop-tomcat"/>
     780    <!--<antcall target="stop-tomcat"/>-->
    877781  </target>
    878782 
    879783  <target name="get-sitename" unless="axis.sitename">
    880     <input addproperty="axis.sitename" message="What site? (press enter for default:localsite)" defaultvalue="localsite"/>
    881   </target>
    882 
    883   <target name="get-siteuri" depends="get-sitename" unless="axis.siteuri">
    884     <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.sitename})" defaultvalue="${axis.sitename}"/>
    885     <echo>${axis.sitename}, ${axis.siteuri}</echo>
    886   </target>
    887 
    888   <target name="check-deployment-files" depends="get-sitename">
    889     <condition property="deploy.exists">
    890       <and>
    891     <available file="${basedir}/resources/soap/${axis.sitename}.wsdd"/>
    892     <available file="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"/>
    893     <available file="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class"/>
    894       </and>
     784    <input addproperty="axis.sitename" defaultvalue="localsite">What site do you want to deploy services for?
     785Press enter for default:localsite</input>
     786  </target>
     787
     788  <!-- ADDED -->
     789  <target name="get-undeploy-service-name" unless="axis.undeploy.servicename">
     790    <input addproperty="axis.undeploy.servicename" defaultvalue="localsite">Please enter the full name of the service you wish to undeploy.
     791To find out which web services you've got deployed, point your browser to http://HOST:PORT/greenstone3/services
     792Or press Enter for undeploying the default:localsite /></input>
     793     <echo>Name of service to undeploy: ${axis.undeploy.servicename}</echo>
     794  </target>
     795
     796  <target name="get-webservices" unless="axis.servicesname">
     797    <input addproperty="axis.servicesname" defaultvalue="SOAPServer">Which set of web services do you want to deploy?
     798Choose from: ${web.services.list}
     799Or press enter for default:SOAPServer /></input>
     800    <echo>${axis.servicesname}</echo>
     801  </target>
     802
     803  <target name="get-siteuri" depends="get-sitename,get-webservices" unless="axis.siteuri">
     804    <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.servicesname}${axis.sitename})"
     805          defaultvalue="${axis.servicesname}${axis.sitename}"/>
     806    <echo>Site: ${axis.sitename}, services: ${axis.servicesname}, servicesname: ${axis.siteuri}</echo>
     807  </target>
     808
     809  <target name="set-soapmethod" description="Determines whether the service in the wsdd should have the style attribute set to message or the provider attribute set to java:RPC"  if="axis.servicesname">
     810   <condition property="soap.method" value="provider='java:MSG' style='message' use='literal'">
     811      <equals arg1="${axis.servicesname}" arg2="SOAPServer"/>
    895812    </condition>
    896   </target>
    897 
    898   <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files"
    899     if="axis.sitename" unless="deploy.exists">
     813   
     814   <!--everything else defaults to java:RPC at present-->
     815   <condition property="soap.method" value="provider='java:RPC'">
     816     <not>
     817      <equals arg1="${axis.servicesname}" arg2="SOAPServer"/>
     818    </not>
     819    </condition>
     820 </target>
     821
     822  <target name="create-deployment-files" depends="set-soapmethod" if="axis.sitename">
    900823    <filter token="sitename" value="${axis.sitename}"/>
    901824    <filter token="siteuri" value="${axis.siteuri}"/>
     825    <filter token="servicesname" value="${axis.servicesname}"/>
     826    <filter token="soapmethod" value="${soap.method}"/>
    902827    <copy file="${basedir}/resources/soap/site.wsdd.template"
    903       tofile="${basedir}/resources/soap/${axis.sitename}.wsdd"
    904       filtering="true"/>
    905     <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template"
    906       tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"
    907       filtering="true"/>
     828      tofile="${basedir}/resources/soap/deploy.wsdd"
     829      filtering="true"
     830      overwrite="true"/>
    908831    <!-- create the java files and compile them -->
    909     <copy file="${basedir}/resources/java/SOAPServer.java.in"
    910       tofile="${src.gsdl3.home}/SOAPServer${axis.sitename}.java"
    911       filtering="true"/>
     832    <copy file="${basedir}/resources/java/${axis.servicesname}.java.in"
     833      tofile="${src.gsdl3.home}/${axis.servicesname}${axis.sitename}.java"
     834      filtering="true"
     835      overwrite="true"/>
    912836    <mkdir dir="${build.home}"/>
    913837    <javac srcdir="${src.home}"
    … …  
    917841      optimize="${compile.optimize}">
    918842      <classpath refid="compile.classpath"/>
    919       <include name="org/greenstone/gsdl3/SOAPServer${axis.sitename}.java" />
     843      <include name="org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.java" />
    920844    </javac>
    921845    <mkdir dir="${web.classes}/org/greenstone/gsdl3"/>
    922     <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" />
    923   </target>
    924  
    925 
    926   <!-- ====================== Core targets ============================== -->
    927   <!-- core targets refer to the core gsdl3 java src -->
    928  
    929   <target name="prepare-core" unless="nosvn.mode">
     846    <copy file="${build.home}/org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.class"        tofile="${web.classes}/org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.class"
     847          overwrite="true" />
     848  </target>
     849   
     850
     851<!-- ====================== Core targets ============================== -->
     852<!-- core targets refer to the core gsdl3 java src -->
     853 
     854  <target name="prepare-core" unless="nocvs.mode">
    930855    <!-- just get rid of empty directories-->
    931856    <svn>
    932       <update dir="."/>
    933     </svn>
     857        <update dir="."/>
     858    </svn>
    934859  </target>
    935860 
    … …  
    939864    description="Update only the Greenstone core" />
    940865 
    941   <target name="svnupdate-core" unless="nosvn.mode">
    942 
    943     <svn>
    944       <update dir="." recurse="false"/>
    945     </svn>
    946 
    947     <svn>
    948       <update dir="bin"/>
    949       <update dir="comms"/>
    950       <update dir="dist-resources"/>
    951       <update dir="docs"/>
    952       <update dir="lib"/>
    953       <update dir="resources"/>
    954       <update dir="src"/>
    955       <update dir="winutil"/>
    956     </svn>
     866  <target name="svnupdate-core" unless="nocvs.mode">
     867
     868    <svn>
     869        <update dir="." recurse="false"/>
     870    </svn>
     871
     872   <svn>
     873        <update dir="bin"/>
     874        <update dir="comms"/>
     875        <update dir="dist-resources"/>
     876        <update dir="docs"/>
     877        <update dir="lib"/>
     878        <update dir="resources"/>
     879        <update dir="src"/>
     880        <update dir="winutil"/>
     881    </svn>
    957882
    958883  </target>
    … …  
    963888  </target>
    964889
    965   <target name="compile-core" depends="init"
     890   <target name="compile-core" depends="init"
    966891    description="Compile only the Greenstone core">
    967892    <mkdir dir="${build.home}"/>
    … …  
    997922      </manifest>
    998923    </jar>
    999    
     924     
    1000925    <jar destfile="${build.home}/phind.jar">
    1001926      <fileset dir="${build.home}">
    … …  
    1040965    <copy file="${build.home}/server.jar" todir="${basedir}"/>
    1041966  </target>
    1042   
    1043   <!-- ================== Packages targets ================================ -->
     967 
     968<!-- ================== Packages targets ================================ -->
    1044969  <!-- these targets refer to the greenstone source packages - these need
    1045970  updating less often, so are in  separate targets to the core -->
    1046971  <target name="prepare-packages" depends="init,prepare-indexers"/>
    1047972 
    1048   <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nosvn.mode">
     973  <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nocvs.mode">
     974<!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> -->
    1049975    <svn>
    1050       <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/>
    1051     </svn>
     976        <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/>
     977    </svn>
    1052978  </target>
    1053979 
    … …  
    1059985    description="Update only the source packages"/>
    1060986
    1061   <target name="svnupdate-packages" unless="nosvn.mode">
    1062     <svn>
    1063       <update dir="${src.packages.home}"/>
    1064     </svn>
     987  <target name="svnupdate-packages" unless="nocvs.mode">
     988   <svn>
     989        <update dir="${src.packages.home}"/>
     990    </svn>
    1065991  </target>
    1066992 
    … …  
    10811007      <arg value="--prefix=${basedir}"/>
    10821008      <arg value="--libdir=${lib.jni}"/>
    1083       <arg value="--with-gdbm=${gdbm.installed.path}"/>
     1009     <arg value="--with-gdbm=${gdbm.installed.path}"/>
    10841010    </exec>   
    10851011  </target>
    10861012
    1087   <!-- Message from oran. I removed the condition from this line becuase it meant
    1088   the indexers would only be configured if collection building was DISabled.
    1089   Shouldn't they be configured when collection building is ENabled? -->
    1090 
    1091   <!--  <target name="configure-indexers" depends="init" if="independent-indexers"> -->
    1092   <target name="configure-indexers" depends="init">
    1093     <echo>Configuring Indexers</echo>
    1094     <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}">
    1095       <arg value="--prefix=${basedir}"/>
    1096       <arg value="--libdir=${lib.jni}"/>
    1097     </exec>         
    1098   </target>
     1013<!-- Message from oran. I removed the condition from this line becuase it meant
     1014    the indexers would only be configured if collection building was DISabled.
     1015    Shouldn't they be configured when collection building is ENabled? -->
     1016
     1017<!--    <target name="configure-indexers" depends="init" if="independent-indexers"> -->
     1018<target name="configure-indexers" depends="init">
     1019        <echo>Configuring Indexers</echo>
     1020        <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}">
     1021            <arg value="--prefix=${basedir}"/>
     1022            <arg value="--libdir=${lib.jni}"/>
     1023        </exec>         
     1024    </target>
    10991025
    11001026  <target name="clean-packages" depends="init,clean-javagdbm,clean-indexers" description="Clean only the packages"/>
    … …  
    11131039    </exec>
    11141040    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}"
    1115       dir="${indexers.home}">
    1116       <arg value="clean"/>
    1117     </exec>
    1118 
    1119   </target>
    1120   <target name="distclean-packages" depends="init,distclean-javagdbm,distclean-indexers" description="Distclean only the packages"/>
    1121 
    1122   <target name="distclean-javagdbm" depends="init">
    1123     <exec executable="make" os="${os.unix}"
    1124       dir="${javagdbm.home}">
    1125       <arg value="distclean"/>
    1126     </exec>
    1127   </target>
    1128  
    1129   <target name="distclean-indexers" depends="init" if="independent-indexers">
    1130     <exec executable="make" os="${os.unix}"
    1131       dir="${indexers.home}">
    1132       <arg value="distclean"/>
    1133     </exec>
    1134     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}"
    1135       dir="${indexers.home}">
    1136       <arg value="clean"/>
    1137     </exec>
    1138 
    1139   </target>
    1140  
    1141   <target name="compile-packages" description="Compile only the source packages">
    1142    
    1143     <!-- javagdbm -->
    1144     <echo>compile javagdbm</echo>
    1145     <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/>
    1146     <exec executable="make" os="${os.unix}" dir="${javagdbm.home}">
    1147       <arg value="install"/>
    1148     </exec>
    1149 
    1150     <!-- windows: just the java stuff. -->
    1151     <echo>Windows: compile javagdbm (java only)</echo>
    1152     <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}">
    1153       <arg value="compile"/>
    1154       <arg value="javaonly"/>
    1155     </exec>
    1156 
    1157     <!-- install the jar file -->
    1158     <echo>Install the javagdbm jar file</echo>
    1159     <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
    1160 
    1161     <!-- Indexers -->
    1162 
    1163     <!-- this may be in gs2build - we will be recompiling, but never mind -->
    1164     <echo>Indexers: make (from ${indexers.home})</echo>
    1165     <exec executable="make" os="${os.unix}" dir="${indexers.home}"/>
    1166     <echo>Indexers: make install</echo>
    1167     <exec executable="make" os="${os.unix}" dir="${indexers.home}">
    1168       <arg value="install"/>
    1169     </exec>
    1170 
    1171     <echo>Indexers: make</echo>
    1172     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
    1173       <arg value="all"/>
    1174     </exec>
    1175     <echo>Indexers: make install</echo>
    1176     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
    1177       <arg value="install"/>
    1178     </exec>
    1179 
    1180     <!-- install the jar and jni files -->
    1181     <echo>Install the indexers' jar and jni files</echo>
    1182     <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
    1183     <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
    1184     <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
    1185     <antcall target="install-jni-files"/>
    1186   </target>
     1041       dir="${indexers.home}">
     1042       <arg value="clean"/>
     1043    </exec>
     1044
     1045  </target>
     1046   
     1047    <target name="compile-packages" description="Compile only the source packages">
     1048         
     1049        <!-- javagdbm -->
     1050        <echo>compile javagdbm</echo>
     1051        <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/>
     1052        <exec executable="make" os="${os.unix}" dir="${javagdbm.home}">
     1053            <arg value="install"/>
     1054        </exec>
     1055
     1056        <!-- windows: just the java stuff. -->
     1057        <echo>Windows: compile javagdbm (java only)</echo>
     1058        <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}">
     1059            <arg value="compile"/>
     1060            <arg value="javaonly"/>
     1061        </exec>
     1062
     1063        <!-- install the jar file -->
     1064        <echo>Install the javagdbm jar file</echo>
     1065        <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
     1066
     1067        <!-- Indexers -->
     1068
     1069        <!-- this may be in gs2build - we will be recompiling, but never mind -->
     1070        <echo>Indexers: make (from ${indexers.home})</echo>
     1071        <exec executable="make" os="${os.unix}" dir="${indexers.home}"/>
     1072        <echo>Indexers: make install</echo>
     1073        <exec executable="make" os="${os.unix}" dir="${indexers.home}">
     1074            <arg value="install"/>
     1075        </exec>
     1076
     1077        <echo>Indexers: make</echo>
     1078        <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
     1079            <arg value="all"/>
     1080        </exec>
     1081        <echo>Indexers: make install</echo>
     1082        <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
     1083            <arg value="install"/>
     1084        </exec>
     1085
     1086        <!-- install the jar and jni files -->
     1087        <echo>Install the indexers' jar and jni files</echo>
     1088        <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
     1089        <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
     1090        <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
     1091        <antcall target="install-jni-files"/>
     1092    </target>
    11871093
    11881094  <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/>
    11891095
    1190   <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
     1096    <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
    11911097    <copy file="${mg.home}/jni/libmgretrievejni.so" todir="${lib.jni}"/>
    11921098    <copy file="${mg.home}/jni/libmgsearchjni.so" todir="${lib.jni}"/>
    1193     <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
     1099     <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
    11941100    <copy file="${mgpp.home}/jni/libmgppretrievejni.so" todir="${lib.jni}"/>
    11951101    <copy file="${mgpp.home}/jni/libmgppsearchjni.so" todir="${lib.jni}"/>
    1196     <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
    1197   </target>
    1198   <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">
     1102     <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
     1103   </target>
     1104   <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">
    11991105    <copy file="${mg.home}/jni/mgretrievejni.dll" todir="${lib.jni}"/>
    12001106    <copy file="${mg.home}/jni/mgsearchjni.dll" todir="${lib.jni}"/>
    1201     <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>
     1107     <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>
    12021108    <copy file="${mgpp.home}/jni/mgppretrievejni.dll" todir="${lib.jni}"/>
    12031109    <copy file="${mgpp.home}/jni/mgppsearchjni.dll" todir="${lib.jni}"/>
    1204     <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>
    1205   </target>
    1206   <target name="install-jni-files-macos" depends="init" if="current.os.ismac">
     1110     <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>
     1111   </target>
     1112   <target name="install-jni-files-macos" depends="init" if="current.os.ismac">
    12071113    <copy file="${mg.home}/jni/libmgretrievejni.jnilib" todir="${lib.jni}"/>
    12081114    <copy file="${mg.home}/jni/libmgsearchjni.jnilib" todir="${lib.jni}"/>
    1209     <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>
     1115     <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>
    12101116    <copy file="${mgpp.home}/jni/libmgppretrievejni.jnilib" todir="${lib.jni}"/>
    12111117    <copy file="${mgpp.home}/jni/libmgppsearchjni.jnilib" todir="${lib.jni}"/>
    1212     <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
    1213   </target>
    1214   
     1118     <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
     1119   </target>
     1120 
    12151121  <!-- ================== gs2building targets ===============-->
    12161122
    … …  
    12201126    description="Update only the Greenstone 2 building components"/>
    12211127
    1222   <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nosvn.mode">
    1223   </target>
    1224 
    1225   <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nosvn.mode">
    1226     <!-- please keep this function in sync with checkout-gs2build -->
    1227 
    1228     <echo>updating gs2build</echo>
    1229     <!-- svn updates -->
     1128  <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nocvs.mode">
     1129  </target>
     1130
     1131  <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nocvs.mode">
     1132        <!-- please keep this function in sync with checkout-gs2build -->
     1133
     1134        <echo>updating gs2build</echo>
     1135        <!-- svn updates -->
     1136        <svn>
     1137            <!-- perllib -->
     1138            <update dir="gs2build/perllib" revision="${branch.revision}"/>
     1139
     1140            <!-- selected packages -->
     1141            <update dir="gs2build/packages/cpan" revision="${branch.revision}" />
     1142            <update dir="gs2build/packages/expat" revision="${branch.revision}" />
     1143            <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" />
     1144            <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" />
     1145            <update dir="gs2build/packages/kea" revision="${branch.revision}" />
     1146            <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" />
     1147            <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" />
     1148            <update dir="gs2build/packages/w3mir" revision="${branch.revision}" />
     1149            <update dir="gs2build/packages/wget" revision="${branch.revision}" />
     1150            <update dir="gs2build/packages/windows" revision="${branch.revision}" />
     1151            <update dir="gs2build/packages/wv" revision="${branch.revision}" />
     1152            <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" />
     1153            <update dir="gs2build/packages/yaz" revision="${branch.revision}" />
     1154           
     1155            <!-- some of src (db2txt hashfile phind txt2db) -->
     1156            <update dir="gs2build/src/db2txt" revision="${branch.revision}" />
     1157            <update dir="gs2build/src/hashfile" revision="${branch.revision}" />
     1158            <update dir="gs2build/src/phind" revision="${branch.revision}" />
     1159            <update dir="gs2build/src/txt2db" revision="${branch.revision}" />
     1160
     1161            <!-- bin -->
     1162            <update dir="gs2build/bin/script" revision="${branch.revision}" />
     1163
     1164            <!-- mappings -->
     1165            <update dir="gs2build/mappings" revision="${branch.revision}"/>
     1166
     1167            <!-- etc/packages -->
     1168            <update dir="gs2build/etc/packages" revision="${branch.revision}"/>
     1169   
     1170            <!-- collect -->
     1171            <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/>
     1172
     1173            <!-- gs2build-extra -->
     1174            <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/>
     1175
     1176            <!-- indexers -->
     1177            <update dir="gs2build/indexers" revision="${branch.revision}"/>
     1178
     1179            <!-- single files -->
     1180           
     1181            <!-- some files from lib -->
     1182            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
     1183            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
     1184            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
     1185
     1186            <!-- some files from etc -->
     1187            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
     1188            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
     1189            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
     1190            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
     1191
     1192            <!-- some files from the gsdl root directory -->
     1193            <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
     1194            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
     1195            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
     1196            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
     1197            <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
     1198            <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
     1199            <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
     1200            <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
     1201            <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
     1202        </svn>
     1203  </target>
     1204 
     1205  <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nocvs.mode">
    12301206    <svn>
    1231       <!-- perllib -->
    1232       <update dir="gs2build/perllib" revision="${branch.revision}"/>
    1233 
    1234       <!-- selected packages -->
    1235       <update dir="gs2build/packages/cpan" revision="${branch.revision}" />
    1236       <update dir="gs2build/packages/expat" revision="${branch.revision}" />
    1237       <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" />
    1238       <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" />
    1239       <update dir="gs2build/packages/kea" revision="${branch.revision}" />
    1240       <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" />
    1241       <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" />
    1242       <update dir="gs2build/packages/w3mir" revision="${branch.revision}" />
    1243       <update dir="gs2build/packages/wget" revision="${branch.revision}" />
    1244       <update dir="gs2build/packages/windows" revision="${branch.revision}" />
    1245       <update dir="gs2build/packages/wv" revision="${branch.revision}" />
    1246       <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" />
    1247       <update dir="gs2build/packages/yaz" revision="${branch.revision}" />
    1248      
    1249       <!-- some of src (db2txt hashfile phind txt2db) -->
    1250       <update dir="gs2build/src/db2txt" revision="${branch.revision}" />
    1251       <update dir="gs2build/src/hashfile" revision="${branch.revision}" />
    1252       <update dir="gs2build/src/phind" revision="${branch.revision}" />
    1253       <update dir="gs2build/src/txt2db" revision="${branch.revision}" />
    1254 
    1255       <!-- bin -->
    1256       <update dir="gs2build/bin/script" revision="${branch.revision}" />
    1257 
    1258       <!-- mappings -->
    1259       <update dir="gs2build/mappings" revision="${branch.revision}"/>
    1260 
    1261       <!-- etc/packages -->
    1262       <update dir="gs2build/etc/packages" revision="${branch.revision}"/>
    1263      
    1264       <!-- collect -->
    1265       <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/>
    1266 
    1267       <!-- gs2build-extra -->
    1268       <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/>
    1269 
    1270       <!-- indexers -->
    1271       <update dir="gs2build/indexers" revision="${branch.revision}"/>
    1272 
    1273       <!-- single files -->
    1274      
    1275       <!-- some files from lib -->
    1276       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
    1277       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
    1278       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
    1279 
    1280       <!-- some files from etc -->
    1281       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
    1282       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
    1283       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
    1284       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
    1285 
    1286       <!-- some files from the gsdl root directory -->
    1287       <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
    1288       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
    1289       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
    1290       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
    1291       <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
    1292       <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
    1293       <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
    1294       <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
    1295       <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
    1296     </svn>
    1297   </target>
    1298  
    1299   <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nosvn.mode">
    1300     <svn>
    1301       <update dir="${gli.home}" revision="${branch.revision}"/>
    1302     </svn>
     1207        <update dir="${gli.home}" revision="${branch.revision}"/>
     1208    </svn>
    13031209  </target>
    13041210
    13051211  <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled">
    13061212  </target>
    1307   <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nosvn.mode">
    1308     <!-- please keep this function in sync with update-gs2build -->
    1309     <echo>checking out gs2build</echo>
    1310 
    1311     <!-- this has to be created first to avoid errors when trying to export to it later -->
    1312     <mkdir dir="${basedir}/gs2build/lib"/>
    1313 
    1314     <!-- svn checkouts -->
    1315     <svn>
    1316       <!-- perllib -->
    1317       <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/>
    1318 
    1319       <!-- selected packages -->
    1320       <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" />
    1321       <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" />
    1322       <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" />
    1323       <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" />
    1324       <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" />
    1325       <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" />
    1326       <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" />
    1327       <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" />
    1328       <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" />
    1329       <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" />
    1330       <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" />
    1331       <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" />
    1332       <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" />
    1333      
    1334       <!-- some of src (db2txt hashfile phind txt2db) -->
    1335       <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt" revision="${branch.revision}" />
    1336       <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" />
    1337       <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" />
    1338       <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db" revision="${branch.revision}" />
    1339 
    1340       <!-- bin -->
    1341       <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" />
    1342 
    1343       <!-- mappings -->
    1344       <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/>
    1345 
    1346       <!-- etc/packages -->
    1347       <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/>
    1348      
    1349       <!-- collect -->
    1350       <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/>
    1351 
    1352       <!-- gs2build-extra -->
    1353       <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/>
    1354 
    1355       <!-- indexers -->
    1356       <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/>
    1357 
    1358       <!-- single files -->
    1359      
    1360       <!-- some files from lib -->
    1361       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
    1362       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
    1363       <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
    1364 
    1365       <!-- some files from etc -->
    1366       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
    1367       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
    1368       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
    1369       <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
    1370 
    1371       <!-- some files from the gsdl root directory -->
    1372       <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
    1373       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
    1374       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
    1375       <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
    1376       <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
    1377       <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
    1378       <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
    1379       <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
    1380       <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
    1381     </svn>
    1382   </target>
     1213    <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
     1214        <!-- please keep this function in sync with update-gs2build -->
     1215        <echo>checking out gs2build</echo>
     1216
     1217        <!-- this has to be created first to avoid errors when trying to export to it later -->
     1218        <mkdir dir="${basedir}/gs2build/lib"/>
     1219
     1220        <!-- svn checkouts -->
     1221        <svn>
     1222            <!-- perllib -->
     1223            <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/>
     1224
     1225            <!-- selected packages -->
     1226            <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" />
     1227            <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" />
     1228            <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" />
     1229            <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" />
     1230            <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" />
     1231            <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" />
     1232            <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" />
     1233            <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" />
     1234            <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" />
     1235            <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" />
     1236            <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" />
     1237            <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" />
     1238            <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" />
     1239           
     1240            <!-- some of src (db2txt hashfile phind txt2db) -->
     1241            <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt" revision="${branch.revision}" />
     1242            <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" />
     1243            <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" />
     1244            <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db" revision="${branch.revision}" />
     1245
     1246            <!-- bin -->
     1247            <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" />
     1248
     1249            <!-- mappings -->
     1250            <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/>
     1251
     1252            <!-- etc/packages -->
     1253            <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/>
     1254   
     1255            <!-- collect -->
     1256            <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/>
     1257
     1258            <!-- gs2build-extra -->
     1259            <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/>
     1260
     1261            <!-- indexers -->
     1262            <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/>
     1263
     1264            <!-- single files -->
     1265           
     1266            <!-- some files from lib -->
     1267            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
     1268            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
     1269            <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
     1270
     1271            <!-- some files from etc -->
     1272            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
     1273            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
     1274            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
     1275            <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
     1276
     1277            <!-- some files from the gsdl root directory -->
     1278            <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
     1279            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
     1280            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
     1281            <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
     1282            <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
     1283            <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
     1284            <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
     1285            <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
     1286            <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
     1287        </svn>
     1288    </target>
    13831289
    13841290  <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present">
    … …  
    13931299
    13941300  <target name="checkout-winbin" depends="init" if="current.os.iswindows"
    1395     unless="nosvn.mode">
     1301    unless="nocvs.mode">
    13961302    <svn>
    1397       <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/>
    1398     </svn> 
    1399   </target>
    1400 
    1401   <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nosvn.mode">
    1402     <svn>
    1403       <update dir="winbin"/>
    1404     </svn> 
    1405   </target>
     1303        <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/>
     1304    </svn> 
     1305  </target>
     1306
     1307  <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nocvs.mode">
     1308        <svn>
     1309            <update dir="winbin"/>
     1310        </svn> 
     1311    </target>
    14061312 
    14071313  <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows">
    … …  
    14161322  <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows"> 
    14171323    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip"
    1418       dest="${gs2build.home}/packages/windows/gdbm"/>
    1419     <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
    1420       dest="${gs2build.home}/packages/windows/crypt"/>
    1421     <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
    1422       dest="${gs2build.home}/packages/windows/expat"/>
    1423   </target>
     1324    dest="${gs2build.home}/packages/windows/gdbm"/>
     1325   <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
     1326    dest="${gs2build.home}/packages/windows/crypt"/>
     1327       <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
     1328    dest="${gs2build.home}/packages/windows/expat"/>
     1329   </target>
    14241330 
    14251331  <!-- downloads a good XML-Parser -->
    14261332  <target name="get-macos-extra" depends="init" if="need.macos.extra"> 
    1427     <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
     1333      <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
    14281334      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
    14291335      usetimestamp="true"/>
    … …  
    14601366      <filterset>
    14611367    <filter token="gsdlhome" value="${gs2build.home.windows}"/>
    1462       </filterset>
     1368     </filterset>
    14631369    </move> 
    14641370    <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" />
    … …  
    14881394  </target>
    14891395 
    1490   <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nosvn.mode">
     1396<!--  <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> -->
     1397  <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nocvs.mode">
    14911398    <echo>checking out gli</echo>
    14921399    <svn>
    1493       <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/>
    1494     </svn>
    1495   </target>
    1496  
     1400        <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/>
     1401    </svn>
     1402  </target>
     1403   
    14971404  <target name="configure-gs2building" depends="init" if="collection.building.enabled"
    14981405    description="Configure only the Greenstone 2 building components">
    … …  
    15311438    <!-- windows: -->   
    15321439    <!-- run the setup script -->
    1533     <exec executable="${compile.windows.c++.setup}" os="${os.windows}" />
     1440    <!--<exec executable="${compile.windows.c++.setup}" os="${os.windows}" />-->
     1441    <!--Above does not work:
     1442    even though vcvars.bat executes, the env changes it makes don't get saved. Need user to     run vcvars.bat first before calling ant-->
    15341443    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" >
    1535       <arg value="/f"/>
    1536       <arg value="win32.mak"/>
    1537       <arg value="clean"/>
    1538     </exec>
    1539   </target>
    1540  
    1541   <target name="distclean-gs2building" depends="init,clean-gli,clean-gs2build,distclean-gs2build"
    1542     description="Distclean only the Greenstone 2 building components"
    1543     if="collection.building.enabled"/>
    1544 
     1444     <arg value="/f"/>
     1445     <arg value="win32.mak"/>
     1446     <arg value="clean"/>
     1447    </exec>
     1448  </target>
     1449 
    15451450  <target name="distclean-gs2build" depends="init" if="collection.building.enabled">
     1451    <!-- gs2build -->
     1452    <!--linux:  -->
    15461453    <exec executable="make" os="${os.unix}" dir="${gs2build.home}">
    15471454      <arg value="distclean"/>
    15481455    </exec>
     1456    <!-- windows: -->   
    15491457  </target>
    15501458 
    … …  
    15571465    <property name="gli.home" value="${basedir}/gli"/>
    15581466
    1559     <!-- change the version number -->
    1560     <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;"/>
     1467        <!-- change the version number -->
     1468        <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;"/>
    15611469    <!-- linux -->
    15621470    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/>
    1563     <!--remote gli-->
    1564     <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
     1471     <!--remote gli-->
     1472     <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
    15651473      resolveExecutable="true"/>
    15661474    <!-- windows -->
    15671475    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/>
    15681476    <!--remote gli-->
    1569     <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
     1477     <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
    15701478      resolveExecutable="true"/>
    1571     <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
     1479     <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
    15721480  </target>
    15731481 
    … …  
    15811489    </exec>
    15821490    <!-- run the setup script -->
    1583     <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>
     1491    <!--<exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>-->
     1492    <!--Above does not work:
     1493    even though vcvars.bat executes, the env changes it makes don't get saved. Need user to     run vcvars.bat first before calling ant-->
    15841494    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}">
    1585       <arg value="/f"/>
    1586       <arg value="win32.mak"/>
     1495     <arg value="/f"/>
     1496     <arg value="win32.mak"/>
    15871497    </exec>
    15881498    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}">
    1589       <arg value="/f"/>
    1590       <arg value="win32.mak"/>
    1591       <arg value="install"/>
     1499     <arg value="/f"/>
     1500     <arg value="win32.mak"/>
     1501     <arg value="install"/>
    15921502    </exec>
    15931503    <!-- LuceneWrapper jar file not installed by default -->
    … …  
    16231533    </echo>
    16241534  </target>
    1625   
    1626 
    1627   <!-- ======================== TESTING Targets ========================= -->
     1535 
     1536
     1537<!-- ======================== TESTING Targets ========================= -->
    16281538 
    16291539  <target name="test" description="Run the (incomplete) JUnit test suite "
    … …  
    16481558    <echo>
    16491559      *********************************************
    1650       Test output can be found in directory 'test'
     1560       Test output can be found in directory 'test'
    16511561      *********************************************
    16521562    </echo>
    16531563  </target>
    1654 
    1655   <!-- ======================== FLAX Targets ========================= -->
    16561564  <target name="prepare-flax" description="check out flax source code from another repository" if="install.flax">
    16571565    <echo>checking out flax ...</echo>
    16581566    <mkdir dir="${basedir}/src/java/org/flax"/>
    16591567    <mkdir dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
    1660     <mkdir dir="${web.home}/WEB-INF/classes/flax"/>
    1661     <mkdir dir="${web.home}/interfaces/flax"/>
    1662     <mkdir dir="${web.home}/sites/flax"/>
     1568    <mkdir dir="${basedir}/web/WEB-INF/classes/flax"/>
     1569    <mkdir dir="${basedir}/web/interfaces/flax"/>
     1570    <mkdir dir="${basedir}/web/sites/flax"/>
    16631571    <mkdir dir="${basedir}/flax-resources"/>
    16641572    <mkdir dir="${basedir}/flax-lib"/>
    16651573    <svn>
    16661574      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/" 
    1667     destPath="${basedir}/src/java/org/flax"/>
     1575                destPath="${basedir}/src/java/org/flax"/>
    16681576      <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/greenstone/gsdl3/flax/"
    1669     destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
     1577                destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
    16701578      <checkout url="${flax.svn.root}/flax1.0/trunk/web/WEB-INF/classes/flax/"
    1671     destPath="${web.home}/WEB-INF/classes/flax"/>
     1579                destPath="${basedir}/web/WEB-INF/classes/flax"/>
    16721580      <checkout url="${flax.svn.root}/flax1.0/trunk/web/interfaces/flax/"
    1673     destPath="${web.home}/interfaces/flax"/>
     1581                destPath="${basedir}/web/interfaces/flax"/>
    16741582      <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/"
    1675     destPath="${web.home}/sites/flax"/>
     1583                destPath="${basedir}/web/sites/flax"/>
    16761584      <checkout url="${flax.svn.root}/flax1.0/trunk/flax-resources"
    1677     destPath="${basedir}/flax-resources"/>
     1585                destPath="${basedir}/flax-resources"/>
    16781586      <checkout url="${flax.svn.root}/flax1.0/trunk/lib"
    1679     destPath="${basedir}/flax-lib"/>
     1587                destPath="${basedir}/flax-lib"/>
    16801588    </svn>
    1681     <echo>prepare flax files...</echo>
    1682     <move file="${web.home}/WEB-INF/web.xml" tofile="${web.home}/WEB-INF/web.xml.greenstone3backup"/>
     1589     <echo>prepare flax files...</echo>
     1590    <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/>
    16831591    <antcall target="flax-copy-files" />
    16841592    <antcall target="unzip-flax-collections" />
    16851593    <antcall target="unzip-flax-resources" />
    1686   </target>
     1594   </target>
    16871595
    16881596  <target name="update-flax" description="update flax from repository">
    1689     <echo>updating flax ...</echo>
    1690     <svn>
    1691       <update dir="${basedir}/src/java/org/flax"/>
    1692       <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
    1693       <update dir="${web.home}/WEB-INF/classes/flax"/>
    1694       <update dir="${web.home}/interfaces/flax"/>
    1695       <update dir="${web.home}/sites/flax"/>
    1696     </svn>
    1697     <antcall target="flax-copy-files" />
     1597      <echo>updating flax ...</echo>
     1598      <svn>
     1599        <update dir="${basedir}/src/java/org/flax"/>
     1600        <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
     1601        <update dir="${basedir}/web/WEB-INF/classes/flax"/>
     1602        <update dir="${basedir}/web/interfaces/flax"/>
     1603        <update dir="${basedir}/web/sites/flax"/>
     1604      </svn>
     1605     <antcall target="flax-copy-files" />
    16981606    <antcall target="unzip-flax-collections" />       
    1699   </target>
    1700 
    1701   <target name="unzip-flax-collections" >
    1702     <property name="coll.dir" value="${web.home}/sites/flax/collect"/>
     1607   </target>
     1608
     1609   <target name="unzip-flax-collections" >
     1610    <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/>
    17031611    <unzip dest="${coll.dir}"> 
    17041612      <fileset dir="${coll.dir}">
    17051613    <include name="*.zip"/>
    1706       </fileset>   
     1614       </fileset>   
    17071615    </unzip>   
    17081616    <delete>
    … …  
    17111619  </target>
    17121620
    1713   <target name="unzip-flax-resources" >
    1714     <property name="classes.dir" value="${web.home}/WEB-INF/classes/flax"/>
     1621 <target name="unzip-flax-resources" >
     1622    <property name="classes.dir" value="${basedir}/web//WEB-INF/classes/flax"/>
    17151623    <unzip dest="${classes.dir}"> 
    17161624      <fileset dir="${classes.dir}">
    17171625    <include name="*.zip"/>
    1718       </fileset>   
     1626       </fileset>   
    17191627    </unzip>   
    17201628    <delete>
    … …  
    17221630    </delete>
    17231631  </target>
    1724  
    1725   <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
    1726     <echo>copying flax files ...</echo>
    1727     <copy file="${web.home}/WEB-INF/classes/flax/web.xml" todir="${web.home}/WEB-INF" overwrite="true" />
    1728     <!-- A configuration file containing web service binding information for the axis engine -->
    1729     <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" />
    1730     <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" />
    1731     <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${web.home}/WEB-INF/lib" overwrite="true" />   
    1732   </target>
    1733 
    1734 
    1735   <!-- ======================== GDBM Targets ========================= -->
    1736 
     1632   
     1633   <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
     1634      <echo>copying flax files ...</echo>
     1635      <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" overwrite="true" />
     1636      <!-- A configuration file containing web service binding information for the axis engine -->
     1637           <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" />
     1638           <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" />
     1639           <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${basedir}/web/WEB-INF/lib" overwrite="true" />   
     1640   </target>
     1641      <!--install gdbm stuff -->
     1642
     1643  <!-- downloads the gdbm library -->
    17371644  <target name="prepare-gdbm" depends="init" if="install.gdbm">
    1738     <get src="http://www.greenstone.org/gs3files/${gdbm.version}.tar.gz"
    1739       dest="${src.packages.home}/${gdbm.version}.tar.gz"  usetimestamp="true"/>
    1740     <untar compression= "gzip" src="${src.packages.home}/${gdbm.version}.tar.gz" dest="${src.packages.home}" /> 
    1741     <chmod dir="${src.packages.home}/${gdbm.version}" perm="ugo+wrx" includes="**" />
    1742     <antcall target="configure-gdbm" />
    1743     <antcall target="compile-gdbm" />
     1645      <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz"
     1646       dest="${src.packages.home}/gdbm-1.8.3.tar.gz"  usetimestamp="true"/>
     1647      <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" /> 
     1648      <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" />
     1649      <antcall target="configure-gdbm" />
     1650      <antcall target="compile-gdbm" />
    17441651  </target> 
    17451652
    1746   <target name="configure-gdbm" if="install.gdbm">
     1653   <target name="configure-gdbm" if="install.gdbm">
    17471654    <echo>
    17481655      Configuring GDBM
    … …  
    17521659      <arg value="--prefix=${gdbm.home}"/>
    17531660    </exec>   
    1754   </target>
    1755 
    1756   <target name="clean-gdbm" depends="init"  if="install.gdbm">   
     1661   </target>
     1662
     1663 <target name="clean-gdbm" depends="init"  if="install.gdbm">   
    17571664    <echo>clean GDBM</echo>
    1758     <exec executable="make" os="${os.unix}" dir="${gdbm.home}" >
    1759       <arg value="clean"/>
    1760     </exec>
    1761   </target>
    1762 
    1763   <target name="distclean-gdbm" depends="init"  if="install.gdbm">   
    1764     <echo>distclean GDBM</echo>
    1765     <exec executable="make" os="${os.unix}" dir="${gdbm.home}" >
    1766       <arg value="distclean"/>
     1665    <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}" >
     1666     <arg value="clean"/>
    17671667    </exec>
    17681668  </target>
    … …  
    17701670  <target name="compile-gdbm" depends="init"  if="install.gdbm">   
    17711671    <echo>compile GDBM</echo>
    1772     <exec executable="make" os="${os.unix}" dir="${gdbm.home}"/>
    1773     <exec executable="make" os="${os.unix}" dir="${gdbm.home}">
     1672    <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}"/>
     1673    <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}">
    17741674      <arg value="install"/>
    17751675    </exec>
    17761676  </target>
    17771677
     1678
     1679
    17781680</project>
    17791681
Note: See TracChangeset for help on using the changeset viewer.