Index: /greenstone3/trunk/build.xml
===================================================================
--- /greenstone3/trunk/build.xml	(revision 15182)
+++ /greenstone3/trunk/build.xml	(revision 15183)
@@ -9,22 +9,22 @@
 <project name="greenstone3" default="usage" basedir=".">
 
-	<!-- ============ classpath =================== -->
-	<path id="project.classpath">
-	   <fileset dir="lib/java">
-	      <include name="**/*.jar"/>
-	   </fileset>
-	</path>
-
-	<!-- ============ self defined tasks =================== -->
-	<taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpathref="project.classpath"/>
-	<taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpathref="project.classpath"/>
-	<taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/>
-	<taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
-	<taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/>
-	<taskdef name="try" classname="ise.antelope.tasks.TryTask" classpathref="project.classpath"/>
-
-<!-- ===================== Property Definitions =========================== -->
-
-<!--
+  <!-- ============ classpath =================== -->
+  <path id="project.classpath">
+    <fileset dir="lib/java">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+  
+  <!-- ============ self defined tasks =================== -->
+  <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpathref="project.classpath"/>
+  <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpathref="project.classpath"/>
+  <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/>
+  <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
+  <taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/>
+  <taskdef name="try" classname="ise.antelope.tasks.TryTask" classpathref="project.classpath"/>
+  
+  <!-- ===================== Property Definitions =========================== -->
+  
+  <!--
 
   Each of the following properties are used in the build script.
@@ -35,8 +35,8 @@
 
   * Definitions from a "build.properties" file in the top level
-    source directory of this application.
+  source directory of this application.
 
   * Definitions from a "build.properties" file in the user's
-    home directory.
+  home directory.
 
   * Default definitions in this build.xml file.
@@ -48,5 +48,5 @@
   "build.properties" files as well as in the "build.xml" script.
 
--->
+  -->
 
   <!--the first two properties have to be put on the top to be used by build.properties-->
@@ -75,5 +75,5 @@
   <!-- jni libraries and java wrappers go here -->
   <property name="lib.jni" value="${basedir}/lib/jni"/>
-    
+  
   <property name="javadocs" value="${basedir}/docs/javadoc"/>
 
@@ -155,11 +155,11 @@
   </condition>
 
-	<!-- where is search4j tool -->
-	<condition property="search4j.exec" value="bin/search4j.exe"> 
-		<isset property="current.os.iswindows"/>
+  <!-- where is search4j tool -->
+  <condition property="search4j.exec" value="bin/search4j.exe"> 
+    <isset property="current.os.iswindows"/>
   </condition>
   <property name="search4j.exec" value="bin/search4j"/>
 
-    
+  
   <!-- ============= Base dirs for each package and component ============ -->
   <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/>
@@ -169,5 +169,5 @@
   <property name="gli.home" value="${basedir}/gli"/>
   <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
- 
+  
   <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">-->
   <condition property="indexers.home" value="${basedir}/src/packages/indexers">
@@ -185,7 +185,7 @@
 
 
-<!--  ==================== Compilation Control Options ==================== -->
-
-<!--
+  <!--  ==================== Compilation Control Options ==================== -->
+
+  <!--
 
   These properties control option settings on the Javac compiler when it
@@ -198,5 +198,5 @@
   compile.optimize     Should compilation include the optimize option?
 
--->
+  -->
 
   <property name="compile.debug"       value="true"/>
@@ -204,5 +204,5 @@
   <property name="compile.optimize"    value="true"/>
 
-<!--
+  <!--
 
   Rather than relying on the CLASSPATH environment variable, Ant includes
@@ -213,5 +213,5 @@
   that you explicitly added.
 
--->
+  -->
 
   <path id="compile.classpath">
@@ -229,6 +229,6 @@
     <!-- Include the axis jar files -->
     <!--<fileset dir="${basedir}/comms/soap/axis/lib">
-      <include name="*.jar"/>
-    </fileset>-->
+    <include name="*.jar"/>
+  </fileset>-->
     
     <!-- include the jar files from the source packages -->
@@ -277,5 +277,5 @@
     <echo>os.unix: ${os.unix}</echo>
   </target>
-<!-- ==================== Primary and Global Targets ============================= -->
+  <!-- ==================== Primary and Global Targets ============================= -->
 
   <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
@@ -283,5 +283,5 @@
   <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"
     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.">
-<!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
+    <!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
     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.">-->
 
@@ -295,6 +295,6 @@
     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
   
-<!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
-    description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>-->
+  <!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
+  description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>-->
   <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web"
     description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/>
@@ -312,5 +312,5 @@
   <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
     description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
-    
+  
   <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile" 
     description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile."/>
@@ -318,9 +318,9 @@
   <target name="start" depends="init,start-tomcat"
     description="Startup the Tomcat server." >
-	<echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> 
-  	<echo>Tomcat:	${catalina.home}</echo> 
-  	<echo>Java:	${java.home}</echo>
-        <echo>URL:	http://${tomcat.server}:${tomcat.port}${app.path}/</echo>
-        <!-- assuming that index.html is not needed here -->   
+    <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> 
+    <echo>Tomcat:	${catalina.home}</echo> 
+    <echo>Java:	${java.home}</echo>
+    <echo>URL:	http://${tomcat.server}:${tomcat.port}${app.path}/</echo>
+    <!-- assuming that index.html is not needed here -->   
   </target>
 
@@ -331,5 +331,5 @@
 
 
-<!-- =========== Help targets ===================================  -->
+  <!-- =========== Help targets ===================================  -->
   
   <property name="install-command" value="ant [options] prepare install"/>
@@ -339,7 +339,7 @@
     <echo message="  Execute 'ant -help' for Ant help."/>
     <echo>To install Greenstone3, run '${install-command}'. 
-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.
-To log the output, use the '-logfile build.log' option.
-The README.txt file has more information about the ant targets and install process.
+      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.
+      To log the output, use the '-logfile build.log' option.
+      The README.txt file has more information about the ant targets and install process.
     </echo>
   </target>
@@ -351,14 +351,14 @@
   </target>
 
-<!-- ====== initialization and setup targets ================== -->
+  <!-- ====== initialization and setup targets ================== -->
 
   <target name="accept-properties" unless="properties.accepted">
     <input addproperty="properties.ok" validargs="y,n">The following properties (among others) are being used from a build.properties file found in this directory:
-tomcat.server=${tomcat.server}
-tomcat.port=${tomcat.port} 
-tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
-proxy.host=${proxy.host}
-proxy.port=${proxy.port}
-If these are not acceptable, please change them and rerun this target. Continue [y/n]? />
+      tomcat.server=${tomcat.server}
+      tomcat.port=${tomcat.port} 
+      tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
+      proxy.host=${proxy.host}
+      proxy.port=${proxy.port}
+      If these are not acceptable, please change them and rerun this target. Continue [y/n]? />
     </input>
     <condition property="do.abort"> 
@@ -368,14 +368,14 @@
   </target>
 
-<!--  <target name="check-cvsroot">
-    <condition property="svnroot.notset">
-      <or>
-			<not>
-			  <isset property="env.CVSROOT"/>
+  <!--  <target name="check-cvsroot">
+  <condition property="svnroot.notset">
+  <or>
+  <not>
+  <isset property="env.CVSROOT"/>
 			</not>
-			<equals arg1="" arg2="${env.CVSROOT}"/>
+  <equals arg1="" arg2="${env.CVSROOT}"/>
       </or>
     </condition>
-    <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/>
+  <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/>
   </target> -->
 
@@ -405,9 +405,9 @@
     </condition>
     
-      <echo>tomcat.port = ${tomcat.port}</echo>
-      <echo>gli.present = ${gli.present}</echo> 
-      <echo>gs2build.present = ${gs2build.present}</echo>
-      <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo>
-     <!-- gsdl2.installed.path appears not to be set? -->
+    <echo>tomcat.port = ${tomcat.port}</echo>
+    <echo>gli.present = ${gli.present}</echo> 
+    <echo>gs2build.present = ${gs2build.present}</echo>
+    <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo>
+    <!-- gsdl2.installed.path appears not to be set? -->
 
     <condition property="proxy.present">
@@ -440,6 +440,6 @@
     <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
   </target>
-     
- <!-- ========== Web app Targets ================================ -->
+  
+  <!-- ========== Web app Targets ================================ -->
   
   <target name="prepare-web" depends="init,configure-java-version">
@@ -452,49 +452,49 @@
     description="Activates or deactivates some jar libraries as needed depending on your java version">
 
-		<available property="have.xalan.jar" file="${web.lib}/xalan.jar"/>
+    <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/>
     <condition property="need.xalan.jar">
-			<or>
-				<equals arg1="1.5" arg2="${ant.java.version}"/>
-				<equals arg1="1.6" arg2="${ant.java.version}"/>
-			</or>
-		</condition>
-
-		<!-- if they have xalan.jar but dont need it -->
-		<if>
-			<bool>
-				<and>
-					<isset property="have.xalan.jar"/>
-					<not><isset property="need.xalan.jar"/></not>
-				</and>
-			</bool>
-			<antcall target="deactivate-xalan-jar"/>
-		</if>
-
-		<!-- if they need xalan.jar but dont have it -->
-		<if>
-			<bool>
-				<and>
-					<not><isset property="have.xalan.jar"/></not>
-					<isset property="need.xalan.jar"/>
-				</and>
-			</bool>
-			<antcall target="activate-xalan-jar"/>
-		</if>
+      <or>
+	<equals arg1="1.5" arg2="${ant.java.version}"/>
+	<equals arg1="1.6" arg2="${ant.java.version}"/>
+      </or>
+    </condition>
+
+    <!-- if they have xalan.jar but dont need it -->
+    <if>
+      <bool>
+	<and>
+	  <isset property="have.xalan.jar"/>
+	  <not><isset property="need.xalan.jar"/></not>
+	</and>
+      </bool>
+      <antcall target="deactivate-xalan-jar"/>
+    </if>
+
+    <!-- if they need xalan.jar but dont have it -->
+    <if>
+      <bool>
+	<and>
+	  <not><isset property="have.xalan.jar"/></not>
+	  <isset property="need.xalan.jar"/>
+	</and>
+      </bool>
+      <antcall target="activate-xalan-jar"/>
+    </if>
 
   </target>
   
   <target name="activate-xalan-jar">
-		<echo>activating xalan.jar</echo>
+    <echo>activating xalan.jar</echo>
     <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
-		<if><bool><isset property="current.os.ismac"/></bool>
-			<copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/> 
-		</if>
-  </target>
-
-	<!-- to delete -->
+    <if><bool><isset property="current.os.ismac"/></bool>
+      <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/> 
+    </if>
+  </target>
+
+  <!-- to delete -->
   <target name="copy-xalan-for-mac"></target>
 
   <target name="deactivate-xalan-jar">
-		<echo>deactivating xalan.jar</echo>
+    <echo>deactivating xalan.jar</echo>
     <delete file="${web.lib}/xalan.jar"/>
   </target>
@@ -557,9 +557,9 @@
   </target>
 
-	<target name="svnupdate-web" unless="nosvn.mode">
-		<svn>
-			<update dir="${web.home}"/>
-		</svn>
-	</target>
+  <target name="svnupdate-web" unless="nosvn.mode">
+    <svn>
+      <update dir="${web.home}"/>
+    </svn>
+  </target>
 
   <target name="update-web" depends="init,svnupdate-web,configure-web"
@@ -567,5 +567,5 @@
 
 
-<!-- ======================= Tomcat Targets ========================== -->
+  <!-- ======================= Tomcat Targets ========================== -->
   
   <!-- this target downloads and installs Tomcat -->
@@ -623,7 +623,7 @@
     <!-- need to edit the config file, or do we get the user to do this???-->
   </target>
-    
+  
   <target name="start-tomcat" description="Startup only Tomcat" depends="init,configure-java-version" if="tomcat.islocal">
-   <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
+    <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
     <property name="tomcat.path" refid="local.tomcat.path"/>
     <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
@@ -692,5 +692,5 @@
 
 
-<!-- ======================= ant Targets ============================ --> 
+  <!-- ======================= ant Targets ============================ --> 
   <target name="prepare-ant" depends="init">
     <get src="http://www.greenstone.org/gs3files/apache-ant-1.7.0-bin.zip"
@@ -704,5 +704,5 @@
   </target>
 
-<!-- ======================= Axis Targets ============================ --> 
+  <!-- ======================= Axis Targets ============================ --> 
 
   <target name="prepare-axis" depends="init">
@@ -784,5 +784,5 @@
       </and>
     </condition>
-   </target> 
+  </target> 
 
   <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files" 
@@ -793,5 +793,5 @@
       tofile="${basedir}/resources/soap/${axis.sitename}.wsdd"
       filtering="true"/>
-     <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template"
+    <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template"
       tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"
       filtering="true"/>
@@ -812,14 +812,14 @@
     <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" />
   </target>
-    
-
-<!-- ====================== Core targets ============================== -->
-<!-- core targets refer to the core gsdl3 java src -->
+  
+
+  <!-- ====================== Core targets ============================== -->
+  <!-- core targets refer to the core gsdl3 java src -->
   
   <target name="prepare-core" unless="nocvs.mode">
     <!-- just get rid of empty directories-->
     <svn>
-		<update dir="."/>
-	</svn>
+      <update dir="."/>
+    </svn>
   </target>
   
@@ -831,18 +831,18 @@
   <target name="svnupdate-core" unless="nocvs.mode">
 
-	<svn>
-		<update dir="." recurse="false"/>
-	</svn>
-
-   <svn>
-		<update dir="bin"/>
-		<update dir="comms"/>
-		<update dir="dist-resources"/>
-		<update dir="docs"/>
-		<update dir="lib"/>
-		<update dir="resources"/>
-		<update dir="src"/>
-		<update dir="winutil"/>
-	</svn>
+    <svn>
+      <update dir="." recurse="false"/>
+    </svn>
+
+    <svn>
+      <update dir="bin"/>
+      <update dir="comms"/>
+      <update dir="dist-resources"/>
+      <update dir="docs"/>
+      <update dir="lib"/>
+      <update dir="resources"/>
+      <update dir="src"/>
+      <update dir="winutil"/>
+    </svn>
 
   </target>
@@ -853,5 +853,5 @@
   </target>
 
-   <target name="compile-core" depends="init" 
+  <target name="compile-core" depends="init" 
     description="Compile only the Greenstone core">
     <mkdir dir="${build.home}"/>
@@ -887,5 +887,5 @@
       </manifest>
     </jar>
-      
+    
     <jar destfile="${build.home}/phind.jar">
       <fileset dir="${build.home}">
@@ -930,6 +930,6 @@
     <copy file="${build.home}/server.jar" todir="${basedir}"/>
   </target>
- 
-<!-- ================== Packages targets ================================ -->
+  
+  <!-- ================== Packages targets ================================ -->
   <!-- these targets refer to the greenstone source packages - these need 
   updating less often, so are in  separate targets to the core -->
@@ -937,8 +937,8 @@
   
   <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nocvs.mode">
-<!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> -->
+    <!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> -->
     <svn>
-		<checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/>
-	</svn>
+      <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/>
+    </svn>
   </target>
   
@@ -951,7 +951,7 @@
 
   <target name="svnupdate-packages" unless="nocvs.mode"> 
-   <svn>
-		<update dir="${src.packages.home}"/>
-	</svn>
+    <svn>
+      <update dir="${src.packages.home}"/>
+    </svn>
   </target>
   
@@ -972,20 +972,20 @@
       <arg value="--prefix=${basedir}"/>
       <arg value="--libdir=${lib.jni}"/>
-     <arg value="--with-gdbm=${gdbm.installed.path}"/>
+      <arg value="--with-gdbm=${gdbm.installed.path}"/>
     </exec>    
   </target>
 
-<!-- Message from oran. I removed the condition from this line becuase it meant
-	the indexers would only be configured if collection building was DISabled.
-	Shouldn't they be configured when collection building is ENabled? -->
-
-<!--	<target name="configure-indexers" depends="init" if="independent-indexers"> -->
-<target name="configure-indexers" depends="init">
-		<echo>Configuring Indexers</echo>
-		<exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}">
-			<arg value="--prefix=${basedir}"/>
-			<arg value="--libdir=${lib.jni}"/>
-		</exec>          
-	</target>
+  <!-- Message from oran. I removed the condition from this line becuase it meant
+  the indexers would only be configured if collection building was DISabled.
+  Shouldn't they be configured when collection building is ENabled? -->
+
+  <!--	<target name="configure-indexers" depends="init" if="independent-indexers"> -->
+  <target name="configure-indexers" depends="init">
+    <echo>Configuring Indexers</echo>
+    <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}">
+      <arg value="--prefix=${basedir}"/>
+      <arg value="--libdir=${lib.jni}"/>
+    </exec>          
+  </target>
 
   <target name="clean-packages" depends="init,clean-javagdbm,clean-indexers" description="Clean only the packages"/>
@@ -1004,84 +1004,84 @@
     </exec>
     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}"
-       dir="${indexers.home}">
-       <arg value="clean"/>
-    </exec>
-
-  </target>
-   
-	<target name="compile-packages" description="Compile only the source packages">
-         
-		<!-- javagdbm -->
-		<echo>compile javagdbm</echo>
-		<exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/>
-		<exec executable="make" os="${os.unix}" dir="${javagdbm.home}">
-			<arg value="install"/>
-		</exec>
-
-		<!-- windows: just the java stuff. -->
-		<echo>Windows: compile javagdbm (java only)</echo>
-		<exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}">
-			<arg value="compile"/>
-			<arg value="javaonly"/>
-		</exec>
-
-		<!-- install the jar file -->
-		<echo>Install the javagdbm jar file</echo>
-		<copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
-
-		<!-- Indexers -->
-
-		<!-- this may be in gs2build - we will be recompiling, but never mind -->
-		<echo>Indexers: make (from ${indexers.home})</echo>
-		<exec executable="make" os="${os.unix}" dir="${indexers.home}"/>
-		<echo>Indexers: make install</echo>
-		<exec executable="make" os="${os.unix}" dir="${indexers.home}">
-			<arg value="install"/>
-		</exec>
-
-		<echo>Indexers: make</echo>
-		<exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
-			<arg value="all"/>
-		</exec>
-		<echo>Indexers: make install</echo>
-		<exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
-			<arg value="install"/>
-		</exec>
-
-		<!-- install the jar and jni files -->
-		<echo>Install the indexers' jar and jni files</echo>
-		<copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
-		<copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
-		<copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
-		<antcall target="install-jni-files"/>
-	</target>
+      dir="${indexers.home}">
+      <arg value="clean"/>
+    </exec>
+
+  </target>
+  
+  <target name="compile-packages" description="Compile only the source packages">
+    
+    <!-- javagdbm -->
+    <echo>compile javagdbm</echo>
+    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/>
+    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}">
+      <arg value="install"/>
+    </exec>
+
+    <!-- windows: just the java stuff. -->
+    <echo>Windows: compile javagdbm (java only)</echo>
+    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}">
+      <arg value="compile"/>
+      <arg value="javaonly"/>
+    </exec>
+
+    <!-- install the jar file -->
+    <echo>Install the javagdbm jar file</echo>
+    <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
+
+    <!-- Indexers -->
+
+    <!-- this may be in gs2build - we will be recompiling, but never mind -->
+    <echo>Indexers: make (from ${indexers.home})</echo>
+    <exec executable="make" os="${os.unix}" dir="${indexers.home}"/>
+    <echo>Indexers: make install</echo>
+    <exec executable="make" os="${os.unix}" dir="${indexers.home}">
+      <arg value="install"/>
+    </exec>
+
+    <echo>Indexers: make</echo>
+    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
+      <arg value="all"/>
+    </exec>
+    <echo>Indexers: make install</echo>
+    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}">
+      <arg value="install"/>
+    </exec>
+
+    <!-- install the jar and jni files -->
+    <echo>Install the indexers' jar and jni files</echo>
+    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
+    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
+    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
+    <antcall target="install-jni-files"/>
+  </target>
 
   <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/>
 
-    <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
+  <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">
     <copy file="${mg.home}/jni/libmgretrievejni.so" todir="${lib.jni}"/>
     <copy file="${mg.home}/jni/libmgsearchjni.so" todir="${lib.jni}"/>
-     <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
+    <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/jni/libmgppretrievejni.so" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/jni/libmgppsearchjni.so" todir="${lib.jni}"/>
-     <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
-   </target>
-   <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">
+    <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
+  </target>
+  <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">
     <copy file="${mg.home}/jni/mgretrievejni.dll" todir="${lib.jni}"/>
     <copy file="${mg.home}/jni/mgsearchjni.dll" todir="${lib.jni}"/>
-     <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>
+    <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/jni/mgppretrievejni.dll" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/jni/mgppsearchjni.dll" todir="${lib.jni}"/>
-     <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>
-   </target>
-   <target name="install-jni-files-macos" depends="init" if="current.os.ismac">
+    <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>
+  </target>
+  <target name="install-jni-files-macos" depends="init" if="current.os.ismac">
     <copy file="${mg.home}/jni/libmgretrievejni.jnilib" todir="${lib.jni}"/>
     <copy file="${mg.home}/jni/libmgsearchjni.jnilib" todir="${lib.jni}"/>
-     <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>
+    <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/jni/libmgppretrievejni.jnilib" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/jni/libmgppsearchjni.jnilib" todir="${lib.jni}"/>
-     <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
-   </target>
- 
+    <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>
+  </target>
+  
   <!-- ================== gs2building targets ===============-->
 
@@ -1095,161 +1095,161 @@
 
   <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nocvs.mode">
-		<!-- please keep this function in sync with checkout-gs2build -->
-
-		<echo>updating gs2build</echo>
-		<!-- svn updates -->
-		<svn>
-			<!-- perllib -->
-			<update dir="gs2build/perllib" revision="${branch.revision}"/>
-
-			<!-- selected packages -->
-			<update dir="gs2build/packages/cpan" revision="${branch.revision}" />
-			<update dir="gs2build/packages/expat" revision="${branch.revision}" />
-			<update dir="gs2build/packages/html-tidy" revision="${branch.revision}" />
-			<update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" />
-			<update dir="gs2build/packages/kea" revision="${branch.revision}" />
-			<update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" />
-			<update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" />
-			<update dir="gs2build/packages/w3mir" revision="${branch.revision}" />
-			<update dir="gs2build/packages/wget" revision="${branch.revision}" />
-			<update dir="gs2build/packages/windows" revision="${branch.revision}" />
-			<update dir="gs2build/packages/wv" revision="${branch.revision}" />
-			<update dir="gs2build/packages/xlhtml" revision="${branch.revision}" />
-			<update dir="gs2build/packages/yaz" revision="${branch.revision}" />
-			
-			<!-- some of src (db2txt hashfile phind txt2db) -->
-			<update dir="gs2build/src/db2txt" revision="${branch.revision}" />
-			<update dir="gs2build/src/hashfile" revision="${branch.revision}" />
-			<update dir="gs2build/src/phind" revision="${branch.revision}" />
-			<update dir="gs2build/src/txt2db" revision="${branch.revision}" />
-
-			<!-- bin -->
-			<update dir="gs2build/bin/script" revision="${branch.revision}" />
-
-			<!-- mappings -->
-			<update dir="gs2build/mappings" revision="${branch.revision}"/>
-
-			<!-- etc/packages -->
-			<update dir="gs2build/etc/packages" revision="${branch.revision}"/>
-	
-			<!-- collect -->
-			<update dir="gs2build/collect/modelcol" revision="${branch.revision}"/>
-
-			<!-- gs2build-extra -->
-			<update dir="gs2build/gs2build-extra" revision="${branch.revision}"/>
-
-			<!-- indexers -->
-			<update dir="gs2build/indexers" revision="${branch.revision}"/>
-
-			<!-- single files -->
-			
-			<!-- some files from lib -->
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
-
-			<!-- some files from etc -->
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
-
-			<!-- some files from the gsdl root directory -->
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
-		</svn>
+    <!-- please keep this function in sync with checkout-gs2build -->
+
+    <echo>updating gs2build</echo>
+    <!-- svn updates -->
+    <svn>
+      <!-- perllib -->
+      <update dir="gs2build/perllib" revision="${branch.revision}"/>
+
+      <!-- selected packages -->
+      <update dir="gs2build/packages/cpan" revision="${branch.revision}" />
+      <update dir="gs2build/packages/expat" revision="${branch.revision}" />
+      <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" />
+      <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" />
+      <update dir="gs2build/packages/kea" revision="${branch.revision}" />
+      <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" />
+      <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" />
+      <update dir="gs2build/packages/w3mir" revision="${branch.revision}" />
+      <update dir="gs2build/packages/wget" revision="${branch.revision}" />
+      <update dir="gs2build/packages/windows" revision="${branch.revision}" />
+      <update dir="gs2build/packages/wv" revision="${branch.revision}" />
+      <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" />
+      <update dir="gs2build/packages/yaz" revision="${branch.revision}" />
+      
+      <!-- some of src (db2txt hashfile phind txt2db) -->
+      <update dir="gs2build/src/db2txt" revision="${branch.revision}" />
+      <update dir="gs2build/src/hashfile" revision="${branch.revision}" />
+      <update dir="gs2build/src/phind" revision="${branch.revision}" />
+      <update dir="gs2build/src/txt2db" revision="${branch.revision}" />
+
+      <!-- bin -->
+      <update dir="gs2build/bin/script" revision="${branch.revision}" />
+
+      <!-- mappings -->
+      <update dir="gs2build/mappings" revision="${branch.revision}"/>
+
+      <!-- etc/packages -->
+      <update dir="gs2build/etc/packages" revision="${branch.revision}"/>
+      
+      <!-- collect -->
+      <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/>
+
+      <!-- gs2build-extra -->
+      <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/>
+
+      <!-- indexers -->
+      <update dir="gs2build/indexers" revision="${branch.revision}"/>
+
+      <!-- single files -->
+      
+      <!-- some files from lib -->
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
+
+      <!-- some files from etc -->
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
+
+      <!-- some files from the gsdl root directory -->
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
+    </svn>
   </target>
   
   <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nocvs.mode">
     <svn>
-		<update dir="${gli.home}" revision="${branch.revision}"/>
-	</svn>
+      <update dir="${gli.home}" revision="${branch.revision}"/>
+    </svn>
   </target>
 
   <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled">
   </target>
-	<target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
-		<!-- please keep this function in sync with update-gs2build -->
-		<echo>checking out gs2build</echo>
-
-		<!-- this has to be created first to avoid errors when trying to export to it later -->
-		<mkdir dir="${basedir}/gs2build/lib"/>
-
-		<!-- svn checkouts -->
-		<svn>
-			<!-- perllib -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/>
-
-			<!-- selected packages -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" />
-			
-			<!-- some of src (db2txt hashfile phind txt2db) -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" />
-			<checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db" revision="${branch.revision}" />
-
-			<!-- bin -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" />
-
-			<!-- mappings -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/>
-
-			<!-- etc/packages -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/>
-	
-			<!-- collect -->
-			<checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/>
-
-			<!-- gs2build-extra -->
-			<checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/>
-
-			<!-- indexers -->
-			<checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/>
-
-			<!-- single files -->
-			
-			<!-- some files from lib -->
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
-
-			<!-- some files from etc -->
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
-
-			<!-- some files from the gsdl root directory -->
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
-			<export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
-		</svn>
-	</target>
+  <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
+    <!-- please keep this function in sync with update-gs2build -->
+    <echo>checking out gs2build</echo>
+
+    <!-- this has to be created first to avoid errors when trying to export to it later -->
+    <mkdir dir="${basedir}/gs2build/lib"/>
+
+    <!-- svn checkouts -->
+    <svn>
+      <!-- perllib -->
+      <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/>
+
+      <!-- selected packages -->
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" />
+      
+      <!-- some of src (db2txt hashfile phind txt2db) -->
+      <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" />
+      <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db" revision="${branch.revision}" />
+
+      <!-- bin -->
+      <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" />
+
+      <!-- mappings -->
+      <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/>
+
+      <!-- etc/packages -->
+      <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/>
+      
+      <!-- collect -->
+      <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/>
+
+      <!-- gs2build-extra -->
+      <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/>
+
+      <!-- indexers -->
+      <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/>
+
+      <!-- single files -->
+      
+      <!-- some files from lib -->
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/>
+
+      <!-- some files from etc -->
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/>
+
+      <!-- some files from the gsdl root directory -->
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/>
+      <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/>
+    </svn>
+  </target>
 
   <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present">
@@ -1266,13 +1266,13 @@
     unless="nocvs.mode">
     <svn>
-		<checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/>
-	</svn>	
+      <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/>
+    </svn>	
   </target>
 
   <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nocvs.mode">
-		<svn>
-			<update dir="winbin"/>
-		</svn>	
-	</target>
+    <svn>
+      <update dir="winbin"/>
+    </svn>	
+  </target>
   
   <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows">
@@ -1287,14 +1287,14 @@
   <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows">  
     <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip"
-    dest="${gs2build.home}/packages/windows/gdbm"/>
-   <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
-    dest="${gs2build.home}/packages/windows/crypt"/>
-       <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
-    dest="${gs2build.home}/packages/windows/expat"/>
-   </target>
+      dest="${gs2build.home}/packages/windows/gdbm"/>
+    <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
+      dest="${gs2build.home}/packages/windows/crypt"/>
+    <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
+      dest="${gs2build.home}/packages/windows/expat"/>
+  </target>
   
   <!-- downloads a good XML-Parser -->
   <target name="get-macos-extra" depends="init" if="need.macos.extra">	
-      <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
+    <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
       dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
       usetimestamp="true"/>
@@ -1331,5 +1331,5 @@
       <filterset>
 	<filter token="gsdlhome" value="${gs2build.home.windows}"/>
-     </filterset>
+      </filterset>
     </move>  
     <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" />
@@ -1359,12 +1359,12 @@
   </target>
   
-<!--  <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> -->
+  <!--  <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> -->
   <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nocvs.mode">
     <echo>checking out gli</echo>
     <svn>
-		<checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/>
-	</svn>
-  </target>
-    
+      <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/>
+    </svn>
+  </target>
+  
   <target name="configure-gs2building" depends="init" if="collection.building.enabled"
     description="Configure only the Greenstone 2 building components">
@@ -1405,7 +1405,7 @@
     <exec executable="${compile.windows.c++.setup}" os="${os.windows}" />
     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" >
-     <arg value="/f"/>
-     <arg value="win32.mak"/>
-     <arg value="clean"/>
+      <arg value="/f"/>
+      <arg value="win32.mak"/>
+      <arg value="clean"/>
     </exec>
   </target>
@@ -1428,17 +1428,17 @@
     <property name="gli.home" value="${basedir}/gli"/>
 
-		<!-- change the version number -->
-		<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;"/>
+    <!-- change the version number -->
+    <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;"/>
     <!-- linux -->
     <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/>
-     <!--remote gli-->
-     <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
+    <!--remote gli-->
+    <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"
       resolveExecutable="true"/>
     <!-- windows -->
     <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/>
     <!--remote gli-->
-     <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
+    <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"
       resolveExecutable="true"/> 
-     <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
+    <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />
   </target>
   
@@ -1454,11 +1454,11 @@
     <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>
     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}">
-     <arg value="/f"/>
-     <arg value="win32.mak"/>
+      <arg value="/f"/>
+      <arg value="win32.mak"/>
     </exec>
     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}">
-     <arg value="/f"/>
-     <arg value="win32.mak"/>
-     <arg value="install"/>
+      <arg value="/f"/>
+      <arg value="win32.mak"/>
+      <arg value="install"/>
     </exec>
     <!-- LuceneWrapper jar file not installed by default -->
@@ -1494,7 +1494,7 @@
     </echo>
   </target>
- 
-
-<!-- ======================== TESTING Targets ========================= -->
+  
+
+  <!-- ======================== TESTING Targets ========================= -->
   
   <target name="test" description="Run the (incomplete) JUnit test suite "
@@ -1519,5 +1519,5 @@
     <echo>
       *********************************************
-       Test output can be found in directory 'test'
+      Test output can be found in directory 'test'
       *********************************************
     </echo>
@@ -1534,44 +1534,44 @@
     <svn>
       <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/"  
-                destPath="${basedir}/src/java/org/flax"/>
+	destPath="${basedir}/src/java/org/flax"/>
       <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/greenstone/gsdl3/flax/" 
-                destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
+	destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
       <checkout url="${flax.svn.root}/flax1.0/trunk/web/WEB-INF/classes/flax/" 
-                destPath="${basedir}/web/WEB-INF/classes/flax"/>
+	destPath="${basedir}/web/WEB-INF/classes/flax"/>
       <checkout url="${flax.svn.root}/flax1.0/trunk/web/interfaces/flax/" 
-                destPath="${basedir}/web/interfaces/flax"/>
+	destPath="${basedir}/web/interfaces/flax"/>
       <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/" 
-                destPath="${basedir}/web/sites/flax"/>
+	destPath="${basedir}/web/sites/flax"/>
       <checkout url="${flax.svn.root}/flax1.0/trunk/flax-resources"
-                destPath="${basedir}/flax-resources"/>
+	destPath="${basedir}/flax-resources"/>
       <checkout url="${flax.svn.root}/flax1.0/trunk/lib"
-                destPath="${basedir}/flax-lib"/>
+	destPath="${basedir}/flax-lib"/>
     </svn>
-     <echo>prepare flax files...</echo>
+    <echo>prepare flax files...</echo>
     <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/>
     <antcall target="flax-copy-files" />
     <antcall target="unzip-flax-collections" />
     <antcall target="unzip-flax-resources" />
-   </target>
+  </target>
 
   <target name="update-flax" description="update flax from repository">
-	  <echo>updating flax ...</echo>
-	  <svn>
-	    <update dir="${basedir}/src/java/org/flax"/>
-	    <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
-	    <update dir="${basedir}/web/WEB-INF/classes/flax"/>
-	    <update dir="${basedir}/web/interfaces/flax"/>
-	    <update dir="${basedir}/web/sites/flax"/>
-	  </svn>
-     <antcall target="flax-copy-files" />
+    <echo>updating flax ...</echo>
+    <svn>
+      <update dir="${basedir}/src/java/org/flax"/>
+      <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
+      <update dir="${basedir}/web/WEB-INF/classes/flax"/>
+      <update dir="${basedir}/web/interfaces/flax"/>
+      <update dir="${basedir}/web/sites/flax"/>
+    </svn>
+    <antcall target="flax-copy-files" />
     <antcall target="unzip-flax-collections" />       
-   </target>
-
-   <target name="unzip-flax-collections" >
+  </target>
+
+  <target name="unzip-flax-collections" >
     <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/>
     <unzip dest="${coll.dir}">  
       <fileset dir="${coll.dir}">
 	<include name="*.zip"/>
-       </fileset>    
+      </fileset>    
     </unzip>    
     <delete>
@@ -1580,10 +1580,10 @@
   </target>
 
- <target name="unzip-flax-resources" >
+  <target name="unzip-flax-resources" >
     <property name="classes.dir" value="${basedir}/web//WEB-INF/classes/flax"/>
     <unzip dest="${classes.dir}">  
       <fileset dir="${classes.dir}">
 	<include name="*.zip"/>
-       </fileset>    
+      </fileset>    
     </unzip>    
     <delete>
@@ -1591,26 +1591,26 @@
     </delete>
   </target>
-   
-   <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
-	  <echo>copying flax files ...</echo>
-	  <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" overwrite="true" />
-	  <!-- A configuration file containing web service binding information for the axis engine -->
-           <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" />
-           <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" />
-           <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${basedir}/web/WEB-INF/lib" overwrite="true" />    
-   </target>
-      <!--install gdbm stuff -->
+  
+  <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories">
+    <echo>copying flax files ...</echo>
+    <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" overwrite="true" />
+    <!-- A configuration file containing web service binding information for the axis engine -->
+    <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" />
+    <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" />
+    <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${basedir}/web/WEB-INF/lib" overwrite="true" />    
+  </target>
+  <!--install gdbm stuff -->
 
   <!-- downloads the gdbm library -->
   <target name="prepare-gdbm" depends="init" if="install.gdbm">
-      <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz"
-       dest="${src.packages.home}/gdbm-1.8.3.tar.gz"  usetimestamp="true"/>
-      <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" />  
-      <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" />
-      <antcall target="configure-gdbm" />
-      <antcall target="compile-gdbm" /> 
+    <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz"
+      dest="${src.packages.home}/gdbm-1.8.3.tar.gz"  usetimestamp="true"/>
+    <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" />  
+    <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" />
+    <antcall target="configure-gdbm" />
+    <antcall target="compile-gdbm" /> 
   </target>  
 
-   <target name="configure-gdbm" if="install.gdbm">
+  <target name="configure-gdbm" if="install.gdbm">
     <echo>
       Configuring GDBM
@@ -1620,10 +1620,10 @@
       <arg value="--prefix=${gdbm.home}"/>
     </exec>    
-   </target>
-
- <target name="clean-gdbm" depends="init"  if="install.gdbm">   
+  </target>
+
+  <target name="clean-gdbm" depends="init"  if="install.gdbm">   
     <echo>clean GDBM</echo>
     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}" >
-     <arg value="clean"/>
+      <arg value="clean"/>
     </exec>
   </target> 
