Index: release-kits/shared/ant-scripts/init.xml
===================================================================
--- release-kits/shared/ant-scripts/init.xml	(revision 17881)
+++ release-kits/shared/ant-scripts/init.xml	(revision 17898)
@@ -3,5 +3,5 @@
 
 	<!-- load in static properties from build.properties -->
-	<property file="build.properties" />
+	<property file="${rk.name}-build.properties" />
 
 	<!-- CONSTANTS (overridable in build.properties) -->
@@ -52,17 +52,22 @@
 
 		<!-- our classes -->
-		<fileset dir="${rk.home}/ant-scripts/tasks">
-			<include name="**/*.jar"/>
-		</fileset>
-
-		<!-- jars in lib directory -->
-		<fileset dir="${rk.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-
-		<!-- a few ant-installer jars -->
-		<fileset dir="${rk.home}/packages/ant-installer/lib">
-			<include name="ant-installer-ext.jar"/>
-			<include name="ant-installer.jar"/>
+		<fileset dir="${rk.home}">
+			<include name="ant-scripts/tasks/antelope/AntelopeTasks_3.4.2.jar"/>
+			<include name="ant-scripts/tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/>
+			<include name="ant-scripts/tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/ganymed.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/svnClientAdapter.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/svnant.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/svnjavahl.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/svnkit.jar"/>
+			<include name="ant-scripts/tasks/greenstone/anttasks.jar"/>
+			<include name="ant-scripts/tasks/7z-ant/7z.jar"/>
+			<include name="lib/crypt.jar"/>
+			<include name="lib/serializer.jar"/>
+			<include name="lib/xalan.jar"/>
+			<include name="lib/xercesImpl.jar"/>
+			<include name="lib/xml-apis.jar"/>
+			<include name="packages/ant-installer/lib/ant-installer-ext.jar"/>
+			<include name="packages/ant-installer/lib/ant-installer.jar"/>
 		</fileset>
 
@@ -118,5 +123,6 @@
 				<not><isset property="version"/></not>
 			</bool>
-			<fail>Version number not set</fail>
+			<fail>Version number not set.
+Check that the file '${rk.name}-build.properties' exists and defines property 'version'.</fail>
 		</if>
 		<property name="app.version" value="${version}"/>
@@ -224,4 +230,5 @@
 	</target>
 
+	<!-- fork the web distribution to preserve a source release -->
 	<target name="copy-web-to-source">
 		<copy todir="distributions/source"><fileset dir="distributions/web"/></copy>
@@ -415,3 +422,46 @@
 	</target>
 
+	<!-- shared target to compile the uninstaller -->
+	<target name="compile-uninstaller">
+		<echo>Compiling Uninstaller</echo>
+
+		<!-- create working build directory -->
+		<mkdir dir="${basedir}/compiled/uninstaller/build/resources" />
+
+		<!-- copile to build -->
+		<javac
+			srcdir="${rk.home}/uninstaller"
+			destdir="${basedir}/compiled/uninstaller/build" />
+
+		<!-- copy language bundle into place -->
+		<native2ascii
+			implementation="sun"
+			src="${rk.home}/language-strings"
+			dest="${basedir}/compiled/uninstaller/build/resources"/>
+
+		<!-- jar it all up -->
+		<jar
+			destfile="${basedir}/compiled/uninstaller/uninst.jar"
+			manifest="${rk.home}/uninstaller/manifest.mf"
+			basedir="${basedir}/compiled/uninstaller/build" />
+
+	</target>
+
+	<!-- copy the uninstaller from the compiled directory to web distribution -->
+	<target name="insert-uninstaller">
+		<copy file="compiled/uninstaller/uninst.jar" todir="distributions/web" />
+		<copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" />
+	</target>
+
+	<!-- creates the comp for the source release, works for all release kits -->
+	<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"/>
+	</target>
+
 </project>
