Index: release-kits/mark2/ant-scripts/create-distribution.xml
===================================================================
--- release-kits/mark2/ant-scripts/create-distribution.xml	(revision 16469)
+++ release-kits/mark2/ant-scripts/create-distribution.xml	(revision 16741)
@@ -2,164 +2,112 @@
 <project name="mark2-create-distribution" default="create-distribution">
 
+	<target name="create-distribution">
+		<antcall target="export-gsdl-gli" />
+		<antcall target="dist-set-version" />
+		<antcall target="gli-set-version-numbers">
+			<param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/>
+		</antcall>
+		<antcall target="drop-in-binaries" />
+		<antcall target="drop-in-demo-collection" />
+		<antcall target="drop-in-docs" />
+		<antcall target="compile-gli" />
+		<antcall target="tweak-files" />
+	</target>
 
-	<target name="create-distribution">
-		<addressedcall target="export-gsdl-gli" />
-		<addressedcall target="dist-set-version" />
-		<addressedcall target="dist-set-gli-version" />
-		<addressedcall target="drop-in-binaries" />
-		<addressedcall target="drop-in-demo-collection" />
-		<addressedcall target="drop-in-docs" />
-		<addressedcall target="compile-gli" />
-		<addressedcall target="create-gli-client-zip" />
-		<addressedcall target="tweak-files" />
+	<target name="export-gsdl-gli">
+		<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">
+		<echo level="info">Setting version in src/lib/gsdlconf.h</echo>
+		<rsr file="${basedir}/distributions/web/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
+
+		<echo level="info">Setting version in Install.sh</echo>
+		<rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
+
+		<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="dist-set-gli-version">
 
 	</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>
-	</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/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
-
-			<echo level="info">Setting version in Install.sh</echo>
-			<rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
-
-			<echo level="info">Setting version in etc/VERSION</echo>
-			<rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
-
-		</if>
-	</target>
-
-	<target name="dist-set-gli-version">
-		<if><bool><istrue value="${execute}"/></bool>
-			<ant antfile="${mark2.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distributions/web/gli" target="set-version-numbers"/>
-		</if>
-	</target>
-
 	<target name="drop-in-binaries">
-		<if><bool><istrue value="${execute}"/></bool>
-			<echo level="info">Dropping compiled binaries into distribution</echo>
-			<delete dir="distributions/web/bin/linux" />
-			<delete dir="distributions/web/bin/darwin" />
-			<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec>
-			<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
-			<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
-		</if>
+		<echo level="info">Dropping compiled binaries into distribution</echo>
+		<delete dir="distributions/web/bin/linux" />
+		<delete dir="distributions/web/bin/darwin" />
+		<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
 	</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="distributions/web/collect/demo" />
-			<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>
-		</if>
+		<echo level="info">Dropping rebuilt demo collection into distribution</echo>
+		<delete dir="distributions/web/collect/demo" />
+		<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>
 	</target>
 
 	<target name="drop-in-docs">
-		<if><bool><istrue value="${execute}"/></bool>
-			<echo level="info">Dropping gsdl docs  into distribution</echo>
-			<copy todir="${basedir}/distributions/web" overwrite="true">
-				<fileset dir="${mark2.home}/greenstone2/docs"/>
-			</copy>
-		</if>
+		<echo level="info">Dropping gsdl docs  into distribution</echo>
+		<copy todir="${basedir}/distributions/web" overwrite="true">
+			<fileset dir="${mark2.home}/greenstone2/docs"/>
+		</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.sh"/>
 
-			<echo>Compiling gli...</echo>
-			<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.sh"/>
+		<echo>Creating jar...</echo>
+		<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/>
 
-			<echo>Creating jar...</echo>
-			<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/>
+		<echo>Cleaning up intermediate files...</echo>
+		<delete dir="${basedir}/distributions/web/gli/jar"/>
+		<delete dir="${basedir}/distributions/web/gli/classes/org"/>
 
-			<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>
-			<exec dir="${basedir}/distributions/web" executable="mv" failonerror="true">
-				<arg line="gli/GLIServer.jar bin/java" />
-			</exec>
-
-		</if>
+		<echo>Putting gli server jar in a better place</echo>
+		<exec dir="${basedir}/distributions/web" executable="mv" failonerror="true">
+			<arg line="gli/GLIServer.jar bin/java" />
+		</exec>
 	</target>
 
-	<target name="create-gli-client-zip">
-		<if><bool><istrue value="${execute}"/></bool>
-			<!--
-			# take a copy of GLI directory
-			&util::cp_r(&util::filename_cat($tmpdir, "gsdl", "gli"), $tmpdir);
+	<target name="tweak-files">
+		<echo level="info">Changing Install.sh to web release</echo>
+		<rsr file="${basedir}/distributions/web/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" />
 
-			my $client_dirname = "gli-client-" . $version_num;
-			rename ("gli", $client_dirname);
-			chdir(&util::filename_cat($tmpdir, $client_dirname));
+		<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}" />
 
+		<!-- 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"/>
 
-			# delete unnecessary stuff
-			`rm -rf clean.* document.* gems.* gli*.sh gli*.bat make*.sh make*.bat lib src`;
-			# make sure permissions are ok
-			`chmod a+x client-gli.sh client-gli.bat`;
-			chdir($tmpdir);
+		<echo level="info">Removing signed gatherer</echo>
+		<delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
 
-			# zip up the client
-			&zip($client_dirname, $client_dirname, $tmpdir, 1);
-			-->
-		</if>
-	</target>
-
-
-	<target name="tweak-files">
-		<if><bool><istrue value="${execute}"/></bool>
-
-			<echo level="info">Changing Install.sh to web release</echo>
-			<rsr file="${basedir}/distributions/web/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" />
-
-
-			<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}" />
-
-			<!-- 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><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
-			<delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
-
-		</if>
+		<echo level="info">Removing some unneeded stuff</echo>
+		<delete file="${basedir}/distributions/web/gli/.greenstonestore" />
+		<delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
+		<delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
 	</target>
 
