Index: release-kits/lirk2/ant-scripts/create-installer.xml
===================================================================
--- release-kits/lirk2/ant-scripts/create-installer.xml	(revision 19503)
+++ release-kits/lirk2/ant-scripts/create-installer.xml	(revision 19510)
@@ -6,5 +6,5 @@
 		<antcall target="make-installer-files-concrete"><param name="java.os" value="linux"/></antcall> <!-- from init -->
 		<antcall target="compile-binary-installer"/> <!-- from init -->
-		<antcall target="compile-minimal-installer"/> <!-- from init -->
+		<antcall target="compile-cdrom-installer"/> <!-- from init -->
 	</target>
 
Index: release-kits/lirk2/ant-scripts/wrap.xml
===================================================================
--- release-kits/lirk2/ant-scripts/wrap.xml	(revision 19503)
+++ release-kits/lirk2/ant-scripts/wrap.xml	(revision 19510)
@@ -4,5 +4,7 @@
 	<target name="wrap">
 		<antcall target="setup-for-wrapping"/>
-		<antcall target="compile-wrapper"/>
+		<antcall target="create-objects"/>
+		<antcall target="compile-wrapper-web"/>
+		<antcall target="compile-wrapper-cdrom"/>
 	</target>
 
@@ -11,61 +13,97 @@
 
 		<!-- create and setup the build directory -->
-		<mkdir dir="${basedir}/wrapped-installer/build"/>
-		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/>
-		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/core/search4j/libsearch4j.cpp"/>
-		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/core/search4j/libsearch4j.h"/>
+		<mkdir dir="${basedir}/wrapped-installer"/>
+		<copy todir="${basedir}/wrapped-installer" file="${lirk2.home}/linux/wrapper.cpp"/>
+		<copy todir="${basedir}/wrapped-installer" file="${lirk2.home}/core/search4j/libsearch4j.cpp"/>
+		<copy todir="${basedir}/wrapped-installer" file="${lirk2.home}/core/search4j/libsearch4j.h"/>
 
 		<!-- copy bundled files -->
-		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${linux-java.installer}"/>
-		<copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/Greenstone-${version}-linux.jar"/>
+		<copy todir="${basedir}/wrapped-installer" file="${lirk2.home}/linux/${linux-java.installer}"/>
+		<copy tofile="${basedir}/wrapped-installer/greenstone2.jar" file="${basedir}/installer/Greenstone-${version}-linux.jar"/>
 
 		<!-- substitute in real values -->
-		<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="greenstone2"/>
-		<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}"/>
+		<rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
+		<rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@installer.name@" replacement="greenstone2"/>
+		<rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
+		<rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
 
 	</target>
 
-	<target name="compile-wrapper">
+	<target name="create-objects">
 
 		<echo level="info">create an object file (extension .o) for each file to bundle</echo>
-		<!-- jar -->
-		<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
+		<!-- jar (web) -->
+		<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer">
 			<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/>
 		</exec>
+		<!-- jar (cdrom) -->
+		<exec executable="/usr/bin/objcopy" dir="installer">
+			<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_cdrom_jar_start=greenstone2jar --readonly-text cdrom.jar ../wrapped-installer/cdrom.jar.o"/>
+		</exec>
 		<!-- java -->
-		<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
+		<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer">
 			<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">compile libsearch4j</echo>
+		<exec executable="g++" dir="wrapped-installer">
+			<arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
+		</exec>
+
+	</target>
+
+	<target name="calculate-object-sizes">
+
 		<echo level="info">working out the size of the objects</echo>
-		<!-- jar -->
-		<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec>
+		<!-- jar(web) -->
+		<exec executable="ls" dir="wrapped-installer" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec>
 		<exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
+		<!-- jar(cdrom) -->
+		<exec executable="ls" dir="installer" outputproperty="cdrom.jar.ls"><arg line="-l cdrom.jar"/></exec>
+		<exec executable="sed" inputstring="${cdrom.jar.ls}" outputproperty="cdrom.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
+
 		<!-- java -->
-		<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
+		<exec executable="ls" dir="wrapped-installer" 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>
+
+	</target>
+
+	<target name="compile-wrapper-web" depends="calculate-object-sizes">
 
 		<echo level="info">creating wrapper header file</echo>
 		<delete file="wrapper.h"/>
-		<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.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">compile libsearch4j</echo>
-		<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-			<arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
-		</exec>
+		<exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec>
+		<exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
+		<exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
 
 		<echo level="info">compile the wrapper program</echo>
-		<exec executable="g++" dir="${basedir}/wrapped-installer/build">
+		<exec executable="g++" dir="wrapped-installer">
 			<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
 		</exec>
 
 		<echo level="info">link the compiled code and bundled files</echo>
-		<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-			<arg line="-static -static-libgcc -o ../../products/Greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o java.o"/>
+		<exec executable="g++" dir="${basedir}/wrapped-installer">
+			<arg line="-static -static-libgcc -o ../products/Greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o java.o"/>
+		</exec>
+
+	</target>
+
+	<target name="compile-wrapper-cdrom" depends="calculate-object-sizes">
+
+		<echo level="info">creating wrapper header file</echo>
+		<delete file="wrapper.h"/>
+		<exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h"><arg line="extern const char greenstone2jar[${cdrom.jar.size}];"/></exec>
+		<exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
+		<exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
+
+		<echo level="info">compile the wrapper program</echo>
+		<exec executable="g++" dir="wrapped-installer">
+			<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
+		</exec>
+
+		<echo level="info">link the compiled code and bundled files</echo>
+		<exec executable="g++" dir="${basedir}/wrapped-installer">
+			<arg line="-static -static-libgcc -o ../products/cdrom-linux.bin wrapper.o libsearch4j.o cdrom.jar.o java.o"/>
 		</exec>
 
Index: release-kits/lirk2/installer/build.xml
===================================================================
--- release-kits/lirk2/installer/build.xml	(revision 19503)
+++ release-kits/lirk2/installer/build.xml	(revision 19510)
@@ -49,6 +49,6 @@
 		<!-- start cdrom -->
 		<copy todir="${installDir}">
-			<fileset dir="${cd.dir}/Software/core/all"/>
-			<fileset dir="${cd.dir}/Software/core/linux"/>
+			<fileset dir="${orig.dir}/Software/core/all"/>
+			<fileset dir="${orig.dir}/Software/core/linux"/>
 		</copy>
 		<!-- end cdrom -->
@@ -107,4 +107,5 @@
 	<target name="Installing ImageMagick">
 		<echo>Installing ImageMagick</echo>
+		<!-- start web -->
 		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
 		<sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
@@ -112,56 +113,15 @@
 		<unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
 		<delete file="imagemagick.comp"/>
-		
+		<!-- end web -->
+
+		<!-- start cdrom -->
+		<copy todir="${installDir}/bin/linux">
+			<fileset dir="${orig.dir}/Software/imagemagick/linux"/>
+		</copy>
+		<!-- end cdrom -->
+
 		<echo>Setting ImageMagick Binaries to Executable</echo>
 		<chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
 		
-	</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 Binaries to Executable</echo>
-		<chmod dir="${installDir}" includes="*.sh,*.bash,**/configure" perm="775"/>
-		<chmod dir="${installDir}/bin/linux" includes="*" perm="775"/>
-		<chmod dir="${installDir}/bin" includes="*" perm="775"/>
-		<chmod dir="${installDir}/cgi-bin" includes="*" perm="775"/>
-		<chmod dir="${installDir}/bin/script" includes="**/*" perm="775"/>
-		<chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
-		<echo/>
-
-		<echo>Filling in concrete values in config files</echo>
-		<rsr file="${installDir}/cgi-bin/gsdlsite.cfg">
-			<job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
-			<job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
-			<job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
-		</rsr>
-		<echo/>
-
-		<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>
-
-		<echo>Create usage.txt</echo>
-		<echo file="${installDir}/etc/usage.txt"></echo>
-
-		<echo>Creating installation properties file</echo>
-		<echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
-
 	</target>
 
