Index: /release-kits/wirk2/ant-scripts/build.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/build.xml	(revision 16744)
+++ /release-kits/wirk2/ant-scripts/build.xml	(revision 16745)
@@ -3,8 +3,9 @@
 		.......................................................... 
 		June 2008
-		Wirk2 (Windows Release Kit for Greenstone2)
+		Windows Release Kit for Greenstone2 (wirk2)
 		Oran Fry
 		..........................................................
 -->
+
 <project name="wirk2-build" default="wirk2">
 
@@ -14,8 +15,4 @@
 	<property name="resources.chunksize" value="8388608"/><!-- 8MiB -->
 
-	<!-- set date !AD HOC, CHANGE SOON -->
-	<property name="current.month" value="Jun"/>
-	<property name="current.year" value="2008"/>
-
 	<!-- for the benefit of the shared scripts, set release-kit home -->
 	<property name="rk.home" value="${wirk2.home}" />
@@ -24,4 +21,5 @@
 	<!-- IMPORT OTHER ANT SCRIPTS -->
 	<import file="shared-ant-scripts/init.xml"/>
+	<import file="shared-ant-scripts/operations-on-gli.xml"/>
 	<import file="compile.xml"/>
 	<import file="create-distribution.xml"/>
@@ -31,8 +29,8 @@
 	<!-- THE MAIN TARGET -->
 	<target name="wirk2" depends="init">
-		<addressedcall target="compile"/>
-		<addressedcall target="create-distribution"/>
-		<addressedcall target="create-installer"/>
-		<addressedcall target="wrap"/>
+		<antcall target="compile"/>
+		<antcall target="create-distribution"/>
+		<antcall target="create-installer"/>
+		<antcall target="wrap"/>
 	</target>
 
Index: /release-kits/wirk2/ant-scripts/compile.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/compile.xml	(revision 16744)
+++ /release-kits/wirk2/ant-scripts/compile.xml	(revision 16745)
@@ -3,94 +3,75 @@
 
 	<target name="compile">
-
-		<addressedcall target="checkout-gsdl-gli" />
-		<addressedcall target="set-version-numbers" />
-		<addressedcall target="unzip-packages" />
-		<addressedcall target="get-winbin" />
-		<addressedcall target="insert-perl" />
-		<addressedcall target="compile-c-code" />
-		<addressedcall target="build-demo-collection" />
-		
+		<antcall target="checkout-gsdl-gli" />
+		<antcall target="set-version-numbers" />
+		<antcall target="unzip-packages" />
+		<antcall target="get-winbin" />
+		<antcall target="insert-perl" />
+		<antcall target="compile-c-code" />
+		<antcall target="build-demo-collection" />
 	</target>
 
 	<target name="checkout-gsdl-gli">
-		<if><bool><istrue value="${execute}"/></bool>
-			<svn>
-				<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
-				<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
-			</svn>
-		</if>
+		<svn>
+			<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
+			<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
+		</svn>
 	</target>
 
 	<target name="set-version-numbers">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
-			<rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
-			<rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
-		</if>
+		<rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
+		<rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
+		<rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
 	</target>
 
 	<target name="unzip-packages">
-		<if><bool><istrue value="${execute}"/></bool>
-			<unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/>
-			<unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/>
-			<unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/>
-			<unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/>
-		</if>	
+		<unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/>
+		<unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/>
+		<unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/>
+		<unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/>
 	</target>
 
 	<target name="get-winbin">
-		<if><bool><istrue value="${execute}"/></bool>
-			
-			<if>
-				<bool><not><available file="${basedir}/gsdl/bin/windows"/></not></bool>
-				<svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/gsdl/bin/windows" revision="${branch.revision}"/></svn>
-			</if>
-			
+		<if>
+			<bool><not><available file="${basedir}/gsdl/bin/windows"/></not></bool>
+			<svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/gsdl/bin/windows" revision="${branch.revision}"/></svn>
 		</if>
 	</target>
 
 	<target name="insert-perl">
-		<if><bool><istrue value="${execute}"/></bool>
-			<mkdir dir="${basedir}/gsdl/bin/windows"/>
-			<delete dir="${basedir}/gsdl/bin/windows/perl"/>
-			<unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/gsdl/bin/windows"/>
-		</if>
+		<mkdir dir="${basedir}/gsdl/bin/windows"/>
+		<delete dir="${basedir}/gsdl/bin/windows/perl"/>
+		<unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/gsdl/bin/windows"/>
 	</target>
 	
 	<target name="compile-c-code">
-		<if><bool><istrue value="${execute}"/></bool>
-			<copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
-			<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat"/>
-			
-			<move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
-			<move todir="${basedir}/gsdl/bin/windows">
-				<fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>
-			</move>
-
-		</if>
+		<copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
+		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat" />
+		
+		<move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
+		<move todir="${basedir}/gsdl/bin/windows">
+			<fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>
+		</move>
 	</target>
 	
 	<target name="build-demo-collection">
-		<if><bool><istrue value="${execute}"/></bool>
-			<!-- the envs on these execs simulate the environment when you run setup.bat -->
-			<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
-				<arg line="bin\script\import.pl --removeold demo"/>
-				<env key="GSDLHOME" value="${basedir}/gsdl"/>
-				<env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
-				<env key="GSDLOS" value="windows"/>
-				<env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
-			</exec>
-			<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
-				<arg line="bin\script\buildcol.pl --removeold demo"/>
-				<env key="GSDLHOME" value="${basedir}/gsdl"/>
-				<env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
-				<env key="GSDLOS" value="windows"/>
-				<env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
-			</exec>
-			
-			<delete dir="${basedir}/gsdl/collect/demo/index"/>
-			<move file="${basedir}/gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/>
-		</if>
+		<!-- the envs on these execs simulate the environment when you run setup.bat -->
+		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
+			<arg line="bin\script\import.pl --removeold demo"/>
+			<env key="GSDLHOME" value="${basedir}/gsdl"/>
+			<env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
+			<env key="GSDLOS" value="windows"/>
+			<env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
+		</exec>
+		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
+			<arg line="bin\script\buildcol.pl --removeold demo"/>
+			<env key="GSDLHOME" value="${basedir}/gsdl"/>
+			<env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
+			<env key="GSDLOS" value="windows"/>
+			<env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
+		</exec>
+		
+		<delete dir="${basedir}/gsdl/collect/demo/index"/>
+		<move file="${basedir}/gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/>
 	</target>
 	
Index: /release-kits/wirk2/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/create-distribution.xml	(revision 16744)
+++ /release-kits/wirk2/ant-scripts/create-distribution.xml	(revision 16745)
@@ -3,97 +3,106 @@
 
 	<target name="create-distribution">
-		<!-- create distribution -->
-		<addressedcall target="export-gsdl-gli" />
-		<addressedcall target="dist-set-version" />
-		<addressedcall target="drop-in-binaries" />
-		<addressedcall target="drop-in-demo-collection" />
-		<addressedcall target="compile-gli" />
-		<!--<addressedcall target="create-gli-client-zip" />-->
-		<addressedcall target="tweak-files" />
+		<antcall target="export-gsdl-gli" />
+		<antcall target="dist-set-version" />
+		<antcall target="drop-in-binaries" />
+		<antcall target="drop-in-demo-collection" />
+		<antcall target="drop-in-docs" />
+		<antcall target="copy-server-to-root"/>
+		<antcall target="compile-gli" />
+		<antcall target="tweak-files" />
 	</target>
 
 	<target name="export-gsdl-gli">
-		<if><bool><istrue value="${execute}"/></bool>
-			
-			<mkdir dir="distributions"/>
-			<delete dir="distributions/web"/>
-			<svn>
-				<export srcurl="${svn.root}/gsdl/${branch.path}"		destPath="distributions/web"/>
-				<export srcurl="${svn.root}/gli/${branch.path}"			destPath="distributions/web/gli"/>
-			</svn>
-			
-		</if>
+		<mkdir dir="distributions"/>
+		<delete dir="distributions/web"/>
+		<svn>
+			<export srcurl="${svn.root}/gsdl/${branch.path}"		destPath="distributions/web"/>
+			<export srcurl="${svn.root}/gli/${branch.path}"			destPath="distributions/web/gli"/>
+		</svn>
 	</target>
 
 	<target name="dist-set-version">
-		<if><bool><istrue value="${execute}"/></bool>
-			
-			<echo level="info">Setting version in src/lib/gsdlconf.h</echo>
-			<rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
-			
-			<echo level="info">Setting version in etc/VERSION</echo>
-			<rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
-			
-		</if>
+		<echo level="info">Setting version in src/lib/gsdlconf.h</echo>
+		<rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
+		<echo level="info">Setting version in etc/VERSION</echo>
+		<rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
 	</target>
 	
 	<target name="drop-in-binaries">
-		<if><bool><istrue value="${execute}"/></bool>
-			<echo level="info">Dropping compiled binaries into distribution</echo>
-			<delete dir="${basedir}/distributions/web/bin/windows" />
-			<copy todir="${basedir}/distributions/web/bin/windows">
-				<fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/>
-			</copy>
-		</if>
+		<echo level="info">Dropping compiled binaries into distribution</echo>
+		<delete dir="${basedir}/distributions/web/bin/windows" />
+		<copy todir="${basedir}/distributions/web/bin/windows">
+			<fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/>
+		</copy>
 	</target>
 
 	<target name="drop-in-demo-collection">
-		<if><bool><istrue value="${execute}"/></bool>
-			<echo level="info">Dropping rebuilt demo collection into distribution</echo>
-			<delete dir="${basedir}/distributions/web/collect/demo" />
-			<copy todir="${basedir}/distributions/web/collect/demo">
-				<fileset dir="${basedir}/gsdl/collect/demo" includes="**/*"/>
-			</copy>
-		</if>
+		<echo level="info">Dropping rebuilt demo collection into distribution</echo>
+		<delete dir="${basedir}/distributions/web/collect/demo" />
+		<copy todir="${basedir}/distributions/web/collect/demo">
+			<fileset dir="${basedir}/gsdl/collect/demo" includes="**/*"/>
+		</copy>
+	</target>
+
+	<target name="drop-in-docs">
+		<echo level="info">Dropping gsdl docs  into distribution</echo>
+		<copy todir="${basedir}/distributions/web" overwrite="true">
+			<fileset dir="${wirk2.home}/greenstone2/docs"/>
+		</copy>
+	</target>
+
+	<target name="copy-server-to-root">
+		<copy todir="${basedir}/distributions/web" overwrite="true">
+			<fileset dir="${basedir}/bin/windows/server.exe"/>
+		</copy>
+
 	</target>
 	
 	<target name="compile-gli">
-		<if><bool><istrue value="${execute}"/></bool>
-			
-			<echo>Compiling gli...</echo>
-			<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.bat"/>
-			
-			<echo>Creating jar...</echo>
-			<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.bat"/>
-			
-			<echo>Cleaning up intermediate files...</echo>
-			<delete dir="${basedir}/distributions/web/gli/jar"/>
-			<delete dir="${basedir}/distributions/web/gli/classes/org"/>
-			
-			<echo>Putting gli server jar in a better place</echo>
-			<move file="${basedir}/distributions/web/gli/GLIServer.jar" todir="${basedir}/distributions/web/bin/java" />
-			
-		</if>
+		<echo>Compiling gli...</echo>
+		<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.bat"/>
+		
+		<echo>Creating jar...</echo>
+		<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.bat"/>
+		
+		<echo>Cleaning up intermediate files...</echo>
+		<delete dir="${basedir}/distributions/web/gli/jar"/>
+		<delete dir="${basedir}/distributions/web/gli/classes/org"/>
+		
+		<echo>Putting gli server jar in a better place</echo>
+		<move file="${basedir}/distributions/web/gli/GLIServer.jar" todir="${basedir}/distributions/web/bin/java" />
 	</target>
 
 	<target name="tweak-files">
-		<if><bool><istrue value="${execute}"/></bool>
+		<echo level="info">Changing date and version in the docs</echo>
+		<!-- ar -->
+		<rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(Ø§ÙØªØ§Ø±ÙØ® : \s*)(.*)" replacement="$1${month.ar} ${current.year}" />
+		<rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(Ø§ÙÙØ³Ø®Ù : \s*)(.*)" replacement="$1${version}" />
+		<!-- es -->
+		<rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Fecha\s*)(.*)" replacement="$1${month.es} de ${current.year}" />
+		<rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}" />
+		<!-- fr -->
+		<rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.fr} ${current.year}" />
+		<rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" />
+		<!-- ru -->
+		<rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(ÐÐ°ÑÐ°\s*)(.*)" replacement="$1${month.ru} ${current.year}" />
+		<rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(ÐÐµÑÑÐžÑ\s*)(.*)" replacement="$1${version}" />
+		<!-- en -->
+		<rsr file="${basedir}/distributions/web/READMEen.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.default} ${current.year}" />
+		<rsr file="${basedir}/distributions/web/READMEen.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" />
 
-			<echo level="info">Putting the docs into distribution</echo>
-			<copy todir="${basedir}/distributions/web" overwrite="true">
-				<fileset dir="${wirk2.home}/greenstone2/docs"/>
-			</copy>
+		<!-- Support.htm -->
+		<rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*Greenstone Digital Library version: ).*(&lt;br&gt;.*)" replacement="$1${version}$2"/>
+		<rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*&lt;input.* name=&quot;gsdl version&quot;.* value=&quot;).*(&quot;.*&gt;)" replacement="$1${version}$2"/>
 
-			<echo level="info">Removing signed gatherer</echo>
-			<delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
 
-			<echo level="info">Removing some unneeded stuff</echo>
-			<delete file="${basedir}/distributions/web/gli/.greenstonestore" />
-			<delete file="${basedir}/distributions/web/gli/gli4gs3.sh" />
-			<delete dir="${basedir}/distributions/web/bin/linux" />
-			<delete><fileset dir="${basedir}/distributions/web" includes="*.bash,*.sh,*.csh,install-sh,configure,configure.in,config.sub,config.guess,config.h.in,configtest.pl,Makefile.in,aclocal.m4,acconfig.h,micotest.cpp,win32.mak,WIN32cfg.h,Install.txt"/></delete>
-			<delete><fileset dir="${basedir}/distributions/web/gli" includes="*.sh,*4gs3.bat"/></delete>
-			
-		</if>
+		<echo level="info">Removing signed gatherer</echo>
+		<delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
+
+		<echo level="info">Removing some unneeded stuff</echo>
+		<delete file="${basedir}/distributions/web/gli/.greenstonestore" />
+		<delete dir="${basedir}/distributions/web/bin/linux" />
+		<delete><fileset dir="${basedir}/distributions/web" includes="*.bash,*.sh,*.csh,install-sh,configure,configure.in,config.sub,config.guess,config.h.in,configtest.pl,Makefile.in,aclocal.m4,acconfig.h,micotest.cpp,win32.mak,WIN32cfg.h,Install.txt"/></delete>
+		<delete><fileset dir="${basedir}/distributions/web/gli" includes="*.sh,*4gs3.bat"/></delete>
 	</target>
 
Index: /release-kits/wirk2/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/create-installer.xml	(revision 16744)
+++ /release-kits/wirk2/ant-scripts/create-installer.xml	(revision 16745)
@@ -3,61 +3,53 @@
 
 	<target name="create-installer">
-		<addressedcall target="setup-for-installer-creation"/>
-		<addressedcall target="compile-installer"/>
+		<antcall target="setup-for-installer-creation"/>
+		<antcall target="compile-installer"/>
 	</target>
 
 	<target name="setup-for-installer-creation">
-		<if><bool><istrue value="${execute}"/></bool>
-			
-			<mkdir dir="${basedir}/installer/classes"/>
-			<copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
-			<copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml" overwrite="true"/>
-			<copy todir="${basedir}/installer/classes" overwrite="true">
-				<fileset dir="${wirk2.home}/greenstone2/installer-classes"/>
-				<fileset dir="${wirk2.home}/windows/installer-classes"/>
-				<fileset dir="${wirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
-			</copy>
-			
-			<!-- put the concrete values of things in the config -->
-			<rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
-			<rsr file="${basedir}/installer/build.xml" pattern="@version@" replacement="${version}"/>
-									
-			<!-- put the concrete values of things in the text -->
-			<!-- default -->
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
-			
-			<!-- chinese -->
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
-			<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
-			
-		</if>
+		<mkdir dir="${basedir}/installer/classes"/>
+		<copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
+		<copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml" overwrite="true"/>
+		<copy todir="${basedir}/installer/classes" overwrite="true">
+			<fileset dir="${wirk2.home}/greenstone2/installer-classes"/>
+			<fileset dir="${wirk2.home}/windows/installer-classes"/>
+			<fileset dir="${wirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
+		</copy>
+		
+		<!-- put the concrete values of things in the config -->
+		<rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
+		<rsr file="${basedir}/installer/build.xml" pattern="@version@" replacement="${version}"/>
+								
+		<!-- put the concrete values of things in the text -->
+		<!-- default -->
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
+		
+		<!-- chinese -->
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
+		<rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
 	</target>
 
 	<target name="compile-installer">
-		<if><bool><istrue value="${execute}"/></bool>
+		<installer file="${basedir}/installer/greenstone-${version}-win32.jar"
+			compress="true"
+			extractType="NonExtractor"
+			installConfig="${basedir}/installer/antinstall-config.xml"
+			buildFile="${basedir}/installer/build.xml"
+			antInstallLib="${wirk2.home}/packages/ant-installer/lib"
+			antLib="${wirk2.home}/packages/ant/lib"
+			validateConfig="true"
+			icons="bluecurve">
 			
-			<installer file="${basedir}/installer/greenstone-${version}-win32.jar"
-				compress="true"
-				extractType="NonExtractor"
-				installConfig="${basedir}/installer/antinstall-config.xml"
-				buildFile="${basedir}/installer/build.xml"
-				antInstallLib="${wirk2.home}/packages/ant-installer/lib"
-				antLib="${wirk2.home}/packages/ant/lib"
-				validateConfig="true"
-				icons="bluecurve">
-				
-				<zipfileset dir="${basedir}/installer/classes" includes="**/*" />
-				<zipfileset dir="${basedir}/distributions/web" includes="**/*" />
-				
-			</installer>
+			<zipfileset dir="${basedir}/installer/classes" includes="**/*" />
+			<zipfileset dir="${basedir}/distributions/web" includes="**/*" />
 			
-		</if>
+		</installer>
 	</target>
 	
Index: /release-kits/wirk2/ant-scripts/wrap.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/wrap.xml	(revision 16744)
+++ /release-kits/wirk2/ant-scripts/wrap.xml	(revision 16745)
@@ -3,137 +3,116 @@
 
 	<target name="wrap">
-		<addressedcall target="copy-files-for-wrapping"/>
-		<addressedcall target="tweak-files-for-wrapping"/>
-		<addressedcall target="compile-resources"/>
-		<addressedcall target="compile-wrapper"/>
-		<addressedcall target="link-wrapper-no-java"/>
-		<addressedcall target="link-wrapper-with-java"/>
+		<antcall target="copy-files-for-wrapping"/>
+		<antcall target="tweak-files-for-wrapping"/>
+		<antcall target="compile-resources"/>
+		<antcall target="compile-wrapper"/>
+		<antcall target="link-wrapper-no-java"/>
+		<antcall target="link-wrapper-with-java"/>
 	</target>
 
 	<target name="copy-files-for-wrapping">
-		<if><bool><istrue value="${execute}"/></bool>
-			
-			<!--create a directory to build the wrapped installer in -->
-			<mkdir dir="${basedir}/wrapped-installer/build"/>
-			
-			<!-- copy source files -->
-			<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp" overwrite="true"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h" overwrite="true"/>
+		<!--create a directory to build the wrapped installer in -->
+		<mkdir dir="${basedir}/wrapped-installer/build"/>
 		
-		</if>
+		<!-- copy source files -->
+		<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/>
+		<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp" overwrite="true"/>
+		<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h" overwrite="true"/>
 	</target>
 	
 	<target name="tweak-files-for-wrapping">
-		<if><bool><istrue value="${execute}"/></bool>
-			
-			<!-- substitute the real java installer filename and min version into various files -->
-			<echo>Substitute concrete values of things into source files</echo>
-			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
-			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
-			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
-			
-		</if>
+		<!-- substitute the real java installer filename and min version into various files -->
+		<echo>Substitute concrete values of things into source files</echo>
+		<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
+		<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
+		<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
 	</target>
 
 	<target name="compile-resources">
-		<if><bool><istrue value="${execute}"/></bool>
+		<if>
+			<bool>
+				<not>
+					<uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
+						<srcfiles dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/>
+						<srcfiles dir="${wirk2.home}/windows/wrapper" includes="${windows-java.installer}"/>
+						<srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
+						<srcfiles dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
+						<srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/>
+						<srcfiles dir="${basedir}/installer" includes="greenstone2.jar"/>
+					</uptodate>
+				</not>
+			</bool>
 			
-			<if>
-				<bool>
-					<not>
-						<uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
-							<srcfiles dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/>
-							<srcfiles dir="${wirk2.home}/windows/wrapper" includes="${windows-java.installer}"/>
-							<srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
-							<srcfiles dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
-							<srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/>
-							<srcfiles dir="${basedir}/installer" includes="greenstone2.jar"/>
-						</uptodate>
-					</not>
-				</bool>
-				
-				<echo>Compiling resources</echo>
-				
-				<echo>getting the template resource script</echo>
-				<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
-				
-				<echo>copying the small resource files into place</echo>
-				<copy todir="${basedir}/wrapped-installer/build" overwrite="true">
-					<fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
-					<fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
-					<fileset dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/>
-				</copy>
-				
-				<echo>adding greenstone2.jar to the resource script as chunks</echo>
-				<rsplit
-					resource="${basedir}/installer/greenstone-${version}-win32.jar"
-					outputDir="${basedir}/wrapped-installer/build"
-					resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
-					resourceName="JAR"
-					resourceType="JAR"
-					chunkSize="${resources.chunksize}"
-					/>
+			<echo>Compiling resources</echo>
 			
-				<echo>resource compiling the resource script</echo>
-				<exec executable="rc" dir="${basedir}/wrapped-installer/build">
-					<arg line="wrapper.rc"/>
-				</exec>
-				
-				<echo>making a copy of the resource script</echo>
-				<copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" overwrite="true"/>
-				
-				<echo>adding ${windows-java.installer} to the copy as chunks</echo>
-				<rsplit
-					resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
-					outputDir="${basedir}/wrapped-installer/build"					
-					resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
-					resourceName="JAVA"
-					resourceType="EXE"
-					chunkSize="${resources.chunksize}"
-					/>
+			<echo>getting the template resource script</echo>
+			<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
+			
+			<echo>copying the small resource files into place</echo>
+			<copy todir="${basedir}/wrapped-installer/build" overwrite="true">
+				<fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
+				<fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
+				<fileset dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/>
+			</copy>
+			
+			<echo>adding greenstone2.jar to the resource script as chunks</echo>
+			<rsplit
+				resource="${basedir}/installer/greenstone-${version}-win32.jar"
+				outputDir="${basedir}/wrapped-installer/build"
+				resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
+				resourceName="JAR"
+				resourceType="JAR"
+				chunkSize="${resources.chunksize}"
+				/>
+		
+			<echo>resource compiling the resource script</echo>
+			<exec executable="rc" dir="${basedir}/wrapped-installer/build">
+				<arg line="wrapper.rc"/>
+			</exec>
+			
+			<echo>making a copy of the resource script</echo>
+			<copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" overwrite="true"/>
+			
+			<echo>adding ${windows-java.installer} to the copy as chunks</echo>
+			<rsplit
+				resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
+				outputDir="${basedir}/wrapped-installer/build"					
+				resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
+				resourceName="JAVA"
+				resourceType="EXE"
+				chunkSize="${resources.chunksize}"
+				/>
 
-				<echo>resource compiling the generated resource script again</echo>
-				<exec executable="rc" dir="${basedir}/wrapped-installer/build">
-					<arg line="wrapper-with-jre.rc"/>
-				</exec>
-				
-				<else>
-					<echo>Resourses are up-to-date, will not compile</echo>
-				</else>
-			</if>
+			<echo>resource compiling the generated resource script again</echo>
+			<exec executable="rc" dir="${basedir}/wrapped-installer/build">
+				<arg line="wrapper-with-jre.rc"/>
+			</exec>
 			
-			
+			<else>
+				<echo>Resourses are up-to-date, will not compile</echo>
+			</else>
 		</if>
 	</target>
 
 	<target name="compile-wrapper">
-		<if><bool><istrue value="${execute}"/></bool>
+		<exec executable="cl" dir="${basedir}/wrapped-installer/build">
+			<arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/>
+		</exec>
 
-			<exec executable="cl" dir="${basedir}/wrapped-installer/build">
-				<arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/>
-			</exec>
-
-			<exec executable="cl" dir="${basedir}/wrapped-installer/build">
-				<arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
-			</exec>
-			
-		</if>
+		<exec executable="cl" dir="${basedir}/wrapped-installer/build">
+			<arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
+		</exec>
 	</target>
 	
 	<target name="link-wrapper-no-java">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec executable="link" dir="${basedir}/wrapped-installer/build">
-				<arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
-			</exec>
-		</if>
+		<exec executable="link" dir="${basedir}/wrapped-installer/build">
+			<arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
+		</exec>
 	</target>
 
 	<target name="link-wrapper-with-java">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec executable="link" dir="${basedir}/wrapped-installer/build">
-				<arg line="/OUT:..\greenstone-${version}-win32-with-java.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper-with-jre.res"/>
-			</exec>
-		</if>
+		<exec executable="link" dir="${basedir}/wrapped-installer/build">
+			<arg line="/OUT:..\greenstone-${version}-win32-with-java.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper-with-jre.res"/>
+		</exec>
 	</target>
 
