Index: release-kits/lirk3/ant-scripts/create-components.xml
===================================================================
--- release-kits/lirk3/ant-scripts/create-components.xml	(revision 17652)
+++ release-kits/lirk3/ant-scripts/create-components.xml	(revision 17659)
@@ -30,4 +30,6 @@
 
 	<!-- 3rd level -->
+
+	<!-- core -->
 	<target name="prepare-core-component">
 
@@ -64,11 +66,4 @@
 		</copy>
 		
-		<!-- do some cleanup -->
-<!--		<delete dir="components/tmp/core/gs2build/common-src"/>
-		<delete dir="components/tmp/core/gs2build/build-src"/>
-		<delete dir="components/tmp/core/gs2build/runtime-src"/>
-		<delete dir="components/tmp/core/gs2build/bin/windows/imagemagick"/>
-		<delete dir="components/tmp/core/gs2build/bin/windows/ghostscript"/>-->
-				
 		<zip destfile="components/core.comp" basedir="components/tmp/core" compress="false" />
 	</target>
@@ -77,80 +72,6 @@
 		<sevenzip task="encode" input="components/core.comp" output="components/core.lzma" dictionnary="26"/>
 	</target>
-	
-	<target name="prepare-sourcecode-component">
 
-		<delete dir="components/tmp/sourcecode"/>
-		<mkdir dir="components/tmp/sourcecode"/>
-
-		<copy todir="components/tmp/sourcecode" overwrite="true">
-				<fileset dir="distribution/greenstone3">
-					<include name="src/**/*"/>
-					<include name="gs2build/common-src/**/*"/>
-					<include name="gs2build/build-src/**/*"/>
-					<include name="gs2build/runtime-src/**/*"/>
-				</fileset>
-		</copy>
-				
-		<zip destfile="components/sourcecode.comp" basedir="components/tmp/sourcecode" compress="false" />
-	</target>
-		
-	<target name="compress-sourcecode-component">
-		<sevenzip task="encode" input="components/sourcecode.comp" output="components/sourcecode.lzma" dictionnary="26"/>
-	</target>
-	
-	<target name="prepare-ant-component">
-
-		<delete dir="components/tmp/ant"/>
-		<mkdir dir="components/tmp/ant"/>
-
-		<copy todir="components/tmp/ant" overwrite="true">
-			<fileset dir="distribution/greenstone3/packages">
-				<include name="ant/**/*"/>
-			</fileset>
-		</copy>
-		
-		<zip destfile="components/ant.comp" basedir="components/tmp/ant" compress="false" />
-	</target>
-		
-	<target name="compress-ant-component">
-		<sevenzip task="encode" input="components/ant.comp" output="components/ant.lzma" dictionnary="26"/>
-	</target>
-	
-	<target name="prepare-tomcat-component">
-
-		<delete dir="components/tmp/tomcat"/>
-		<mkdir dir="components/tmp/tomcat"/>
-
-		<copy todir="components/tmp/tomcat" overwrite="true">
-			<fileset dir="distribution/greenstone3/packages">
-				<include name="tomcat/**/*"/>
-			</fileset>
-		</copy>
-		
-		<zip destfile="components/tomcat.comp" basedir="components/tmp/tomcat" compress="false" />
-	</target>
-		
-	<target name="compress-tomcat-component">
-		<sevenzip task="encode" input="components/tomcat.comp" output="components/tomcat.lzma" dictionnary="26"/>
-	</target>
-
-	<target name="prepare-imagemagick-component">
-
-		<delete dir="components/tmp/imagemagick"/>
-		<mkdir dir="components/tmp/imagemagick"/>
-
-		<copy todir="components/tmp/imagemagick" overwrite="true">
-			<fileset dir="distribution/greenstone3/gs2build/bin/linux">
-				<include name="imagemagick/**/*"/>
-			</fileset>
-		</copy>
-				
-		<zip destfile="components/imagemagick.comp" basedir="components/tmp/imagemagick" compress="false" includes="**/*"/>
-	</target>
-		
-	<target name="compress-imagemagick-component">
-		<sevenzip task="encode" input="components/imagemagick.comp" output="components/imagemagick.lzma" dictionnary="26"/>
-	</target>
-
+	<!-- sourcecode-core -->
 	<target name="prepare-sourcecode-core-component">
 		<delete dir="components/tmp/sourcecode-core"/>
@@ -177,4 +98,83 @@
 		<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
 	</target>
+	
+	<!-- sourcecode -->
+	<target name="prepare-sourcecode-component">
+
+		<delete dir="components/tmp/sourcecode"/>
+		<mkdir dir="components/tmp/sourcecode"/>
+
+		<copy todir="components/tmp/sourcecode" overwrite="true">
+				<fileset dir="distribution/greenstone3">
+					<include name="src/**/*"/>
+					<include name="gs2build/common-src/**/*"/>
+					<include name="gs2build/build-src/**/*"/>
+					<include name="gs2build/runtime-src/**/*"/>
+				</fileset>
+		</copy>
+				
+		<zip destfile="components/sourcecode.comp" basedir="components/tmp/sourcecode" compress="false" />
+	</target>
+		
+	<target name="compress-sourcecode-component">
+		<sevenzip task="encode" input="components/sourcecode.comp" output="components/sourcecode.lzma" dictionnary="26"/>
+	</target>
+
+	<!-- ant -->	
+	<target name="prepare-ant-component">
+
+		<delete dir="components/tmp/ant"/>
+		<mkdir dir="components/tmp/ant"/>
+
+		<copy todir="components/tmp/ant" overwrite="true">
+			<fileset dir="distribution/greenstone3/packages">
+				<include name="ant/**/*"/>
+			</fileset>
+		</copy>
+		
+		<zip destfile="components/ant.comp" basedir="components/tmp/ant" compress="false" />
+	</target>
+		
+	<target name="compress-ant-component">
+		<sevenzip task="encode" input="components/ant.comp" output="components/ant.lzma" dictionnary="26"/>
+	</target>
+	
+	<!-- tomcat -->
+	<target name="prepare-tomcat-component">
+
+		<delete dir="components/tmp/tomcat"/>
+		<mkdir dir="components/tmp/tomcat"/>
+
+		<copy todir="components/tmp/tomcat" overwrite="true">
+			<fileset dir="distribution/greenstone3/packages">
+				<include name="tomcat/**/*"/>
+			</fileset>
+		</copy>
+		
+		<zip destfile="components/tomcat.comp" basedir="components/tmp/tomcat" compress="false" />
+	</target>
+		
+	<target name="compress-tomcat-component">
+		<sevenzip task="encode" input="components/tomcat.comp" output="components/tomcat.lzma" dictionnary="26"/>
+	</target>
+
+	<!-- imagemagick -->
+	<target name="prepare-imagemagick-component">
+
+		<delete dir="components/tmp/imagemagick"/>
+		<mkdir dir="components/tmp/imagemagick"/>
+
+		<copy todir="components/tmp/imagemagick" overwrite="true">
+			<fileset dir="distribution/greenstone3/gs2build/bin/linux">
+				<include name="imagemagick/**/*"/>
+			</fileset>
+		</copy>
+				
+		<zip destfile="components/imagemagick.comp" basedir="components/tmp/imagemagick" compress="false" includes="**/*"/>
+	</target>
+		
+	<target name="compress-imagemagick-component">
+		<sevenzip task="encode" input="components/imagemagick.comp" output="components/imagemagick.lzma" dictionnary="26"/>
+	</target>
 
 </project>
