Index: /release-kits/lirk3/ant-scripts/build.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/build.xml	(revision 16683)
+++ /release-kits/lirk3/ant-scripts/build.xml	(revision 16684)
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
 <!--
 		.......................................................... 
@@ -17,14 +16,12 @@
 	<property name="bundled.version.ant" value="1.6.5"/>
 
-	<!-- set current month and year-->
-	<exec executable="date" outputproperty="current.month"><arg value="+%b"/></exec>
-	<exec executable="date" outputproperty="current.year"><arg value="+%Y"/></exec>
-
 	<!-- for the benefit of the shared scripts, set release-kit home -->
 	<property name="rk.home" value="${lirk3.home}" />
+	<property name="rk.os" value="linux" />
 
 
 	<!-- IMPORT OTHER ANT SCRIPTS -->
 	<import file="shared-ant-scripts/init.xml"/>
+	<import file="shared-ant-scripts/rk3-targets.xml"/>
 	<import file="compile.xml"/>
 	<import file="create-distribution.xml"/>
@@ -34,9 +31,25 @@
 	<!-- THE MAIN TARGET -->
 	<target name="lirk3" 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>
 
+	<target name="a">
+		<echo>some code in a</echo>
+		<antcall target="a-a"/>
+		<echo>some code in a</echo>
+	</target>
+	<target name="a-a">
+		<echo>some code in a-a</echo>
+	</target>
+	<target name="b">
+		<echo>some code in b</echo>
+	</target>
+	<target name="c">
+		<echo>some code in c</echo>
+	</target>
+
+
 </project>
Index: /release-kits/lirk3/ant-scripts/compile.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/compile.xml	(revision 16683)
+++ /release-kits/lirk3/ant-scripts/compile.xml	(revision 16684)
@@ -1,139 +1,112 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <project name="lirk3-compile" default="compile">
-
 
 	<target name="compile">
 
 		<!-- checkout -->
-		<addressedcall target="checkout-greenstone3" />
+		<antcall target="checkout-greenstone3" />
 
 		<!-- preparation -->
-		<addressedcall target="set-version-number-property" />
-		<addressedcall target="dist-prepare-unix" />
-		<addressedcall target="tweak-configure-scripts" />
+		<antcall target="set-version-number-property" />
+		<antcall target="dist-prepare-unix" />
+		<antcall target="tweak-configure-scripts" />
 
 		<!-- update -->
-		<addressedcall target="dist-update-unix" />
+		<antcall target="dist-update-unix" />
 
 		<!-- configure -->
-		<addressedcall target="dist-configure-unix" />
-		<addressedcall target="tweak-makefiles" />
+		<antcall target="dist-configure-unix" />
+		<antcall target="tweak-makefiles" />
 
 		<!-- build -->
-		<addressedcall target="dist-build-unix" />
-		<addressedcall target="fix-wget" />
-		<addressedcall target="linux-strip-execs" />
+		<antcall target="dist-build-unix" />
+		<antcall target="linux-strip-execs" />
 
 		<!-- documentation -->
-		<addressedcall target="prepare-documentation" />
+		<antcall target="prepare-documentation" />
 
 	</target>
 
 	<target name="checkout-greenstone3">
-		<if><bool><istrue value="${execute}"/></bool>
-			<svn>
-				<checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
-			</svn>
-		</if>
+		<svn>
+			<checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
+		</svn>
 	</target>
 
 	<target name="set-version-number-property">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
-		</if>
+		<rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
 	</target>
 
 	<target name="dist-prepare-unix">
-		<if><bool><istrue value="${execute}"/></bool>
-			<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
-		</if>	
+		<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
 	</target>
 	<target name="tweak-configure-scripts">
-		<addressedcall target="mgpp-add-static" />
-		<addressedcall target="mg-add-static" />
-		<addressedcall target="gs2build-add-static" />
+		<antcall target="mgpp-add-static" />
+		<antcall target="mg-add-static" />
+		<antcall target="gs2build-add-static" />
 	</target>
 
 	<target name="dist-update-unix">
-		<if><bool><istrue value="${execute}"/></bool>
-			<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
-		</if>
+		<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
 	</target>
 
 	<target name="dist-configure-unix">
-
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">
-				<arg line="configure.in"/>
-			</exec>
-			<chmod file="greenstone3/gs2build/configure" perm="+x"/>
-			<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
-		</if>
-
+		<exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">
+			<arg line="configure.in"/>
+		</exec>
+		<chmod file="greenstone3/gs2build/configure" perm="+x"/>
+		<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
 	</target>
 
 	<target name="tweak-makefiles">
-		<addressedcall target="wv-add-static" />
-		<addressedcall target="xlhtml-add-static" />
-		<addressedcall target="ppthtml-add-static" />
-		<addressedcall target="rtftohtml-add-static" />
-		<addressedcall target="gdbm-add-static" />
+		<antcall target="wv-add-static" />
+		<antcall target="xlhtml-add-static" />
+		<antcall target="ppthtml-add-static" />
+		<antcall target="rtftohtml-add-static" />
+		<antcall target="gdbm-add-static" />
 	</target>
 
 	<target name="dist-build-unix">
-		<if><bool><istrue value="${execute}"/></bool>
-			<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
-		</if>
-	</target>
-
-	<target name="fix-wget">
-		<if><bool><istrue value="${execute}"/></bool>
-			<!-- fix this !!! -->
-		  <delete file="greenstone3/gs2build/packages/wget/wget-1.9/src/wget"/>
-		</if>
+		<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
 	</target>
 
 	<target name="linux-strip-execs">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec dir="greenstone3/gs2build/bin/linux" executable="find">
-				<arg line="! -name . -exec strip {} &#59;"/>
-			</exec>
-		</if>
+		<exec dir="greenstone3/gs2build/bin/linux" executable="find">
+			<arg line="! -name . -exec strip {} &#59;"/>
+		</exec>
 	</target>
 
 	<target name="prepare-documentation">
-		<if><bool><istrue value="${execute}"/></bool>
-			<mkdir dir="greenstone3/gsdl-manuals"/>
-			<svn>
-				<checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/>
-				<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/>
-			</svn>
-			<javac srcdir="greenstone3/gsdl-manuals/shared"
-			      destdir="greenstone3/gsdl-manuals/shared"
-			      debug="on">
-				<include name="*.java"/>
-			</javac>
-			<unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
+		<mkdir dir="greenstone3/gsdl-manuals"/>
+		<svn>
+			<checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/>
+			<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/>
+		</svn>
+		<javac srcdir="greenstone3/gsdl-manuals/shared"
+		      destdir="greenstone3/gsdl-manuals/shared"
+		      debug="on">
+			<include name="*.java"/>
+		</javac>
+		<unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
 
-			<path id="documentation.compile.classpath">
-				<fileset dir="greenstone3/gsdl-manuals">
-					<include name="**/*.jar"/>
-				</fileset>
-				<pathelement path="greenstone3/gsdl-manuals/shared"/>
-				<pathelement path="greenstone3/gsdl-manuals/manuals"/>
-			</path>
+		<path id="documentation.compile.classpath">
+			<fileset dir="greenstone3/gsdl-manuals">
+				<include name="**/*.jar"/>
+			</fileset>
+			<pathelement path="greenstone3/gsdl-manuals/shared"/>
+			<pathelement path="greenstone3/gsdl-manuals/manuals"/>
+		</path>
 
-			<java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">
-				<arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
-				<arg value="greenstone3/gli/help/en/help.xml" />
-				<arg value="greenstone3" />
-			</java>
+		<java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">
+			<arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
+			<arg value="greenstone3/gli/help/en/help.xml" />
+			<arg value="greenstone3" />
+		</java>
 
-			<chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/>
-			<echo>Run generate-pdf.sh</echo>
-			<exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh">
-				<arg line="generate-pdf.sh u en" />
-			</exec>
-		</if>
+		<chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/>
+		<echo>Run generate-pdf.sh</echo>
+		<exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh">
+			<arg line="generate-pdf.sh u en" />
+		</exec>
 	</target>
 
@@ -145,54 +118,43 @@
 
 	<target name="mgpp-add-static">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
-			<exec dir="greenstone3/gs2build/common-src/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mgpp/configure">
-				<arg line="configure.in"/>
-			</exec>
-		</if>
+		<rsr file="greenstone3/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
+		<exec dir="greenstone3/gs2build/common-src/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mgpp/configure">
+			<arg line="configure.in"/>
+		</exec>
 	</target>
+
 	<target name="mg-add-static">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
-			<exec dir="greenstone3/gs2build/common-src/indexers/mg" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mg/configure">
-				<arg line="configure.in"/>
-			</exec>
-		</if>
+		<rsr file="greenstone3/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
+		<exec dir="greenstone3/gs2build/common-src/indexers/mg" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mg/configure">
+			<arg line="configure.in"/>
+		</exec>
 	</target>
+
 	<target name="gs2build-add-static">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
-			<rsr file="greenstone3/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
-			<rsr file="greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
-		</if>
+		<rsr file="greenstone3/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
+		<rsr file="greenstone3/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
+		<rsr file="greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
 	</target>
 
 	<target name="wv-add-static">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
-		</if>
+		<rsr file="greenstone3/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
 	</target>
+
 	<target name="xlhtml-add-static">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
-		</if>
+		<rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
 	</target>
+
 	<target name="ppthtml-add-static">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
-		</if>
+		<rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
 	</target>
+
 	<target name="rtftohtml-add-static">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
-		</if>
+		<rsr file="greenstone3/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
 	</target>
+
 	<target name="gdbm-add-static">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="greenstone3/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />
-		</if>
+		<rsr file="greenstone3/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />
 	</target>
 
 
-
 </project>
Index: /release-kits/lirk3/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/create-distribution.xml	(revision 16683)
+++ /release-kits/lirk3/ant-scripts/create-distribution.xml	(revision 16684)
@@ -2,100 +2,79 @@
 <project name="lirk3-create-distribution" default="create-distribution">
 
-
 	<target name="create-distribution">
-
 		<!-- create distribution -->
-		<addressedcall target="export-greenstone3" />
-		<addressedcall target="dist-set-version-number-property" />
-		<addressedcall target="dist-set-gli-version" />
-		<addressedcall target="create-distributions-1" />
-		<addressedcall target="create-distributions-2" />
-		<addressedcall target="create-distributions-3" />
-		<addressedcall target="copy-over-build-xml" />
-		<addressedcall target="insert-user-manual"/>
-		<addressedcall target="insert-compiled-binaries"/>
-
+		<antcall target="export-greenstone3" />
+		<antcall target="dist-set-version-number-property" />
+		<antcall target="dist-set-gli-version" />
+		<antcall target="create-distributions-1" />
+		<antcall target="create-distributions-2" />
+		<antcall target="create-distributions-3" />
+		<antcall target="copy-over-build-xml" />
+		<antcall target="insert-user-manual"/>
+		<antcall target="insert-compiled-binaries"/>
+		<antcall target="rename-build-xml-for-transit"/>
 	</target>
 
 	<target name="export-greenstone3">
-		<if><bool><istrue value="${execute}"/></bool>
-			<mkdir dir="distribution"/>
-			<delete dir="distribution/greenstone3"/>
-			<svn>
-				<export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
-				<export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
-			</svn>
-		</if>
+		<mkdir dir="distribution"/>
+		<delete dir="distribution/greenstone3"/>
+		<svn>
+			<export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
+			<export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
+		</svn>
 	</target>
 
 	<target name="dist-set-version-number-property">
-		<if><bool><istrue value="${execute}"/></bool>
-			<rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
-		</if>
+		<rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
 	</target>
 
 	<target name="dist-set-gli-version">
-		<if><bool><istrue value="${execute}"/></bool>
-			<ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
-		</if>
+		<ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
 	</target>
 
 
 	<target name="create-distributions-1">
-		<if><bool><istrue value="${execute}"/></bool>
-			<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
-				<property name="app.version" value="${version}"/>
-				<property name="branch.path" value="${branch.path}"/>
-			</ant>
-		</if>
+		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
+			<property name="app.version" value="${version}"/>
+			<property name="branch.path" value="${branch.path}"/>
+		</ant>
 	</target>
 
 	<target name="create-distributions-2">
-		<if><bool><istrue value="${execute}"/></bool>
-			<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
-				<property name="app.version" value="${version}"/>
-				<property name="branch.path" value="${branch.path}"/>
-			</ant>
-		</if>
+		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
+			<property name="app.version" value="${version}"/>
+			<property name="branch.path" value="${branch.path}"/>
+		</ant>
 	</target>
 
 	<target name="create-distributions-3">
-		<if><bool><istrue value="${execute}"/></bool>
-			<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
-				<property name="app.version" value="${version}"/>
-				<property name="branch.path" value="${branch.path}"/>
-			</ant>
-		</if>
+		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
+			<property name="app.version" value="${version}"/>
+			<property name="branch.path" value="${branch.path}"/>
+		</ant>
 	</target>
 
 	<target name="copy-over-build-xml">
-		<if><bool><istrue value="${execute}"/></bool>
-			<move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
-		</if>
+		<move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
 	</target>
 
 	<target name="insert-user-manual">
-		<if><bool><istrue value="${execute}"/></bool>
-			<copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
-		</if>
+		<copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
 	</target>
 
 	<target name="insert-compiled-binaries">
-		<if><bool><istrue value="${execute}"/></bool>
+		<delete dir="distribution/greenstone3/lib/jni"/>
+		<exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
 
-			<delete dir="distribution/greenstone3/lib/jni"/>
-			<exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
+		<delete dir="distribution/greenstone3/gs2build/bin/linux"/>
+		<exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
 
-			<delete dir="distribution/greenstone3/gs2build/bin/linux"/>
-			<exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
-
-			<delete dir="distribution/greenstone3/gs2build/bin/java"/>
-			<exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
-
-		</if>
+		<delete dir="distribution/greenstone3/gs2build/bin/java"/>
+		<exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
 	</target>
 
-
-
+	<target name="rename-build-xml-for-transit">
+		<move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
+	</target>
 
 </project>
Index: /release-kits/lirk3/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/create-installer.xml	(revision 16683)
+++ /release-kits/lirk3/ant-scripts/create-installer.xml	(revision 16684)
@@ -3,95 +3,77 @@
 
 	<target name="create-installer">
-		<addressedcall target="setup-for-installer-creation"/>
-		<addressedcall target="compile-installer"/>
+		<antcall target="calculate-component-sizes"/> <!-- from rk3-targets -->
+		<antcall target="copy-installer-files"/>
+		<antcall target="make-installer-files-concrete"/> <!-- from rk3-targets -->
+		<antcall target="compile-installer"/>
 	</target>
 
-	<target name="setup-for-installer-creation">
-		<if><bool><istrue value="${execute}"/></bool>
+	<target name="copy-installer-files">
 
-			<!-- get the size of packages -->
-			<exec executable="du" dir="${basedir}/distribution/greenstone3/packages" outputproperty="du.tomcat"><arg line="-hs tomcat"/></exec>
-			<exec executable="sed" inputstring="${du.tomcat}" outputproperty="component.size.tomcat"><arg line="-e 's/^\(.*\)\s.*$/\1b/g'"/></exec>
+		<echo>Project Path: ${basedir}/distribution/greenstone3</echo>
 
-			<exec executable="du" dir="${basedir}/distribution/greenstone3/packages" outputproperty="du.ant"><arg line="-hs ant"/></exec>
-			<exec executable="sed" inputstring="${du.ant}" outputproperty="component.size.ant"><arg line="-e 's/^\(.*\)\s.*$/\1b/g'"/></exec>
+		<echo>Getting things ready to compile the installer</echo>
+		<mkdir dir="${basedir}/installer/resources"/>
+		<copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
+		<copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml" overwrite="true" />
+		<copy todir="${basedir}/installer/classes" overwrite="true">
+			<fileset dir="${lirk3.home}/greenstone3/installer-classes"/>
+			<fileset dir="${lirk3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
+		</copy>
 
-			<echo>Project Path: ${basedir}/distribution/greenstone3</echo>
+		<echo>component.size.core: ${component.size.core}</echo>
+		<echo>component.size.sourcecode: ${component.size.sourcecode}</echo>
+		<echo>component.size.tomcat: ${component.size.tomcat}</echo>
+		<echo>component.size.ant: ${component.size.ant}</echo>
 
-			<echo>Getting things ready to compile the installer</echo>
-			<mkdir dir="${basedir}/installer/resources"/>
-			<copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
-			<copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml" overwrite="true" />
-			<copy todir="${basedir}/installer/classes" overwrite="true">
-				<fileset dir="${lirk3.home}/greenstone3/installer-classes"/>
-				<fileset dir="${lirk3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
-			</copy>
+		<if>
+			<bool><equals arg1="windows" arg2="${rk.os}"/></bool>
+			<echo>component.size.windows-java: ${component.size.windows-java}</echo>
 
-			<!-- put the concrete values of things in the config -->
-			<rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
-			<rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.linux-java@" replacement="${component.size.linux-java}"/>
-			<rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/>
-			<rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.ant@" replacement="${component.size.ant}"/>
+		<else><if>
+			<bool><equals arg1="linux" arg2="${rk.os}"/></bool>
+			<echo>component.size.linux-java: ${component.size.linux-java}</echo>
+			</if>
 
-			<rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
-			<rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
-
-
-			<!-- 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.linux-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.linux-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}"/>
+			</else>
 
 		</if>
+
 	</target>
 
 	<target name="compile-installer">
-		<if><bool><istrue value="${execute}"/></bool>
+		<installer file="${basedir}/installer/greenstone3-with-java.jar"
+				compress="true"
+				extractType="NonExtractor"
+				installConfig="${basedir}/installer/antinstall-config.xml"
+				buildFile="${basedir}/installer/build.xml"
+				antInstallLib="${lirk3.home}/packages/ant-installer/lib"
+				antLib="${lirk3.home}/packages/ant/lib"
+				validateConfig="true"
+				failOnError="false"
+				icons="bluecurve">
 
-			<installer file="${basedir}/installer/greenstone3-with-java.jar"
-					compress="true"
-					extractType="NonExtractor"
-					installConfig="${basedir}/installer/antinstall-config.xml"
-					buildFile="${basedir}/installer/build.xml"
-					antInstallLib="${lirk3.home}/packages/ant-installer/lib"
-					antLib="${lirk3.home}/packages/ant/lib"
-					validateConfig="true"
-					failOnError="false"
-					icons="bluecurve">
+			<!-- copy all the important files into the archive to be extracted for install -->
+			<zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
+			<zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
 
-				<!-- copy all the important files into the archive to be extracted for install -->
-				<zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
-				<zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
+		</installer>
 
-			</installer>
+		<!-- delete the 'bundled java only' lines from the installer config -->
+		<rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
 
-			<!-- delete the 'bundled java only' lines from the installer config -->
-			<rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
+		<installer file="${basedir}/installer/greenstone3.jar"
+				compress="true"
+				extractType="NonExtractor"
+				installConfig="${basedir}/installer/antinstall-config.xml"
+				buildFile="${basedir}/installer/build.xml"
+				antInstallLib="${lirk3.home}/packages/ant-installer/lib"
+				antLib="${lirk3.home}/packages/ant/lib"
+				validateConfig="true"
+				icons="bluecurve">
 
-			<installer file="${basedir}/installer/greenstone3.jar"
-					compress="true"
-					extractType="NonExtractor"
-					installConfig="${basedir}/installer/antinstall-config.xml"
-					buildFile="${basedir}/installer/build.xml"
-					antInstallLib="${lirk3.home}/packages/ant-installer/lib"
-					antLib="${lirk3.home}/packages/ant/lib"
-					validateConfig="true"
-					icons="bluecurve">
-
-				<zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
-				<zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
-			</installer>
-		</if>
+			<zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
+			<zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
+		</installer>
 	</target>
 
Index: /release-kits/lirk3/ant-scripts/operations-on-gs3home.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/operations-on-gs3home.xml	(revision 16683)
+++ /release-kits/lirk3/ant-scripts/operations-on-gs3home.xml	(revision 16684)
@@ -340,4 +340,2 @@
 
 </project>
-  
-
Index: /release-kits/lirk3/ant-scripts/wrap.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/wrap.xml	(revision 16683)
+++ /release-kits/lirk3/ant-scripts/wrap.xml	(revision 16684)
@@ -3,96 +3,91 @@
 
 	<target name="wrap">
-		<addressedcall target="setup-for-wrapping"/>
-		<addressedcall target="compile-wrapper"/>
+		<antcall target="setup-for-wrapping"/>
+		<antcall target="compile-wrapper"/>
 	</target>
 
 	<target name="setup-for-wrapping">
-		<if><bool><istrue value="${execute}"/></bool>
 
-			<!-- create and setup the build directory -->
-			<mkdir dir="${basedir}/wrapped-installer/build"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/wrapper.cpp" overwrite="true" />
-			<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.cpp" overwrite="true" />
-			<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.h" overwrite="true" />
+		<!-- create and setup the build directory -->
+		<mkdir dir="${basedir}/wrapped-installer/build"/>
+		<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/wrapper.cpp" overwrite="true" />
+		<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.cpp" overwrite="true" />
+		<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.h" overwrite="true" />
 
-			<!-- copy bundled files -->
-			<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
+		<!-- copy bundled files -->
+		<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
+		<copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
+		<copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
 
-			<!-- substitute the real java installer filename and min version into various files -->
-			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
-			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone3"/>
-			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
-			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
+		<!-- substitute the real java installer filename and min version into various files -->
+		<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
+		<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone3"/>
+		<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
+		<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
 
-		</if>
 	</target>
 
 	<target name="compile-wrapper">
-		<if><bool><istrue value="${execute}"/></bool>
-
-			<echo level="info">create an object file (extension .o) for each file to bundle</echo>
-			<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
-				<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_jar_start=greenstone3jar --readonly-text greenstone3.jar greenstone3.jar.o"/>
-			</exec>
-			<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
-				<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/>
-			</exec>
-			<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
-				<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
-			</exec>
+		<echo level="info">create an object file (extension .o) for each file to bundle</echo>
+		<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
+			<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_jar_start=greenstone3jar --readonly-text greenstone3.jar greenstone3.jar.o"/>
+		</exec>
+		<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
+			<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/>
+		</exec>
+		<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
+			<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
+		</exec>
 
 
-			<!-- get size of greenstone.jar -->
-			<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec>
-			<exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
+		<!-- get size of greenstone.jar -->
+		<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec>
+		<exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
-			<!-- get size of greenstone-with-java.jar -->
-			<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
-			<exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
+		<!-- get size of greenstone-with-java.jar -->
+		<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
+		<exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
-			<!-- get size of java -->
-			<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
-			<exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
+		<!-- get size of java -->
+		<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
+		<exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
 
-			<echo level="info">creating the header file for no java version</echo>
-			<delete file="wrapper.h"/>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
+		<echo level="info">creating the header file for no java version</echo>
+		<delete file="wrapper.h"/>
+		<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
 
-			<echo level="info">compile the wrapper program</echo>
-			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
-			</exec>
+		<echo level="info">compile the wrapper program</echo>
+		<exec executable="g++" dir="${basedir}/wrapped-installer/build">
+			<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
+		</exec>
 
-			<echo level="info">compile libsearch4j</echo>
-			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
-			</exec>
+		<echo level="info">compile libsearch4j</echo>
+		<exec executable="g++" dir="${basedir}/wrapped-installer/build">
+			<arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
+		</exec>
 
-			<echo level="info">link, bundling the files to be bundled</echo>
-			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/>
-			</exec>
+		<echo level="info">link, bundling the files to be bundled</echo>
+		<exec executable="g++" dir="${basedir}/wrapped-installer/build">
+			<arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/>
+		</exec>
 
 
-			<echo level="info">creating the header file for bundled java version</echo>
-			<delete file="wrapper.h"/>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
+		<echo level="info">creating the header file for bundled java version</echo>
+		<delete file="wrapper.h"/>
+		<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
+		<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
+		<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
 
-			<echo level="info">recompile the wrapper program</echo>
-			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
-			</exec>
+		<echo level="info">recompile the wrapper program</echo>
+		<exec executable="g++" dir="${basedir}/wrapped-installer/build">
+			<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
+		</exec>
 
-			<echo level="info">relink, bundling the files to be bundled</echo>
-			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/>
-			</exec>
+		<echo level="info">relink, bundling the files to be bundled</echo>
+		<exec executable="g++" dir="${basedir}/wrapped-installer/build">
+			<arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/>
+		</exec>
 
-		</if>
 	</target>
 
