Index: /release-kits/lirk2/ant-scripts/create-components.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/create-components.xml	(revision 17785)
+++ /release-kits/lirk2/ant-scripts/create-components.xml	(revision 17786)
@@ -13,14 +13,18 @@
 	<target name="prepare-components">
 		<antcall target="prepare-core-component" />
+		<antcall target="prepare-imagemagick-component" />
+
 		<antcall target="prepare-sourcecode-component" />
-		<antcall target="prepare-imagemagick-component" />
-		<antcall target="prepare-sourcecode-core-component" />
+
+		<antcall target="prepare-source-release" />
 	</target>
 
 	<target name="compress-components">
 		<antcall target="compress-core-component" />
-		<antcall target="compress-sourcecode-component" />	
 		<antcall target="compress-imagemagick-component" />
-		<antcall target="compress-sourcecode-core-component" />
+
+		<!--<antcall target="compress-sourcecode-component" />-->
+
+		<antcall target="compress-source-release" />
 	</target>
 
@@ -56,27 +60,4 @@
 	</target>
 
-	<!-- sourcecode core -->
-	<target name="prepare-sourcecode-core-component">
-		<delete dir="components/tmp/sourcecode-core"/>
-		<mkdir dir="components/tmp/sourcecode-core"/>
-
-		<copy todir="components/tmp/sourcecode-core" overwrite="true">
-			<fileset dir="distributions/source">
-				<include name="macros/**/*"/>
-				<include name="images/**/*"/>
-				<include name="etc/**/*"/>
-				<include name="gli/**/*"/>
-				<include name="collect/**/*"/>
-				<include name="doc/**/*"/>
-				<include name="setup.bash"/>
-			</fileset>
-		</copy>
-		<zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
-	</target>
-	
-	<target name="compress-sourcecode-core-component">
-		<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
-	</target>
-
 	<!-- sourcecode -->
 	<target name="prepare-sourcecode-component">
@@ -93,5 +74,4 @@
 		</copy>
 				
-		<zip destfile="components/sourcecode.comp" basedir="components/tmp/sourcecode" compress="false"/>
 		<zip destfile="components/Greenstone-${version}-linux-sourcecode.zip"  basedir="components/tmp/sourcecode" compress="true"/>
 	</target>
@@ -120,3 +100,19 @@
 	</target>
 
+	<!-- source-release -->
+	<target name="prepare-source-release">
+		<delete dir="components/tmp/source-release"/>
+		<mkdir dir="components/tmp/source-release"/>
+
+		<copy todir="components/tmp/source-release" overwrite="true">
+			<fileset dir="distributions/source"/>
+		</copy>
+		<zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false" includes="**/*"/>
+	</target>
+	
+	<target name="compress-source-release">
+		<sevenzip task="encode" input="components/source-release.comp" output="components/source-release.lzma" dictionnary="26"/>
+	</target>
+
+
 </project>
Index: /release-kits/lirk2/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/create-distribution.xml	(revision 17785)
+++ /release-kits/lirk2/ant-scripts/create-distribution.xml	(revision 17786)
@@ -9,4 +9,7 @@
 		<antcall target="drop-in-docs" />
 		<antcall target="tweak-files" />
+		<antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
+		<antcall target="drop-in-demo-collection" />
+		<antcall target="insert-export-to-cd-package"/>	<!-- from rk2-targets -->
 		<antcall target="remove-unneeded-files-1" />
 
@@ -14,7 +17,4 @@
 
 		<antcall target="drop-in-binaries" />
-		<antcall target="drop-in-demo-collection" />
-		<antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
-		<antcall target="insert-export-to-cd-package"/>		<!-- from rk2-targets -->
 		<antcall target="export-imagemagick-linux-binaries" />
 		<antcall target="compile-gli" />
@@ -81,7 +81,4 @@
 	<target name="remove-unneeded-files-1">
 		<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>
-		<delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
 	</target>
 
@@ -126,6 +123,8 @@
 	<target name="remove-unneeded-files-2">
 		<delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
+		<delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
+		<delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
+		<delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
 	</target>
 
-
 </project>
Index: /release-kits/lirk2/installer/antinstall-config.xml
===================================================================
--- /release-kits/lirk2/installer/antinstall-config.xml	(revision 17785)
+++ /release-kits/lirk2/installer/antinstall-config.xml	(revision 17786)
@@ -25,5 +25,13 @@
 
 	<!--  simple intro page -->
-	<page type="input" name="intro" displayText="">
+	<page
+		type="input"
+		name="intro"
+		displayText=""
+		<!-- start source release -->
+		target="Source Release"
+		<!-- end source release -->
+		>
+
 		<comment name="welcome-message"/>
 	</page>
@@ -42,4 +50,5 @@
 	</page>
 
+	<!-- start binary release -->
 	<page type="input" name="selector" displayText="">
 		<comment name="choose-components"/>
@@ -53,5 +62,4 @@
 			hidden="true"/>
 
-		<!-- start binary release core -->
 		<target
 			target="Installing Core System"
@@ -60,14 +68,4 @@
 			defaultValue="true"
 			force="true"/>
-		<!-- end binary release core -->
-
-		<!-- start source release core -->
-		<target
-			target="Installing Source Code Core"
-			diskRequirement="@component.size.sourcecode-core@"
-			displayText=""
-			defaultValue="true"
-			/>
-		<!-- end source release core -->
 
 		<!-- start bundled components -->
@@ -79,20 +77,11 @@
 		<!-- end bundled components -->
 
-		<!-- start sourcecode -->
-		<target
-			target="Installing Source Code"
-			diskRequirement="@component.size.sourcecode@"
-			defaultValue="true"
-			displayText=""/>
-		<!-- end sourcecode -->
-
 	</page>
 
-	<!-- start binary release core -->
 	<page type="input" name="admin-password" displayText="">
 		<comment name="admin-password-expl"/>
 		<text property="admin.password" defaultValue="" displayText=""/>
 	</page>
-	<!-- end binary release core -->
+	<!-- end binary release -->
 
 	<page type="progress" name="progress" showTargets="true" displayText=""/>
Index: /release-kits/lirk2/installer/build.xml
===================================================================
--- /release-kits/lirk2/installer/build.xml	(revision 17785)
+++ /release-kits/lirk2/installer/build.xml	(revision 17786)
@@ -98,13 +98,27 @@
 	</target>
 
-	<!-- sourcecode core system -->
-	<target name="Installing Source Code Core">
+	<!-- imagemagick -->
+	<target name="Installing ImageMagick">
+		<echo>Installing ImageMagick</echo>
+		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
+		<sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
+		<delete file="imagemagick.lzma"/>
+		<unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
+		<delete file="imagemagick.comp"/>
+		
+		<echo>Setting ImageMagick Binaries to Executable</echo>
+		<chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
+		
+	</target>
 
-		<echo>Installing Source Code Core</echo>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
-		<delete file="sourcecode-core.lzma"/>
-		<unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
-		<delete file="sourcecode-core.comp"/>
+	<!-- source release -->
+	<target name="Source Release">
+
+		<echo>Installing Source Release</echo>
+		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
+		<sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
+		<delete file="source-release.lzma"/>
+		<unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
+		<delete file="source-release.comp"/>
 
 		<echo>Set the installation locale in config files</echo>
@@ -129,27 +143,3 @@
 
 
-	<!-- source code -->
-	<target name="Installing Source Code">
-		<echo>Installing Source Code</echo>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
-		<delete file="sourcecode.lzma"/>
-		<unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
-		<delete file="sourcecode.comp"/>
-	</target>
-
-	<!-- imagemagick -->
-	<target name="Installing ImageMagick">
-		<echo>Installing ImageMagick</echo>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
-		<delete file="imagemagick.lzma"/>
-		<unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
-		<delete file="imagemagick.comp"/>
-		
-		<echo>Setting ImageMagick Binaries to Executable</echo>
-		<chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
-		
-	</target>
-
 </project>
Index: /release-kits/lirk3/ant-scripts/create-components.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/create-components.xml	(revision 17785)
+++ /release-kits/lirk3/ant-scripts/create-components.xml	(revision 17786)
@@ -13,18 +13,22 @@
 	<target name="prepare-components">
 		<antcall target="prepare-core-component" />
-		<antcall target="prepare-sourcecode-component" />
 		<antcall target="prepare-ant-component" />
 		<antcall target="prepare-tomcat-component" />
 		<antcall target="prepare-imagemagick-component" />
-		<antcall target="prepare-sourcecode-core-component" />
+
+		<antcall target="prepare-sourcecode-component" />
+
+		<antcall target="prepare-source-release" />
 	</target>
 
 	<target name="compress-components">
 		<antcall target="compress-core-component" />
-		<antcall target="compress-sourcecode-component" />	
 		<antcall target="compress-ant-component" />
 		<antcall target="compress-tomcat-component" />
 		<antcall target="compress-imagemagick-component" />
-		<antcall target="compress-sourcecode-core-component" />
+
+		<!--<antcall target="compress-sourcecode-component" />-->
+
+		<antcall target="compress-source-release" />
 	</target>
 
@@ -67,30 +71,4 @@
 	</target>
 
-	<!-- sourcecode-core -->
-	<target name="prepare-sourcecode-core-component">
-		<delete dir="components/tmp/sourcecode-core"/>
-		<mkdir dir="components/tmp/sourcecode-core"/>
-
-		<copy todir="components/tmp/sourcecode-core" overwrite="true">
-			<fileset dir="distribution/source">
-				<include name="gli/**/*"/>
-				<include name="docs/**/*"/>
-				<include name="resources/**/*"/>
-				<include name="web/**/*"/>
-				<include name="gs2build/etc/**/*"/>
-				<include name="gs2build/setup.bash"/>
-				<include name="build.xml"/>
-				<include name="build.properties"/>
-				<include name="*.sh"/>
-				<include name="*.txt"/>
-			</fileset>
-		</copy>
-		<zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false"/>
-	</target>
-	
-	<target name="compress-sourcecode-core-component">
-		<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
-	</target>
-	
 	<!-- sourcecode -->
 	<target name="prepare-sourcecode-component">
@@ -108,5 +86,4 @@
 		</copy>
 				
-		<zip destfile="components/sourcecode.comp" basedir="components/tmp/sourcecode" compress="false" />
 		<zip destfile="components/Greenstone-${version}-linux-sourcecode.zip"  basedir="components/tmp/sourcecode" compress="true"/>
 	</target>
@@ -173,3 +150,20 @@
 	</target>
 
+
+	<!-- sourcecode-release -->
+	<target name="prepare-source-release">
+		<delete dir="components/tmp/source-release"/>
+		<mkdir dir="components/tmp/source-release"/>
+
+		<copy todir="components/tmp/source-release" overwrite="true">
+			<fileset dir="distribution/source"/>
+		</copy>
+		<zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/>
+	</target>
+	
+	<target name="compress-source-release">
+		<sevenzip task="encode" input="components/source-release.comp" output="components/source-release.lzma" dictionnary="26"/>
+	</target>
+
+
 </project>
Index: /release-kits/lirk3/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/create-distribution.xml	(revision 17785)
+++ /release-kits/lirk3/ant-scripts/create-distribution.xml	(revision 17786)
@@ -9,4 +9,5 @@
 		<antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
 		<antcall target="insert-user-manual"/>
+		<antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
 
 		<antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
@@ -16,19 +17,15 @@
 			<property name="branch.path" value="${branch.path}"/>
 		</ant>
-
 		<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>
-
 		<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>
-
 		<antcall target="copy-over-build-xml" />
 		<antcall target="insert-compiled-binaries"/>
 		<antcall target="export-imagemagick-linux-binaries" />
-		<antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
 	
 		<antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
Index: /release-kits/lirk3/installer/antinstall-config.xml
===================================================================
--- /release-kits/lirk3/installer/antinstall-config.xml	(revision 17785)
+++ /release-kits/lirk3/installer/antinstall-config.xml	(revision 17786)
@@ -25,6 +25,15 @@
 
 	<!--  simple intro page -->
-	<page type="input" name="intro" displayText="">
+	<page
+		type="input"
+		name="intro"
+		displayText=""
+		<!-- start source release -->
+		target="Source Release"
+		<!-- end source release -->
+		>
+
 		<comment name="welcome-message"/>
+
 	</page>
 
@@ -53,4 +62,5 @@
 		<comment name="choose-components"/>
 
+		<!-- start binary release -->
 		<target
 			target="Initialising"
@@ -61,5 +71,4 @@
 			hidden="true"/>
 
-		<!-- start binary release core -->
 		<target
 			target="Installing Core System"
@@ -68,14 +77,4 @@
 			defaultValue="true"
 			force="true"/>
-		<!-- end binary release core -->
-
-		<!-- start source release core -->
-		<target
-			target="Installing Source Code Core"
-			diskRequirement="@component.size.sourcecode-core@"
-			displayText=""
-			defaultValue="true"
-			/>
-		<!-- end source release core -->
 
 		<!-- start bundled components -->
@@ -99,13 +98,6 @@
 		<!-- end bundled components -->
 
-		<!-- start sourcecode -->
-		<target
-			target="Installing Source Code"
-			diskRequirement="@component.size.sourcecode@"
-			defaultValue="false"
-			displayText=""/>
-		<!-- end sourcecode -->
-
 	</page>
+	<!-- end binary release -->
 
 	<!-- start bundled components -->
Index: /release-kits/lirk3/installer/build.xml
===================================================================
--- /release-kits/lirk3/installer/build.xml	(revision 17785)
+++ /release-kits/lirk3/installer/build.xml	(revision 17786)
@@ -72,42 +72,4 @@
 	</target>
 
-	<!-- sourcecode core system -->
-	<target name="Installing Source Code Core">
-
-		<echo>Installing Source Code Core</echo>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
-		<delete file="sourcecode-core.lzma"/>
-		<unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
-		<delete file="sourcecode-core.comp"/>
-
-		<echo>Setting up global properties</echo>
-		<copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
-
-		<echo>Setting up log4j properties</echo>
-		<copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
-		<rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
-
-		<echo>Creating installation properties file</echo>
-		<echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
-
-	</target>
-
-
-	<!-- Source -->
-	<target name="Installing Source Code" depends="">
-
-		<echo>Installing Source Code</echo>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
-		<delete file="sourcecode.lzma"/>
-		<unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
-		<delete file="sourcecode.comp"/>
-
-	</target>
-
 	<!-- imagemagick -->
 	<target name="Installing ImageMagick">
@@ -160,3 +122,29 @@
 	</target>
 
+	<!-- source release -->
+	<target name="Source Release">
+
+		<echo>Installing Source Release</echo>
+		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
+		<sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
+		<delete file="source-release.lzma"/>
+		<unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
+		<delete file="source-release.comp"/>
+
+		<echo>Setting up global properties</echo>
+		<copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
+		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
+		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
+		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
+
+		<echo>Setting up log4j properties</echo>
+		<copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
+		<rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
+
+		<echo>Creating installation properties file</echo>
+		<echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
+
+	</target>
+
+
 </project>
Index: /release-kits/mark2/ant-scripts/create-components.xml
===================================================================
--- /release-kits/mark2/ant-scripts/create-components.xml	(revision 17785)
+++ /release-kits/mark2/ant-scripts/create-components.xml	(revision 17786)
@@ -13,16 +13,16 @@
 	<target name="prepare-components">
 		<antcall target="prepare-core-component" />
-		<antcall target="prepare-sourcecode-component" />
-		<antcall target="prepare-sourcecode-core-component" />
 		<antcall target="prepare-imagemagick-component" />
 		<antcall target="prepare-ghostscript-component" />
+
+		<!--<antcall target="prepare-sourcecode-component" />-->
 	</target>
 	
 	<target name="compress-components">
 		<antcall target="compress-core-component" />
-		<antcall target="compress-sourcecode-component" />
-		<antcall target="compress-sourcecode-core-component" />
 		<antcall target="compress-imagemagick-component" />
 		<antcall target="compress-ghostscript-component" />
+
+		<!--<antcall target="compress-sourcecode-component" />-->
 	</target>
 
@@ -67,27 +67,4 @@
 	<target name="compress-core-component">
 		<sevenzip task="encode" input="components/core.comp" output="components/core.lzma" dictionnary="26"/>
-	</target>
-
-	<!-- sourcecode core -->
-	<target name="prepare-sourcecode-core-component">
-		<delete dir="components/tmp/sourcecode-core"/>
-		<mkdir dir="components/tmp/sourcecode-core"/>
-
-		<copy todir="components/tmp/sourcecode-core" overwrite="true">
-			<fileset dir="distributions/source">
-				<include name="macros/**/*"/>
-				<include name="images/**/*"/>
-				<include name="etc/**/*"/>
-				<include name="gli/**/*"/>
-				<include name="collect/**/*"/>
-				<include name="doc/**/*"/>
-				<include name="setup.bash"/>
-			</fileset>
-		</copy>
-		<zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
-	</target>
-	
-	<target name="compress-sourcecode-core-component">
-		<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
 	</target>
 
Index: /release-kits/mark2/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/mark2/ant-scripts/create-distribution.xml	(revision 17785)
+++ /release-kits/mark2/ant-scripts/create-distribution.xml	(revision 17786)
@@ -10,7 +10,4 @@
 		<antcall target="tweak-files" />
 		<antcall target="remove-unneeded-files-1" />
-
-		<antcall target="copy-web-to-source" /> <!-- from init -->
-
 		<antcall target="drop-in-binaries" />
 		<antcall target="drop-in-demo-collection" />
Index: /release-kits/mark2/installer/antinstall-config.xml
===================================================================
--- /release-kits/mark2/installer/antinstall-config.xml	(revision 17785)
+++ /release-kits/mark2/installer/antinstall-config.xml	(revision 17786)
@@ -42,8 +42,8 @@
 	</page>
 
+	<!-- start binary release -->
 	<page type="input" name="selector" displayText="">
 		<comment name="choose-components"/>
 
-		<!-- start binary release core -->
 		<target
 			target="Installing Core System"
@@ -52,24 +52,7 @@
 			defaultValue="true"
 			force="true"/>
-		<!-- end binary release core -->
-
-		<!-- start source release core -->
-		<target
-			target="Installing Source Code Core"
-			diskRequirement="@component.size.sourcecode-core@"
-			displayText=""
-			defaultValue="true"
-			/>
-		<!-- end source release core -->
-
-		<!-- start sourcecode -->
-		<target
-			target="Installing Source Code"
-			diskRequirement="@component.size.sourcecode@"
-			defaultValue="false"
-			displayText=""/>
-		<!-- end sourcecode -->
 
 	</page>
+	<!-- end binary release -->
 
 	<page type="input" name="admin-password" displayText="">
Index: /release-kits/mark2/installer/build.xml
===================================================================
--- /release-kits/mark2/installer/build.xml	(revision 17785)
+++ /release-kits/mark2/installer/build.xml	(revision 17786)
@@ -81,44 +81,4 @@
 	</target>
 
-	<!-- sourcecode core system -->
-	<target name="Installing Source Code Core">
-
-		<echo>Installing Source Code Core</echo>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
-		<delete file="sourcecode-core.lzma"/>
-		<unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
-		<delete file="sourcecode-core.comp"/>
-
-		<echo>Set the installation locale in config files</echo>
-		<rsr file="${installDir}/setup.bash" pattern="^gsdllang=.*" replacement="gsdllang=${language}"/>
-		<rsr file="${installDir}/gli/gli.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
-		<rsr file="${installDir}/gli/gems.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
-
-		<rsr
-			file="${installDir}/gli/classes/xml/config.xml"
-			pattern="(&lt;Argument name=&quot;general.locale&quot;&gt;).*(&lt;/Argument&gt;)"
-			replacement="$1${language}$2"/>
-
-		<echo file="${installDir}/etc/main.cfg" append="true"
-			>cgiarg          shortname=l argdefault=${language}</echo>
-
-		<rsr file="${installDir}/etc/main.cfg" pattern="^status .*" replacement="status enabled"/>
-
-		<echo>Creating installation properties file</echo>
-		<echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
-
-	</target>
-
-	<!-- Source -->
-	<target name="Installing Source Code" depends="">
-		<echo message="Installing Source Code"/>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
-		<delete file="sourcecode.lzma"/>
-		<unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
-		<delete file="sourcecode.comp"/>
-	</target>
-
 	<!-- ImageMagick -->
 	<target name="Installing ImageMagick" depends="">
Index: /release-kits/mark3/ant-scripts/create-components.xml
===================================================================
--- /release-kits/mark3/ant-scripts/create-components.xml	(revision 17785)
+++ /release-kits/mark3/ant-scripts/create-components.xml	(revision 17786)
@@ -13,20 +13,20 @@
 	<target name="prepare-components">
 		<antcall target="prepare-core-component" />
-		<antcall target="prepare-sourcecode-component" />
 		<antcall target="prepare-ant-component" />
 		<antcall target="prepare-tomcat-component" />
-		<antcall target="prepare-sourcecode-core-component" />
 		<antcall target="prepare-imagemagick-component" />
 		<antcall target="prepare-ghostscript-component" />
+
+		<!--<antcall target="prepare-sourcecode-component" />-->
 	</target>
 
 	<target name="compress-components">
 		<antcall target="compress-core-component" />
-		<antcall target="compress-sourcecode-component" />
 		<antcall target="compress-ant-component" />
 		<antcall target="compress-tomcat-component" />
-		<antcall target="compress-sourcecode-core-component" />
 		<antcall target="compress-imagemagick-component" />
 		<antcall target="compress-ghostscript-component" />
+
+		<!--<antcall target="compress-sourcecode-component" />-->
 	</target>
 
@@ -74,31 +74,4 @@
 	</target>
 	
-	<!-- sourcecode-core -->
-	<target name="prepare-sourcecode-core-component">
-		<delete dir="components/tmp/sourcecode-core"/>
-		<mkdir dir="components/tmp/sourcecode-core"/>
-
-		<copy todir="components/tmp/sourcecode-core" overwrite="true">
-			<fileset dir="distribution/source">
-				<include name="gli/**/*"/>
-				<include name="docs/**/*"/>
-				<include name="resources/**/*"/>
-				<include name="web/**/*"/>
-				<include name="gs2build/etc/**/*"/>
-				<include name="gs2build/setup.bash"/>
-				<include name="build.xml"/>
-				<include name="build.properties"/>
-				<include name="*.sh"/>
-				<include name="*.txt"/>
-			</fileset>
-		</copy>
-		<zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
-	</target>
-	
-	<target name="compress-sourcecode-core-component">
-		<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
-	</target>
-
-
 	<!-- sourcecode -->
 	<target name="prepare-sourcecode-component">
Index: /release-kits/mark3/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/mark3/ant-scripts/create-distribution.xml	(revision 17785)
+++ /release-kits/mark3/ant-scripts/create-distribution.xml	(revision 17786)
@@ -9,6 +9,4 @@
 		<antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
 		<antcall target="insert-user-manual"/>
-
-		<antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
 
 		<ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
Index: /release-kits/mark3/installer/antinstall-config.xml
===================================================================
--- /release-kits/mark3/installer/antinstall-config.xml	(revision 17785)
+++ /release-kits/mark3/installer/antinstall-config.xml	(revision 17786)
@@ -42,8 +42,8 @@
 	</page>
 
+	<!-- start binary release -->
 	<page type="input" name="selector" displayText="">
 		<comment name="choose-components"/>
 
-		<!-- start binary release core -->
 		<target
 			target="Installing Core System"
@@ -52,14 +52,4 @@
 			defaultValue="true"
 			force="true"/>
-		<!-- end binary release core -->
-
-		<!-- start source release core -->
-		<target
-			target="Installing Source Code Core"
-			diskRequirement="@component.size.sourcecode-core@"
-			displayText=""
-			defaultValue="true"
-			/>
-		<!-- end source release core -->
 
 		<!-- start bundled components -->
@@ -77,13 +67,6 @@
 		<!-- end bundled components -->
 
-		<!-- start sourcecode -->
-		<target
-			target="Installing Source Code"
-			diskRequirement="@component.size.sourcecode@"
-			defaultValue="false"
-			displayText=""/>
-		<!-- end sourcecode -->
-
 	</page>
+	<!-- end binary release -->
 
 	<!-- start bundled components -->
Index: /release-kits/mark3/installer/build.xml
===================================================================
--- /release-kits/mark3/installer/build.xml	(revision 17785)
+++ /release-kits/mark3/installer/build.xml	(revision 17786)
@@ -67,41 +67,4 @@
 	</target>
 
-	<!-- sourcecode core system -->
-	<target name="Installing Source Code Core">
-
-		<echo>Installing Source Code Core</echo>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
-		<delete file="sourcecode-core.lzma"/>
-		<unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
-		<delete file="sourcecode-core.comp"/>
-
-		<echo>Setting up global properties</echo>
-		<copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
-
-		<echo>Setting up log4j properties</echo>
-		<copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
-		<rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
-
-		<echo>Creating installation properties file</echo>
-		<echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
-
-
-	</target>
-
-
-	<!-- Source -->
-	<target name="Installing Source Code" depends="">
-		<echo>Installing Source Code</echo>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
-		<sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
-		<delete file="sourcecode.lzma"/>
-		<unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
-		<delete file="sourcecode.comp"/>
-	</target>
-
 	<target name="Installing Tomcat">
 		<echo message="Installing Tomcat (packages/tomcat)"/>
Index: /release-kits/wirk2/ant-scripts/create-components.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/create-components.xml	(revision 17785)
+++ /release-kits/wirk2/ant-scripts/create-components.xml	(revision 17786)
@@ -15,6 +15,5 @@
 		<antcall target="prepare-imagemagick-component" />
 		<antcall target="prepare-ghostscript-component" />
-		<antcall target="prepare-sourcecode-component" />
-		<antcall target="prepare-sourcecode-core-component" />
+		<!--<antcall target="prepare-sourcecode-component" />-->
 	</target>
 	
@@ -23,6 +22,5 @@
 		<antcall target="compress-imagemagick-component" />
 		<antcall target="compress-ghostscript-component" />
-		<antcall target="compress-sourcecode-component" />
-		<antcall target="compress-sourcecode-core-component" />
+		<!--<antcall target="compress-sourcecode-component" />-->
 	</target>
 	
@@ -125,28 +123,3 @@
 	</target>
 
-	<target name="prepare-sourcecode-core-component">
-		<delete dir="components/tmp/sourcecode-core"/>
-		<mkdir dir="components/tmp/sourcecode-core"/>
-
-		<copy todir="components/tmp/sourcecode-core" overwrite="true">
-			<fileset dir="distributions/source">
-				<include name="macros/**/*"/>
-				<include name="images/**/*"/>
-				<include name="etc/**/*"/>
-				<include name="gli/**/*"/>
-				<include name="collect/**/*"/>
-				<include name="doc/**/*"/>
-				<include name="setup.bash"/>
-			</fileset>
-		</copy>
-		<zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
-	</target>
-	
-	<target name="compress-sourcecode-core-component">
-		<!--<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>-->
-		<exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec>
-	</target>
-
-	
-	
 </project>
Index: /release-kits/wirk2/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/create-distribution.xml	(revision 17785)
+++ /release-kits/wirk2/ant-scripts/create-distribution.xml	(revision 17786)
@@ -10,6 +10,4 @@
 		<antcall target="tweak-files" />
 		<antcall target="remove-unneeded-files-1" />
-
-		<antcall target="copy-web-to-source" /> <!-- from init -->
 
 		<antcall target="drop-in-binaries" />
Index: /release-kits/wirk2/installer/antinstall-config.xml
===================================================================
--- /release-kits/wirk2/installer/antinstall-config.xml	(revision 17785)
+++ /release-kits/wirk2/installer/antinstall-config.xml	(revision 17786)
@@ -42,4 +42,5 @@
 	</page>
 
+	<!-- start binary release -->
 	<page type="input" name="selector" displayText="">
 		<comment name="choose-components"/>
@@ -53,5 +54,4 @@
 			hidden="true"/>
 
-		<!-- start binary release core -->
 		<target
 			target="Installing Core System"
@@ -60,14 +60,4 @@
 			defaultValue="true"
 			force="true"/>
-		<!-- end binary release core -->
-
-		<!-- start source release core -->
-		<target
-			target="Installing Source Code Core"
-			diskRequirement="@component.size.sourcecode-core@"
-			displayText=""
-			defaultValue="true"
-			/>
-		<!-- end source release core -->
 
 		<target
@@ -91,12 +81,4 @@
 		<!-- end bundled components -->
 		
-		<!-- start sourcecode -->
-		<target
-			target="Installing Source Code"
-			diskRequirement="@component.size.sourcecode@"
-			defaultValue="false"
-			displayText=""/>
-		<!-- end sourcecode -->
-			
 	</page>
 
@@ -105,4 +87,5 @@
 		<text property="admin.password" defaultValue="" displayText=""/>
 	</page>
+	<!-- end binary release -->
 
 	<page type="progress" name="progress" showTargets="true" displayText=""/>
Index: /release-kits/wirk2/installer/build.xml
===================================================================
--- /release-kits/wirk2/installer/build.xml	(revision 17785)
+++ /release-kits/wirk2/installer/build.xml	(revision 17786)
@@ -107,53 +107,4 @@
 	</target>
 
-	<target name="Installing Source Code Core">
-
-		<!-- figure out the start menu path -->
-		<getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>		
-		<path id="startmenu.path.path" path="${startmenu.path}"/>
-		<pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
-
-		<echo>basedir: ${basedir}</echo>
-		<echo>installDir: ${installDir}</echo>
-		<echo>antinstaller.jar: ${antinstaller.jar}</echo>
-		<echo>startmenu.path: ${startmenu.path}</echo>
-
-		<!-- create the installation directory -->
-		<echo message="Creating Installation directory"/>
-		<mkdir dir="${installDir}"/>
-		
-		<!-- extract 7za tool -->
-		<unzip src="${antinstaller.jar}" dest="${basedir}">
-			<patternset><include name="7za.exe"/></patternset>
-		</unzip>
-
-		<!-- install files -->
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
-		<exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode-core.lzma"/></exec>
-		<delete file="sourcecode-core.lzma"/>
-		<unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
-		<delete file="sourcecode-core.comp"/>
-		
-		<echo message="Filling in concrete values in config files"/>
-		<rsr file="${installDir}/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
-				
-		<echo message="Creating installation properties file"/>
-		<echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
-		
-		<echo message="Finished"/>
-		
-	</target>
-
-	<!-- Source -->
-	<target name="Installing Source Code">
-		<echo message="Installing Source Code"/>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
-		<exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode.lzma"/></exec>
-		<!--<sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>-->
-		<delete file="sourcecode.lzma"/>
-			<unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
-		<delete file="sourcecode.comp"/>
-	</target>
-
 	<target name="Installing ImageMagick">
 		<echo message="Installing ImageMagick"/>
Index: /release-kits/wirk3/ant-scripts/create-components.xml
===================================================================
--- /release-kits/wirk3/ant-scripts/create-components.xml	(revision 17785)
+++ /release-kits/wirk3/ant-scripts/create-components.xml	(revision 17786)
@@ -15,8 +15,7 @@
 		<antcall target="prepare-imagemagick-component" />
 		<antcall target="prepare-ghostscript-component" />
-		<antcall target="prepare-sourcecode-component" />
 		<antcall target="prepare-ant-component" />
 		<antcall target="prepare-tomcat-component" />
-		<antcall target="prepare-sourcecode-core-component" />
+		<!--<antcall target="prepare-sourcecode-component" />-->
 	</target>
 	
@@ -25,8 +24,7 @@
 		<antcall target="compress-imagemagick-component" />
 		<antcall target="compress-ghostscript-component" />
-		<antcall target="compress-sourcecode-component" />
 		<antcall target="compress-ant-component" />
 		<antcall target="compress-tomcat-component" />
-		<antcall target="compress-sourcecode-core-component" />
+		<!--<antcall target="compress-sourcecode-component" />-->
 	</target>
 	
@@ -151,7 +149,5 @@
 		<exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 ant.lzma ant.comp"/></exec>
 	</target>
-	
-	
-	
+		
 	<target name="prepare-tomcat-component">
 		<delete dir="components/tmp/tomcat" quiet="true"/>
@@ -169,33 +165,4 @@
 		<exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 tomcat.lzma tomcat.comp"/></exec>
 	</target>	
-
-	<target name="prepare-sourcecode-core-component">
-		<delete dir="components/tmp/sourcecode-core"/>
-		<mkdir dir="components/tmp/sourcecode-core"/>
-
-		<copy todir="components/tmp/sourcecode-core" overwrite="true">
-			<fileset dir="distribution/source">
-				<include name="gli/**/*"/>
-				<include name="docs/**/*"/>
-				<include name="resources/**/*"/>
-				<include name="web/**/*"/>
-				<include name="gs2build/etc/**/*"/>
-				<include name="gs2build/setup.bash"/>
-				<include name="build.xml"/>
-				<include name="build.properties"/>
-				<include name="*.sh"/>
-				<include name="*.txt"/>
-			</fileset>
-		</copy>
-		<zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
-	</target>
-	
-	<target name="compress-sourcecode-core-component">
-		<!--<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>-->
-		<exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec>
-	</target>
-
-
-	
 	
 </project>
Index: /release-kits/wirk3/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/wirk3/ant-scripts/create-distribution.xml	(revision 17785)
+++ /release-kits/wirk3/ant-scripts/create-distribution.xml	(revision 17786)
@@ -10,6 +10,4 @@
 		<antcall target="insert-user-manual"/>
 
-		<antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
-
 		<ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
 			<property name="app.version" value="${version}"/>
@@ -17,4 +15,8 @@
 			<property name="branch.revision" value="${branch.revision}"/>
 		</ant>
+
+		<antcall target="insert-icon"/>
+		<antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
+
 		<ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
 			<property name="app.version" value="${version}"/>
@@ -29,6 +31,5 @@
 		<antcall target="copy-over-build-xml" />
 		<antcall target="insert-compiled-binaries"/>
-		<antcall target="insert-icon"/>
-		<antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
+
 	</target>
 
Index: /release-kits/wirk3/installer/antinstall-config.xml
===================================================================
--- /release-kits/wirk3/installer/antinstall-config.xml	(revision 17785)
+++ /release-kits/wirk3/installer/antinstall-config.xml	(revision 17786)
@@ -42,4 +42,5 @@
 	</page>
 
+	<!-- start binary release -->
 	<page type="input" name="selector" displayText="">
 		<comment name="choose-components"/>
@@ -53,5 +54,4 @@
 			hidden="true"/>
 
-		<!-- start binary release core -->
 		<target
 			target="Installing Core System"
@@ -60,14 +60,4 @@
 			defaultValue="true"
 			force="true"/>
-		<!-- end binary release core -->
-
-		<!-- start source release core -->
-		<target
-			target="Installing Source Code Core"
-			diskRequirement="@component.size.sourcecode-core@"
-			displayText=""
-			defaultValue="true"
-			/>
-		<!-- end source release core -->
 
 		<target
@@ -103,13 +93,6 @@
 		<!-- end bundled components -->
 			
-		<!-- start sourcecode -->
-		<target
-			target="Installing Source Code"
-			diskRequirement="@component.size.sourcecode@"
-			defaultValue="false"
-			displayText=""/>
-		<!-- end sourcecode -->
-
 	</page>
+	<!-- end binary release -->
 
 	<!-- start bundled components -->
Index: /release-kits/wirk3/installer/build.xml
===================================================================
--- /release-kits/wirk3/installer/build.xml	(revision 17785)
+++ /release-kits/wirk3/installer/build.xml	(revision 17786)
@@ -106,80 +106,4 @@
 	</target>
 
-	<target name="Installing Source Code Core">
-
-		<!-- figure out the start menu path -->
-		<getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>
-		<path id="startmenu.path.path" path="${startmenu.path}"/>
-		<pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
-				
-		<echo>basedir: ${basedir}</echo>
-		<echo>installDir: ${installDir}</echo>
-		<echo>antinstaller.jar: ${antinstaller.jar}</echo>
-		<echo>startmenu.path: ${startmenu.path}</echo>
-		
-		<!-- create the installation directory -->
-		<echo message="Creating Installation directory"/>
-		<mkdir dir="${installDir}"/>
-
-		<!-- extract 7za tool -->
-		<unzip src="${antinstaller.jar}" dest="${basedir}">
-			<patternset><include name="7za.exe"/></patternset>
-		</unzip>
-		
-		<!-- install files -->
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
-		<exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode-core.lzma"/></exec>
-		<delete file="sourcecode-core.lzma"/>
-		<unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
-		<delete file="sourcecode-core.comp"/>
-
-		<!-- change the tomcat ports in build.properties -->
-		<echo message="Changing tomcat ports in build.properties"/>
-		<rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
-		<rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
-		<echo message="Changing tomcat ports in resources/tomcat/server.xml"/>
-		<copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
-		
-		<!-- set gsdlhome in gs2build setup.bat -->
-		<echo message="Setting %GSDLHOME% in gs2build\setup.bat"/>
-		<rsr file="${installDir}/gs2build/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir.local}\gs2build" />
-		<!-- copy the greenstone3.xml file to tomcat -->
-		<echo message="Copying greenstone3.xml to tomcat directory"/>
-		<copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
-		<rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}\web" />
-
-		<!-- set up global properties -->
-		<echo message="Setting up global properties"/>
-		<copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties">
-			<job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
-			<job pattern="@tomcat.server@" replacement="${tomcat.server}" />
-			<job pattern="@tomcat.port@" replacement="${tomcat.port}" />
-		</rsr>
-
-		<!-- set up log4j properties-->
-		<echo message="Setting up log4j properties"/>
-		<copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
-		<rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.unix}/web"/>
-
-		<!-- delete unneeded files -->	    
-		<delete dir="${installDir}/resources/icons"/>
-		<delete file="${installDir}/resources/*.png"/>
-		
-		<echo message="Creating installation properties file"/>
-		<echo file="${installDir}\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
-		
-	</target>
-
-
-	<!-- Source -->
-	<target name="Installing Source Code">
-		<echo message="Installing Source Code (src)"/>
-		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
-		<exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode.lzma"/></exec>
-		<delete file="sourcecode.lzma"/>
-		<unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
-		<delete file="sourcecode.comp"/>
-	</target>
 
 	<target name="Installing Tomcat">
