Index: release-kits/wirk2/ant-scripts/wrap.xml
===================================================================
--- release-kits/wirk2/ant-scripts/wrap.xml	(revision 19539)
+++ release-kits/wirk2/ant-scripts/wrap.xml	(revision 19586)
@@ -12,10 +12,10 @@
 	<target name="copy-files-for-wrapping">
 		<!--create a directory to build the wrapped installer in -->
-		<mkdir dir="${basedir}/wrapped-installer/build"/>
+		<mkdir dir="${basedir}/wrapped-installer"/>
 		
 		<!-- copy source files -->
-		<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/>
-		<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/core/search4j/libsearch4j.cpp" overwrite="true"/>
-		<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/core/search4j/libsearch4j.h" overwrite="true"/>
+		<copy todir="${basedir}/wrapped-installer" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/>
+		<copy todir="${basedir}/wrapped-installer" file="${wirk2.home}/core/search4j/libsearch4j.cpp" overwrite="true"/>
+		<copy todir="${basedir}/wrapped-installer" file="${wirk2.home}/core/search4j/libsearch4j.h" overwrite="true"/>
 
 	</target>
@@ -23,5 +23,5 @@
 	<target name="tweak-files-for-wrapping">
 		<echo>Substitute concrete values of things into source files</echo>
-		<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp">
+		<rsr file="${basedir}/wrapped-installer/wrapper.cpp">
 			<job pattern="@java.installer@" replacement="${windows-java.installer}"/>
 			<job pattern="@java.min.version@" replacement="${java.min.version}"/>
@@ -36,8 +36,8 @@
 			
 			<echo>getting the template resource script</echo>
-			<copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
+			<copy todir="${basedir}/wrapped-installer" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
 			
 			<echo>copying the small resource files into place</echo>
-			<copy todir="${basedir}/wrapped-installer/build" overwrite="true">
+			<copy todir="${basedir}/wrapped-installer" overwrite="true">
 				<fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
 				<fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
@@ -45,25 +45,25 @@
 			</copy>
 			
+			<echo>adding ${windows-java.installer} to the copy as chunks</echo>
+			<rsplit
+				resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
+				outputDir="${basedir}/wrapped-installer"					
+				resourceScript="${basedir}/wrapped-installer/wrapper.rc"
+				resourceName="JAVA"
+				resourceType="EXE"
+				chunkSize="${resources.chunksize}"/>
+				
 			<echo>adding greenstone2.jar to the resource script as chunks</echo>
 			<rsplit
 				resource="${basedir}/installer/Greenstone-${version}-win32.jar"
-				outputDir="${basedir}/wrapped-installer/build"
-				resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
+				outputDir="${basedir}/wrapped-installer"
+				resourceScript="${basedir}/wrapped-installer/wrapper.rc"
 				resourceName="JAR"
 				resourceType="JAR"
 				chunkSize="${resources.chunksize}"
 				/>
-			
-			<echo>adding ${windows-java.installer} to the copy as chunks</echo>
-			<rsplit
-				resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
-				outputDir="${basedir}/wrapped-installer/build"					
-				resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
-				resourceName="JAVA"
-				resourceType="EXE"
-				chunkSize="${resources.chunksize}"/>
-			
-			<echo>resource compiling the generated resource script</echo>
-			<exec executable="rc" dir="${basedir}/wrapped-installer/build">
+				
+			<echo>resource compiling the resource script</echo>
+			<exec executable="rc" dir="${basedir}/wrapped-installer">
 				<arg line="wrapper.rc"/>
 			</exec>
@@ -72,9 +72,9 @@
 
 	<target name="compile-wrapper">
-		<exec executable="cl" dir="${basedir}/wrapped-installer/build">
+		<exec executable="cl" dir="${basedir}/wrapped-installer">
 			<arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/>
 		</exec>
 
-		<exec executable="cl" dir="${basedir}/wrapped-installer/build">
+		<exec executable="cl" dir="${basedir}/wrapped-installer">
 			<arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
 		</exec>
@@ -82,16 +82,9 @@
 	
 	<target name="link-wrapper">
-		<exec executable="link" dir="${basedir}/wrapped-installer/build">
-			<arg line="/OUT:..\..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
+		<mkdir dir="products"/>
+		<exec executable="link" dir="${basedir}/wrapped-installer">
+			<arg line="/OUT:..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
 		</exec>
 	</target>
 
-	<target name="archive-cdrom-components-and-installer">
-		<mkdir dir="products"/>
-		<tar destfile="products/cdrom-components-${version}-linux.tar.gz" compression="gzip">
-			<tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset>
-			<tarfileset dir="wrapped-installer"><include name="cdrom-windows.exe"/></tarfileset>
-		</tar>
-	</target>
-
 </project>
