Index: release-kits/mark2/ant-scripts/create-installer.xml
===================================================================
--- release-kits/mark2/ant-scripts/create-installer.xml	(revision 19480)
+++ release-kits/mark2/ant-scripts/create-installer.xml	(revision 19510)
@@ -6,5 +6,5 @@
 		<antcall target="make-installer-files-concrete"/>  <!-- 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/mark2/ant-scripts/wrap.xml
===================================================================
--- release-kits/mark2/ant-scripts/wrap.xml	(revision 19480)
+++ release-kits/mark2/ant-scripts/wrap.xml	(revision 19510)
@@ -3,17 +3,38 @@
 
 	<target name="wrap">
+
+		<!-- create products directory -->
+		<mkdir dir="products"/>
+
 		<!-- create and setup the build directory -->
 		<delete dir="${basedir}/wrapped-installer"/>
 		<mkdir dir="${basedir}/wrapped-installer"/>
-		<copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
-		<copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
-		<chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
 
-		<!-- copy bundled files -->
-		<copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/>
+		<!-- create app for main installer -->
+			<copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
+			<copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
+			<chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
 
-		<!-- substitute in real values -->
-		<rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/>
-		<rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
+			<!-- copy bundled files -->
+			<copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/>
+
+			<!-- substitute in real values -->
+			<rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/>
+			<rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
+
+
+		<!-- create app for cdrom installer -->
+			<copy todir="${basedir}/products/cdrom.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
+			<copy todir="${basedir}/products/cdrom.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
+			<chmod file="${basedir}/products/cdrom.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
+
+			<!-- copy bundled files -->
+			<copy todir="${basedir}/products/cdrom.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
+
+			<!-- substitute in real values -->
+			<rsr file="${basedir}/products/cdrom.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
+			<rsr file="${basedir}/products/cdrom.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
+
+		<!-- wrap main app in a dmg -->
 
 		<!-- get size of app -->
@@ -25,6 +46,4 @@
 		<echo>dmg.size: ${dmg.size}</echo>
 
-		<!-- create products directory -->
-		<mkdir dir="products"/>
 
 		<!-- create disk image -->
Index: release-kits/mark2/installer/build.xml
===================================================================
--- release-kits/mark2/installer/build.xml	(revision 19480)
+++ release-kits/mark2/installer/build.xml	(revision 19510)
@@ -29,4 +29,5 @@
 
 		<echo>Installing Core Files</echo>
+		<!-- start web -->
 		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
 		<sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>
@@ -34,4 +35,12 @@
 		<unzip src="${basedir}/core.comp" dest="${installDir}"/>
 		<delete file="core.comp"/>
+		<!-- end web -->
+
+		<!-- start cdrom -->
+		<copy todir="${installDir}">
+			<fileset dir="${orig.dir}/Software/core/all"/>
+			<fileset dir="${orig.dir}/Software/core/mac"/>
+		</copy>
+		<!-- end cdrom -->
 
 		<echo message="Setting Binaries to Executable"/>
@@ -80,4 +89,5 @@
 	<target name="Installing ImageMagick" depends="">
 		<echo message="Installing ImageMagick"/>
+		<!-- 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"/>
@@ -85,4 +95,12 @@
 		<unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/darwin" />
 		<delete file="imagemagick.comp"/>
+		<!-- end web -->
+
+		<!-- start cdrom -->
+		<copy todir="${installDir}/bin/darwin">
+			<fileset dir="${orig.dir}/Software/imagemagick/mac"/>
+		</copy>
+		<!-- start cdrom -->
+
 		<chmod dir="${installDir}/bin/darwin/imagemagick/bin" includes="*" perm="775"/>
 	</target>
@@ -91,4 +109,5 @@
 	<target name="Installing Ghostscript" depends="">
 		<echo message="Installing Ghostscript"/>
+		<!-- start web -->
 		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
 		<sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/>
@@ -96,44 +115,14 @@
 		<unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/darwin" />
 		<delete file="ghostscript.comp"/>
-		<chmod dir="${installDir}/bin/darwin/ghostscript/bin" includes="*" perm="775"/>
-	</target>
+		<!-- end web -->
+
+		<!-- start cdrom -->
+		<copy todir="${installDir}/bin/darwin">
+			<fileset dir="${orig.dir}/Software/ghostscript/mac"/>
+		</copy>
+		<!-- start cdrom -->
 
 
-	<target name="Source Release" depends="">
-
-		<!-- create the installation directory -->
-		<echo message="Creating Installation directory"/>
-		<mkdir dir="${installDir}"/>
-
-		<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 message="Setting Binaries to Executable"/>
-		<chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/>
-		<chmod dir="${installDir}/bin/darwin" 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 message="Filling in concrete values in config files"/>
-		<rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
-		<rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/>
-		<rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/>
-		<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>
-
-		<echo message="Finished"/>
-
+		<chmod dir="${installDir}/bin/darwin/ghostscript/bin" includes="*" perm="775"/>
 	</target>
 
