Index: other-projects/expeditee-release-kits/Wrapper.app/Contents/Info.plist
===================================================================
--- other-projects/expeditee-release-kits/Wrapper.app/Contents/Info.plist	(revision 28695)
+++ other-projects/expeditee-release-kits/Wrapper.app/Contents/Info.plist	(revision 28695)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+
+	<key>CFBundleName</key>
+	<string>@projectname@@version@</string>
+
+	<key>CFBundleVersion</key>
+	<string>@version@</string>
+
+	<key>CFBundleAllowMixedLocalizations</key>
+	<string>true</string>
+
+	<key>CFBundleExecutable</key>
+	<string>JavaApplicationStub</string>
+
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+
+	<key>CFBundleGetInfoString</key>
+	<string>@version@</string>
+
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+
+	<key>CFBundleIconFile</key>
+	<string>icon.icns</string>
+
+	<key>Java</key>
+	<dict>
+
+		<key>MainClass</key>
+		<string>org.tp23.antinstaller.selfextract.NonExtractor</string>
+
+		<key>JVMVersion</key>
+		<string>1.4+</string>
+
+		<key>ClassPath</key>
+		<string>$JAVAROOT/@jar@</string>
+
+		<key>WorkingDirectory</key>
+		<string>/tmp</string>
+
+	        <key>VMOptions</key>
+        	<string>-Xmx200M</string>
+
+		<key>Properties</key> 
+		<dict>
+			<key>apple.laf.useScreenMenuBar</key>
+			<string>true</string>
+			<key>orig.dir</key>
+			<string>$APP_PACKAGE/..</string>
+		</dict>
+
+	</dict>
+
+</dict>
+</plist>
Index: other-projects/expeditee-release-kits/Wrapper.app/Contents/PkgInfo
===================================================================
--- other-projects/expeditee-release-kits/Wrapper.app/Contents/PkgInfo	(revision 28695)
+++ other-projects/expeditee-release-kits/Wrapper.app/Contents/PkgInfo	(revision 28695)
@@ -0,0 +1,1 @@
+APPLnull
Index: other-projects/expeditee-release-kits/bin/rk
===================================================================
--- other-projects/expeditee-release-kits/bin/rk	(revision 28695)
+++ other-projects/expeditee-release-kits/bin/rk	(revision 28695)
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+function show_title() {
+	echo "RK_HOME: $RK_HOME"
+	echo "O---------------------------------------------O"
+	echo 
+	echo "   $rk_name ";
+	echo "   $rk_fullname ";
+	echo 
+	echo "O---------------------------------------------O"
+
+}
+
+function show_help {
+	echo "usage: {rke|rk2|rk3|sork2|sork2|cdrk2|derk} [-help|-cmd] [ANT_ARGS]"
+	echo "	-help       show this help screen"
+	echo "	-cmd        show the ant command being used by the releas kit"
+	echo "	ANT_ARGS    additional arguments to be passed to ant"
+}
+
+#determine requested release kit
+rk_name="$(basename $0)"
+export RK_HOME="$(cd "$(dirname "$0")/.." && pwd)"
+
+if [ "$rk_name" == "rke" ]; then
+	rk_fullname="Release Kit for Expeditee"
+elif [ "$rk_name" == "rk2" ]; then
+	rk_fullname="Release Kit for Greenstone2"
+elif [ "$rk_name" == "rk3" ]; then
+        rk_fullname="Release Kit for Greenstone3"
+elif [ "$rk_name" == "sork2" ]; then
+        rk_fullname="Source Code Release Kit for Greenstone2"
+elif [ "$rk_name" == "sork3" ]; then
+        rk_fullname="Source Code Release Kit for Greenstone3"
+elif [ "$rk_name" == "cdrk2" ]; then
+        rk_fullname="CD-ROM Release Kit for Greenstone2"
+elif [ "$rk_name" == "derk" ]; then
+        rk_fullname="Documented Examples Release Kit"
+else
+	show_help
+	exit
+fi
+
+#make sure ant has enough memory
+export ANT_OPTS=-Xmx1024M
+
+#create the command
+toexec="ant -lib \"`pwd`/installer/classes\" -f \"$RK_HOME/kits/$rk_name/ant-scripts/build.xml\" \"-Dbasedir=`pwd`\" \"-Drk.home=$RK_HOME\" \"-Drk.name=$rk_name\""
+
+#pass on the arguments
+while [ "$1" != "" ]; do
+
+	if [ "$1" == "-help" ]; then
+		show_help
+		exit
+	elif [ "$1" == "-cmd" ]; then
+		show_cmd=true
+	else
+		toexec="$toexec \"$1\""
+	fi
+	shift
+
+done
+
+#show the command to be executed
+if [ "$show_cmd" == "true" ]; then
+	echo $toexec
+#execute
+else
+	show_title | tee ${rk_name}.out
+	$toexec 2>&1 | tee -a ${rk_name}.out
+fi
+
Index: other-projects/expeditee-release-kits/bin/rk.bat
===================================================================
--- other-projects/expeditee-release-kits/bin/rk.bat	(revision 28695)
+++ other-projects/expeditee-release-kits/bin/rk.bat	(revision 28695)
@@ -0,0 +1,12 @@
+@echo off
+set RELEASE_DIR=%CD%
+echo RELEASE_DIR:%RELEASE_DIR%
+pushd "%CD%"
+CD /D "%~dp0\.."
+
+@echo on
+cmd.exe /c ant -f "%CD%\kits\%RK_NAME%\ant-scripts\build.xml" "-Drk.home=%CD%" "-Drk.name=%RK_NAME%" "-Dbasedir=%RELEASE_DIR%" -lib "%RELEASE_DIR%/installer/classes" %* | "%CD%\shared\windows\utils\tee.exe" "%RELEASE_DIR%\%RK_NAME%.out"
+
+:end
+
+popd
Index: other-projects/expeditee-release-kits/bin/rke
===================================================================
--- other-projects/expeditee-release-kits/bin/rke	(revision 28695)
+++ other-projects/expeditee-release-kits/bin/rke	(revision 28695)
@@ -0,0 +1,1 @@
+link rk
Index: other-projects/expeditee-release-kits/bin/rke.bat
===================================================================
--- other-projects/expeditee-release-kits/bin/rke.bat	(revision 28695)
+++ other-projects/expeditee-release-kits/bin/rke.bat	(revision 28695)
@@ -0,0 +1,3 @@
+cho off
+set RK_NAME=%0
+%~dp0\rk.bat %*
Index: other-projects/expeditee-release-kits/kits/rke/ant-scripts/build.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/ant-scripts/build.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/ant-scripts/build.xml	(revision 28695)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+		..........................................................
+		September 2009
+		Release Kit for Greenstone2 (rk2)
+		Oran Fry
+		..........................................................
+-->
+
+<project name="rke-build" default="rke">
+
+	<!-- IMPORT OTHER ANT SCRIPTS -->
+	<!--<import file="${rk.home}/shared/core/ant-scripts/shared.xml"/>
+	<import file="${rk.home}/shared/greenstone2/ant-scripts/greenstone2-shared.xml"/>-->
+	
+	<!-- load in static properties from build.properties -->
+	<property file="${rk.name}-build.properties" />
+	<!-- load environment properties -->
+	<property environment="env"/>
+
+	<!-- extra features -->
+	<property name="projectname" value="greenstone" /> <!-- defaults to Greenstone. Set projectname: in rkX-build.properties to change this -->
+	<property name="version-extra" value="" />
+	<property name="version.major" value="" />
+	<property name="post.2.83.version" value="true" />
+	<property name="x64" value="false" />
+
+	<import file="init.xml"/>
+	<import file="compile.xml"/>
+	<import file="components.xml"/>
+	<import file="create-components.xml"/>
+	<!--<import file="${rk.home}/shared/core/ant-scripts/create-installer.xml"/>-->
+	<import file="create-installer.xml"/>
+	<import file="wrap.xml"/>
+
+
+
+	<!-- THE MAIN TARGET -->
+	<!--<target name="rke" depends="init,compile,create-components,create-installer,wrap"/>-->
+	<target name="rke" depends="init,compile,create-components,create-installer"/>
+
+	<!-- target to show properties in rk2-build.properties -->
+	<target name="properties" depends="core-properties"/>
+
+        <!-- show the core properties of all release-kits -->
+        <target name="core-properties">
+                <echo>version             (required)  the version string for the release</echo>
+                <echo>branch.path         (optional)  the branch of ${projectname} to make a release of. Eg: tags/2.81. Default: trunk.</echo>
+		<echo>branch.revision     (optional)  the revision of ${projectname} to make a release of. Eg: 18273. Default: HEAD.</echo>
+		</target>
+
+</project>
Index: other-projects/expeditee-release-kits/kits/rke/ant-scripts/compile.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/ant-scripts/compile.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/ant-scripts/compile.xml	(revision 28695)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="rke-compile">
+
+	<target name="compile">
+		<!-- checkout expeditee -->
+		<exec executable="svn">
+			<arg value="checkout"/>
+			<arg value="https://svn.cms.waikato.ac.nz/svn/expeditee/trunk"/>
+			<arg value="${basedir}/compiled"/>
+		</exec>
+
+		<!-- we do not want the *.app folders if we are not mac-->
+		<if><bool><not><equals arg1="${rk.os}" arg2="mac"/></not></bool>
+			<!--<delete dir="${basedir}/compiled/client-gli.app"/>-->
+		</if>
+		<ant dir="${basedir}/compiled" antfile="${basedir}/compiled/build.xml" target="inst6" />
+	</target>
+
+</project>
Index: other-projects/expeditee-release-kits/kits/rke/ant-scripts/components.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/ant-scripts/components.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/ant-scripts/components.xml	(revision 28695)
@@ -0,0 +1,32 @@
+<!-- an ant project containing authoritative definitions of the components of greenstone3 -->
+<project name="components">
+	<patternset id="Expeditee.core.component">
+		<!--    <include name="releases" />-->
+		<include name="inst" />
+		<include name="inst/**" />
+	</patternset>
+
+
+  <!-- the core component - defined by antithesis -->
+<!--  <patternset id="greenstone2.core.component">
+    <invert>
+      <patternset refid="greenstone2.source.component"/>
+      <patternset refid="greenstone2.imagemagick.component"/>
+      <patternset refid="greenstone2.ghostscript.component"/>
+      <patternset refid="greenstone2.apachehttpd.component"/>
+    </invert>
+  </patternset>
+-->
+  <!-- the core component - defined by antithesis -->
+<!--
+  <patternset id="greenstone2.core-x64.component">
+    <invert>
+      <patternset refid="greenstone2.source.component"/>
+      <patternset refid="greenstone2.imagemagick-x64.component"/>
+      <patternset refid="greenstone2.ghostscript.component"/>
+      <patternset refid="greenstone2.apachehttpd.component"/>
+    </invert>
+  </patternset>
+-->
+</project>
+
Index: other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-cdrom-components.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-cdrom-components.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-cdrom-components.xml	(revision 28695)
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="rk2-create-cdrom-components" default="create-cdrom-components">
+
+	<!--
+		cd components
+		produce components for cdrom distributions, to be picked up and used by cdrk2 release kit
+		split components into linux only files (linux) and general files (all)
+	-->
+
+	<target name="create-cdrom-components" depends="init,gs2-init">
+		<antcall target="compile-cdrom-installer"/> <!-- from init -->
+
+		<!-- clean up -->
+		<delete dir="cdrom"/>
+
+		<!-- setup directory structure -->
+		<mkdir dir="cdrom/build"/>
+		<mkdir dir="cdrom/dist/Software"/>
+		<mkdir dir="cdrom/dist/Java/Jars"/>
+
+		<!-- create core component -->
+		<mkdir dir="cdrom/dist/Software/core/all"/>
+		<mkdir dir="cdrom/dist/Software/core/${rk.os}"/>
+
+		<if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+		  <mkdir dir="cdrom/dist/Software/core/full-windows"/>
+		</if>
+
+		<!-- core linux -->
+		<if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+			<unzip src="components/core.comp" dest="cdrom/dist/Software/core/all" overwrite="true"/>
+			<move todir="cdrom/dist/Software/core/linux" overwrite="true">
+				<fileset dir="cdrom/dist/Software/core/all">
+					<include name="bin/linux"/>
+					<include name="bin/linux/**/*"/>
+					<include name="bin/windows"/>
+					<include name="bin/windows/**/*"/>
+					<include name="cgi-bin/library.cgi"/>
+					<include name="cgi-bin/oaiserver.cgi"/>
+					<include name="*.sh"/>
+					<include name="*.csh"/>
+					<include name="*.bash"/>
+				</fileset>
+			</move>
+			<!-- delete the apache manual to save space -->
+			<delete dir="cdrom/dist/Software/core/linux/apache-httpd/linux/manual"/>
+
+		<!-- core windows -->
+		<else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+			<unzip src="components/core.comp" dest="cdrom/dist/Software/core/windows" overwrite="true">
+				<patternset>
+					<include name="bin/windows"/>
+					<include name="bin/windows/**/*"/>
+					<include name="server.exe"/>
+					<include name="cgi-bin/library.cgi"/>
+					<include name="cgi-bin/oaiserver.cgi"/>
+					<include name="*.bat"/>
+					<include name="gli/*.bat"/>
+					<include name="uninstall/*.bat"/>
+					<include name="uninstall/*.uninstall"/>
+				</patternset>
+			</unzip>
+
+			<unzip src="components/core.comp" dest="cdrom/dist/Software/core/full-windows" overwrite="true"/>
+
+		<!-- core mac -->
+		<else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+			<unzip src="components/core.comp" dest="cdrom/dist/Software/core/mac" overwrite="true">
+				<patternset>
+					<include name="bin/darwin"/>
+					<include name="bin/darwin/**/*"/>
+					<include name="bin/windows"/>
+					<include name="bin/windows/**/*"/>
+					<include name="cgi-bin/library.cgi"/>
+					<include name="cgi-bin/oaiserver.cgi"/>
+					<include name="*.sh"/>
+					<include name="*.csh"/>
+					<include name="*.bash"/>
+				</patternset>
+			</unzip>
+			<!-- delete the httpd manual to save space -->
+			<delete dir="cdrom/dist/Software/core/mac/apache-httpd/darwin/manual"/>
+
+		</if></else></if></else></if>
+
+		<!-- imagemagick -->
+		<mkdir dir="cdrom/dist/Software/imagemagick/${rk.os}"/>
+		<unzip src="components/imagemagick.comp" dest="cdrom/dist/Software/imagemagick/${rk.os}" overwrite="true"/>
+
+		<!-- ghostscript: windows and mac only -->
+		<if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+			<mkdir dir="cdrom/dist/Software/ghostscript/${rk.os}"/>
+			<unzip src="components/ghostscript.comp" dest="cdrom/dist/Software/ghostscript/${rk.os}" overwrite="true"/>
+		</if>
+		
+		<!-- apache httpd -->
+		<unzip src="components/apachehttpd.comp" dest="cdrom/dist/Software" overwrite="true"/>
+		
+		<!-- jre linux -->
+		<if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+			<mkdir dir="cdrom/dist/Java/Linux"/>
+			<exec executable="cp">
+				<arg value="${rk.home}/shared/linux/jre_bin${extension_x64}"/>
+				<arg value="cdrom/dist/Java/Linux"/>
+			</exec>
+			<!--
+			don't extract to save space
+			<exec dir="cdrom/dist/Java/Linux" executable="${rk.home}/shared/linux/jre_bin"/>
+			<exec dir="cdrom/dist/Java/Linux" executable="tar"><arg value="-xf"/><arg value="jre.tar"/></exec>
+			<delete file="cdrom/dist/Java/Linux/jre.tar"/>
+			-->
+
+		<!-- jre windows -->
+		<else><if><bool><or><equals arg1="${rk.os}" arg2="windows"/></or></bool>
+			<mkdir dir="cdrom/dist/Java/Windows"/>
+			<exec dir="cdrom/dist/Java/Windows" executable="${rk.home}/shared/windows/wrapper/jre.exe"/>
+
+		</if></else></if>
+
+		<!-- jar installer: windows and linux only -->
+		<if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+			<copy file="installer/cdrom.jar" tofile="cdrom/dist/Java/Jars/${rk.os}.jar"/>
+		</if>
+
+		<!-- compile cdrom wrapper -->
+		<!-- (windows) -->
+		<if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+			<copy todir="cdrom/build" overwrite="true">
+				<fileset dir="${rk.home}/shared/windows/wrapper"/>
+				<fileset dir="${rk.home}/shared/core/icon" includes="icon.ico"/>
+				<fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
+			</copy>
+			<exec executable="rc" dir="cdrom/build">
+				<arg line="wrapper.rc"/>
+			</exec>
+			<exec executable="cl" dir="cdrom/build">
+				<arg line="/c -GX -DCDROM wrapper.cpp"/>
+			</exec>
+			<exec executable="link" dir="cdrom/build">
+				<arg line="/OUT:../dist/Greenstone-${version}${version-extra}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/>
+			</exec>
+
+		<!-- (linux) -->
+		<else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+			<copy file="${rk.home}/shared/linux/wrapper.cpp" todir="cdrom/build" overwrite="true"/>
+
+			<echo level="info">compile the cdrom wrapper</echo>
+			<exec executable="g++" dir="cdrom/build">
+				<arg line="-Wall -static -static-libgcc -c -DCDROM -o wrapper.o wrapper.cpp"/>
+			</exec>
+
+			<echo level="info">link the compiled code</echo>
+			<exec executable="g++" dir="cdrom/build">
+				<arg line="-static -static-libgcc -o ../dist/Greenstone-${version}${version-extra}-linux wrapper.o"/>
+			</exec>
+
+		<!-- (mac) -->
+		<else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+
+			<mkdir dir="wrapped-installer/cdrom"/>
+			<!-- create app for cdrom installer -->
+			<copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
+			<copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
+			<chmod file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>
+
+			<!-- copy bundled files -->
+			<copy todir="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
+
+			<!-- substitute in real values -->
+			<rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
+			<rsr file="cdrom/dist/Greenstone-${version}${version-extra}-MacOS.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
+			
+		</if></else></if></else></if>
+
+
+		<!-- create cdrom components -archive -->
+		<mkdir dir="products"/>
+		<!-- (windows) -->
+		<if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+			<tar destfile="products/cdrom-components-${version}${version-extra}-windows.tar.gz" compression="gzip">
+				<tarfileset dir="cdrom/dist">
+					<include name="**/*"/>
+					<exclude name="**/full-windows"/>
+					<exclude name="**/full-windows/**/*"/>
+				</tarfileset>
+			</tar>
+			<tar destfile="products/cdrom-components-${version}${version-extra}-full-windows.tar.gz" compression="gzip">
+				<tarfileset dir="cdrom/dist">
+					<include name="**/*"/>
+					<exclude name="**/Software/core/windows"/>
+					<exclude name="**/Software/core/windows/**/*"/>
+				</tarfileset>
+			</tar>
+
+		<!-- (linux and mac) -->
+		<else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+			<exec dir="cdrom/dist" executable="bash">
+				<arg value="-c"/>
+				<arg value="tar -czf ../../products/cdrom-components-${version}${version-extra}-${rk.os}${extension-x64}.tar.gz *"/>
+			</exec>
+		</if></else></if>
+	</target>
+
+</project>
Index: other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-components.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-components.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-components.xml	(revision 28695)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="rke-create-components">
+
+	<target name="create-component">
+		<mkdir dir="components"/>
+		
+		<!-- the PatternSet To File task takes one or more patternsets and outputs to a file all of the files it includes -->
+		<!--<pstf dir="compiled" outfile="compiled/uninstall/${component}.uninstall" toplevelonly="true">
+			<patternset refid="${projectname}${version.major}.${component}${ext-x64}.component"/>
+		</pstf>-->
+	  
+		<zip destfile="components/${component}.comp" compress="false">
+			<zipfileset dir="compiled">
+				<patternset refid="${projectname}${version.major}.${component}${ext-x64}.component"/>
+			</zipfileset>
+		</zip>
+	
+		<!-- windows -->
+		<if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+	    <exec executable="${rk.home}/shared/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 ${component}.lzma ${component}.comp"/></exec>
+	    
+	    <!-- linux, mac -->
+	    <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+		<sevenzip task="encode" input="components/${component}.comp" output="components/${component}.lzma" dictionnary="26"/>
+		
+		<!-- else warn -->
+		<else>
+		  <fail>this target does not support this os (was a new release-kit os added?)</fail>
+		  
+	  </else></if></else></if>
+	</target>
+	
+	<target name="create-components">
+
+<!--
+		<antcall target="create-component">
+			<param name="component" value="imagemagick"/>
+			<param name="ext-x64" value="${extension-x64}"/>
+		</antcall>
+
+
+		<antcall target="create-component">
+			<param name="component" value="apachehttpd"/>
+			<param name="ext-x64" value=""/>
+		</antcall>
+
+
+		<if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+			<antcall target="create-component">
+				<param name="component" value="ghostscript"/>
+				<param name="ext-x64" value=""/>
+			</antcall>
+		</if>
+-->		
+		<!-- core  -->
+		<antcall target="create-component">
+			<param name="component" value="core"/>
+			<param name="ext-x64" value=""/>
+		</antcall>
+
+	</target>
+
+</project>
Index: other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-installer.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-installer.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-installer.xml	(revision 28695)
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="create-installer">
+
+	<target name="create-installer">
+
+		<!-- create installer directory -->
+		<mkdir dir="installer/classes"/>
+
+		<!-- insert the installer descriptors -->
+		<copy todir="installer" overwrite="true">
+			<fileset dir="${rk.home}/kits/${rk.name}/installer" includes="antinstall-config.xml,build.xml"/>
+		</copy>
+
+		<!-- insert the language bundle -->
+		<native2ascii
+			implementation="sun"
+			encoding="UTF-8"
+			src="${rk.home}/shared/core/language-strings"
+			dest="${basedir}/installer/classes/resources"/>
+
+		<!-- insert core, rk-specific and os-specific installer classes -->
+		<copy todir="${basedir}/installer/classes" overwrite="true">
+			<fileset dir="${rk.home}/shared/core/installer-classes" erroronmissingdir="false"/>
+			<fileset dir="${rk.home}/kits/${rk.name}/installer-classes" erroronmissingdir="false"/>
+			<fileset dir="${rk.home}/shared/${rk.os}/installer-classes" erroronmissingdir="false"/>
+		</copy>
+
+		<!-- insert the licence -->
+		<copy file="${rk.home}/kits/${rk.name}/docs/LICENSE.txt" todir="${basedir}/installer/classes" overwrite="true"/>
+
+		<!-- insert greenstone's ant tasks -->
+		<unjar src="${rk.home}/shared/core/ant-tasks/greenstone/anttasks.jar" dest="installer/classes"/>
+		
+		<!-- insert antelope tasks -->
+		<unjar src="${rk.home}/shared/core/ant-tasks/antelope/AntelopeTasks_3.4.2.jar" dest="installer/classes"/>
+
+		<!-- Include lib/crypt.class for both releasekit2 and 3 (rk2 and rk3) 
+		since we need it to encrypt the admin password -->		
+			<unjar src="${rk.home}/shared/core/lib/crypt.jar" dest="${basedir}/installer/classes">
+				<patternset><include name="**/*.class"/></patternset>
+			</unjar>
+
+		<!-- (windows only) -->
+		<if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+			<!-- insert 7za.exe tool -->
+			<copy todir="installer/classes" overwrite="true" file="${rk.home}/shared/windows/7za/7za.exe"/>
+
+			<!-- insert roxes and orangevolt for windows tricks in ant -->
+			<unjar src="${rk.home}/shared/core/ant-tasks/orangevolt/roxes-win32forjava-1.1.1.jar" dest="installer/classes"/>
+			<unjar src="${rk.home}/shared/core/ant-tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar" dest="installer/classes"/>
+
+		<!-- (linux and mac only) -->
+		<else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+			<!-- insert 7zip ant task -->
+			<unjar src="${rk.home}/shared/core/ant-tasks/7z-ant/7z.jar" dest="installer/classes"/>
+
+		</if></else></if>
+
+		<!-- clean up meta directory -->
+		<delete dir="installer/classes/META-INF"/>
+
+		<!-- calculate the size of: core -->
+		<length property="component.bytesize.core-without-jre" mode="all"><fileset file="${basedir}/components/core.comp"/></length>
+		<if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+			<math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.windows-java}" datatype="int"/>
+		<else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+			<math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/>
+		<else>
+			<property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/>
+		</else></if></else></if>
+		<math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/>
+		<property name="component.size.core" value="${component.megabytesize.core} MB"/>
+
+		<!-- calculate the size of: imagemagick -->
+		<length property="component.bytesize.imagemagick" mode="all"><fileset file="${basedir}/components/imagemagick.comp"/></length>
+		<math result="component.megabytesize.imagemagick" operand1="${component.bytesize.imagemagick}" operation="/" operand2="1048576" datatype="int"/>
+		<property name="component.size.imagemagick" value="${component.megabytesize.imagemagick} MB"/>
+
+		<!-- calculate the size of: ghostscript -->
+		<length property="component.bytesize.ghostscript" mode="all"><fileset file="${basedir}/components/ghostscript.comp"/></length>
+		<math result="component.megabytesize.ghostscript" operand1="${component.bytesize.ghostscript}" operation="/" operand2="1048576" datatype="int"/>
+		<property name="component.size.ghostscript" value="${component.megabytesize.ghostscript} MB"/>
+		
+		<!-- calculate the size of: apache httpd -->
+		<length property="component.bytesize.httpd" mode="all"><fileset file="${basedir}/components/apachehttpd.comp"/></length>
+		<math result="component.megabytesize.httpd" operand1="${component.bytesize.httpd}" operation="/" operand2="1048576" datatype="int"/>
+		<property name="component.size.httpd" value="${component.megabytesize.httpd} MB"/>
+		
+		<!-- calculate the size of: tomcat -->
+		<length property="component.bytesize.tomcat" mode="all"><fileset file="${basedir}/components/tomcat.comp"/></length>
+		<math result="component.megabytesize.tomcat" operand1="${component.bytesize.tomcat}" operation="/" operand2="1048576" datatype="int"/>
+		<property name="component.size.tomcat" value="${component.megabytesize.tomcat} MB"/>
+
+		<!-- EXT -->
+		<!-- calculate the size of: amp (and put it into the components directory) -->
+		<if><bool><and><equals arg1="${amp.enabled}" arg2="true"/><not><available file="${rk.home}/ext/amp.lzma"/></not></and></bool>
+		  <fail>amp.lzma file not found in the release kit ext directory</fail>
+		</if>
+
+		<if><bool><and><equals arg1="${amp.enabled}" arg2="true"/></and></bool>
+		  <echo>Copying amp.lzma to compontents directory</echo>
+		  <copy file="${rk.home}/ext/amp.lzma" todir="${basedir}/components"/>
+		  <property name="component.size.amp" value="257 MB"/>
+		</if>
+		<!-- /EXT -->
+
+		<echo>**** OS: ${rk.os}</echo>
+
+		<!-- make the installer descriptors relevant to the current os -->
+		<dcff file="installer/antinstall-config.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" />
+		<dcff file="installer/build.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" />
+
+		<!-- EXT -->
+		<if><bool><not><equals arg1="${amp.enabled}" arg2="true"/></not></bool>
+		  
+		  <dcff file="installer/antinstall-config.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" />
+		  <dcff file="installer/build.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" />
+		</if>
+		<!-- /EXT -->
+		<!-- put the concrete values of things in the config -->
+		<rsr>
+			<fileset dir="${basedir}/installer" includes="*.xml"/>
+<!--			<job pattern="@projectname@" replacement="${projectname}"/>
+-->
+			<job pattern="@version@" replacement="${version}${version-extra}"/>
+			<job pattern="@component.size.core@" replacement="${component.size.core}"/>
+			<job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/>
+			<job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/>
+			<job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/>
+			<job pattern="@component.size.httpd@" replacement="${component.size.httpd}"/>
+			<job pattern="@java.min.version@" replacement="${java.min.version}"/>
+			<job pattern="@java.extracted@" replacement="${java.extracted}"/>
+
+		</rsr>
+
+		<!-- If this is a FLAX installer then we need to change a few things -->
+		<if><bool><equals arg1="${forward.install.flax}" arg2="true"/></bool>
+			<dcff file="installer/build.xml" startTag="&lt;!-- NO FLAX START --&gt;" endTag="&lt;!-- NO FLAX END --&gt;" />
+			<dcff file="installer/antinstall-config.xml" startTag="&lt;!-- NO FLAX START --&gt;" endTag="&lt;!-- NO FLAX END --&gt;" />
+		<else>
+			<dcff file="installer/build.xml" startTag="&lt;!-- FLAX START --&gt;" endTag="&lt;!-- FLAX END --&gt;" />
+			<dcff file="installer/antinstall-config.xml" startTag="&lt;!-- FLAX START --&gt;" endTag="&lt;!-- FLAX END --&gt;" />
+		</else>
+		</if>
+
+		<!-- If we don't want GLI/GEMS -->
+		<if><bool><equals arg1="${with.gli.and.gems}" arg2="false" /></bool>
+			<dcff file="installer/build.xml" startTag="&lt;!-- GLI START --&gt;" endTag="&lt;!-- GLI END --&gt;" />
+		</if>	
+
+		<!-- EXT -->
+		<if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool>
+		  <rsr>
+		    <fileset dir="${basedir}/installer" includes="*.xml"/>
+		    <job pattern="@component.size.amp@" replacement="${component.size.amp}"/>
+		  </rsr>
+		</if>
+		<!-- /EXT -->
+
+		<!-- put the concrete values of things in the text -->
+		<rsr>
+			<fileset dir="${basedir}/installer/classes/resources" includes="*.properties"/>
+			<job pattern="@projectname@" replacement="${projectname}"/>
+			<job pattern="@version@" replacement="${version}${version-extra}"/>
+			<job pattern="@version.major@" replacement="${version.major}"/>
+			<job pattern="@java.min.version@" replacement="${java.min.version}"/>
+			<job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>
+			<job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
+			<job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
+			<job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
+			<job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>
+		</rsr>
+
+		<!-- now ready to run "compile-*-installer" targets -->
+
+		<antcall target="compile-binary-installer"/>
+
+	</target>
+
+	<target name="compile-binary-installer">
+
+		<!-- strip out lines for the cdrom installer -->
+		<copy file="installer/antinstall-config.xml" tofile="installer/antinstall-config-binary.xml" overwrite="true"/>
+		<dcff file="installer/antinstall-config-binary.xml" startTag=".*&lt;!-- start cdrom --&gt;.*" endTag=".*&lt;!-- end cdrom --&gt;.*" />
+		<copy file="installer/build.xml" tofile="installer/build-binary.xml" overwrite="true"/>
+		<dcff file="installer/build-binary.xml" startTag=".*&lt;!-- start cdrom --&gt;.*" endTag=".*&lt;!-- end cdrom --&gt;.*" />
+
+		<!-- create installer jar with ant-installer's ant task -->
+		<installer file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"
+			compress="true"
+			extractType="NonExtractor"
+			installConfig="installer/antinstall-config-binary.xml"
+			buildFile="installer/build-binary.xml"
+			antInstallLib="${rk.home}/shared/core/ant-installer/lib"
+			antLib="${ant.home}/lib"
+			validateConfig="true"
+			icons="bluecurve">
+
+			<zipfileset dir="installer/classes" includes="**/*" />
+			<zipfileset dir="components" includes="*.lzma"/>
+		</installer>
+		
+	</target>
+
+	<target name="compile-cdrom-installer">
+
+		<!-- strip out lines for the binary(web) installer -->
+		<copy file="installer/antinstall-config.xml" tofile="installer/antinstall-config-cdrom.xml"/>
+		<dcff file="installer/antinstall-config-cdrom.xml" startTag=".*&lt;!-- start web --&gt;.*" endTag=".*&lt;!-- end web --&gt;.*" />
+		<copy file="installer/build.xml" tofile="installer/build-cdrom.xml"/>
+		<dcff file="installer/build-cdrom.xml" startTag=".*&lt;!-- start web --&gt;.*" endTag=".*&lt;!-- end web --&gt;.*" />
+
+		<installer file="installer/cdrom.jar"
+			compress="true"
+			extractType="NonExtractor"
+			installConfig="installer/antinstall-config-cdrom.xml"
+			buildFile="installer/build-cdrom.xml"
+			antInstallLib="${rk.home}/shared/core/ant-installer/lib"
+			antLib="${ant.home}/lib"
+			validateConfig="true"
+			icons="bluecurve">
+
+			<zipfileset dir="installer/classes" includes="**/*" />
+		</installer>
+		
+	</target>
+
+</project>
Index: other-projects/expeditee-release-kits/kits/rke/ant-scripts/init.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/ant-scripts/init.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/ant-scripts/init.xml	(revision 28695)
@@ -0,0 +1,178 @@
+<project name="rke-init">
+	<!-- CHECK PRE-CONDITIONS  -->
+	<target name="init">
+
+		<!-- CLASSPATH -->
+		<path id="project.classpath">
+
+			<!-- our classes -->
+			<fileset dir="${rk.home}/shared/core">
+				<include name="ant-tasks/antelope/AntelopeTasks_3.4.2.jar"/>
+				<include name="ant-tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/>
+				<include name="ant-tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar"/>
+				<include name="ant-tasks/greenstone/anttasks.jar"/>
+				<include name="ant-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="ant-installer/lib/ant-installer-ext.jar"/>
+				<include name="ant-installer/lib/ant-installer.jar"/>
+			</fileset>
+
+		</path>
+
+		<!-- SELF DEFINED TASKS AND TYPES -->
+		<taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/>
+		<taskdef name="try" classname="ise.antelope.tasks.TryTask" classpathref="project.classpath"/>
+		<taskdef name="math" classname="ise.antelope.tasks.MathTask" classpathref="project.classpath"/>
+		<taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
+		<taskdef name="installer" classname="org.tp23.antinstaller.taskdefs.Installer" classpathref="project.classpath"/>
+		<typedef name="iuv" classname="org.greenstone.anttasks.InsertUniqueValue" classpathref="project.classpath"/>
+		<typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
+		<typedef name="dcff" classname="org.greenstone.anttasks.DeleteChunkFromFile" classpathref="project.classpath"/>
+		<typedef name="pstf" classname="org.greenstone.anttasks.PatternSetToFile" classpathref="project.classpath"/>
+		<typedef name="rsplit" classname="org.greenstone.anttasks.SplitResource" classpathref="project.classpath"/>
+		<typedef name="get-property-value" classname="org.greenstone.anttasks.GetPropertyValue" classpathref="project.classpath"/>
+
+		<!-- CONSTANTS (overridable in build.properties) -->
+
+		<!-- svn root -->
+		<property name="svn.root" value="https://svn.cms.waikato.ac.nz/svn/expeditee/trunk" />
+
+		<!-- the minimum version of java which the installer should be run with (this gets used in search4j) -->
+		<property name="java.min.version" value="1.4.0_00"/>
+
+		<!-- create a localised basedir property -->
+		<path id="basedir.path"><pathelement location="${basedir}"/></path>
+		<property name="basedir.local" refid="basedir.path"/>
+
+		<!-- size of resource chunks (windows wrapper) -->
+		<property name="resources.chunksize" value="8388608"/>
+
+		<!-- the extra space for the dmg image in KB (mac wrapper) -->
+        	<property name="dmg.overhead" value="4096"/>
+
+		<!-- current date and time -->
+		<tstamp>
+			<format property="current.month" pattern="MMM"/>
+			<format property="current.year" pattern="yyyy"/>
+			<format property="date" pattern="yyyy.MM.dd"/>
+		</tstamp>
+
+		<if>
+		  <bool><equals arg1="${x64}" arg2="true"/></bool>
+		  <property name="extension-x64" value="-x64" />
+		  <property name="extension_x64" value="_x64" />
+		  <else>
+		    <property name="extension-x64" value="" />
+		    <property name="extension_x64" value="" />
+		  </else>
+		</if>
+
+		<!-- BUNDLED JAVA INFO -->
+		<!-- the bundled javas are kept in shared/linux/wrapper and shared/windows/wrapper in the repository -->
+		<!-- change this info when the bundled version changes -->
+		<property name="java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive -->
+
+		<!-- linux -->
+		<property name="linux-java.installer" value="jre_bin${extension_x64}"/>
+		<property name="bundled.version.linux-java" value="1.6.0_05"/> <!-- set this to the version number of java in the above archive -->
+		<property name="component.bytesize.linux-java" value="101245987"/> <!-- set this to the size of the extract archive -->
+
+		<!-- windows -->
+		<property name="windows-java.installer" value="jre.exe"/>
+		<property name="bundled.version.windows-java" value="1.6.0_07"/> <!-- set this to the version number of java in the above archive -->
+		<property name="component.bytesize.windows-java" value="75000000"/> <!-- set this to the size of the extract archive -->
+
+		<!-- version numbers of other bundled things -->
+		<property name="bundled.version.imagemagick" value="6.4.3"/>
+		<property name="bundled.version.ghostscript" value="8.63"/>
+		<property name="bundled.version.tomcat" value="6.0.20"/>
+	
+		<!-- default revision and branch path -->
+		<property name="branch.revision" value="HEAD" />
+		<property name="branch.path" value="trunk" />
+		  	
+		
+
+		<!-- version number -->
+		<if><bool><not><isset property="version"/></not></bool>
+			<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}"/>
+
+		<!-- work out rk.os -->
+		<if>
+			<bool>
+				<or>
+					<equals arg1="${rk.os}" arg2="linux"/>
+					<equals arg1="${rk.os}" arg2="mac"/>
+					<equals arg1="${rk.os}" arg2="windows"/>
+				</or>
+			</bool>
+			<echo>Using user-specified value for rk.os: '${rk.os}'</echo>
+
+		<else><if>
+			<bool><equals arg1="${os.name}" arg2="Linux"/></bool>
+			<property name="rk.os" value="linux"/>
+
+		<else><if>
+			<bool><equals arg1="${os.name}" arg2="Mac OS X"/></bool>
+			<property name="rk.os" value="mac"/>
+
+		<else>
+			<if>
+				<bool><os family="windows"/></bool>
+				<property name="rk.os" value="windows"/>	
+			<else>
+			<fail>Can't work out what to set rk.os to. Please report this to greenstone_team@cs.waikato.ac.nz . In the mean time, manually set rk.os to 'windows', 'mac', or 'linux' by reinvoking the release kit with, for example, '-Drk.os=windows'</fail>
+
+		</else></if></else></if></else></if></else></if>
+
+		<!-- set os.suffix and os.shell -->
+		<if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+			<exec executable="uname" outputproperty="mac.arch">
+				<arg line="-p"/>
+			</exec>
+			
+			<if><bool><equals arg1="${mac.arch}" arg2="powerpc"/></bool>
+				<property name="os.suffix" value="MacOS-ppc"/>
+				<property name="arch" value="-ppc"/>
+			<else>
+				<property name="os.suffix" value="MacOS-intel"/>
+				<property name="arch" value="-intel"/>
+			</else>
+			</if>
+
+			<property name="os.shell" value="darwin"/>
+		</if>
+		<property name="arch" value=""/>
+
+		<property name="os.suffix" value="${rk.os}"/>
+		<property name="os.shell" value="${rk.os}"/>
+
+		<!-- set os.script.format -->
+		<if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+			<property name="os.script.format" value="sh"/>
+		<else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+			<property name="os.script.format" value="bat"/>
+		</if></else></if>
+
+		<!-- show important properties -->
+		<echo level="info">Projectname: ${projectname}</echo>
+		<echo level="info">Version (version): ${version}${version-extra}</echo>
+		<echo level="info">Major Version (version.major): ${version.major}</echo>
+		<echo level="info">Branch Path (branch.path): ${branch.path}</echo>
+		<echo level="info">Date (date): ${date}</echo>
+		<echo level="info">Current Month (current.month): ${current.month}</echo>
+		<echo level="info">Current Year (current.year): ${current.year}</echo>
+		<echo level="info">Operating System (rk.os): ${rk.os}</echo>
+		<echo level="info">Operating System Suffix (os.suffix): ${os.suffix}</echo>
+		<echo level="info">Operating System Script format (os.script.format): ${os.script.format}</echo>
+		<echo level="info">Operating System Shell (os.shell): ${os.shell}</echo>
+		
+
+	</target>
+</project>
Index: other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml	(revision 28695)
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="wrap" default="wrap">
+
+	<target name="wrap">
+		<!-- create products directory -->
+		<mkdir dir="products"/>
+
+		<!-- (windows) -->
+		<if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+
+			<!--create a directory to build the wrapped installer in -->
+			<mkdir dir="wrapped-installer"/>
+
+			<!-- copy wrapper source into place -->
+			<copy todir="wrapped-installer" overwrite="true">
+				<fileset dir="${rk.home}/shared/windows/wrapper"/>
+				<fileset file="${rk.home}/shared/core/icon/icon.ico"/>
+				<fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
+			</copy>
+
+			<!-- substitute in concrete values -->
+			<rsr file="wrapped-installer/wrapper.cpp">
+				<job pattern="@projectname@" replacement="${projectname}"/>
+				<job pattern="@java.installer@" replacement="${windows-java.installer}"/>
+				<job pattern="@java.min.version@" replacement="${java.min.version}"/>
+				<job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
+				<job pattern="@java.extracted@" replacement="${java.extracted}"/>
+			</rsr>
+
+			<!-- get the template resource script -->
+			<copy todir="wrapped-installer" file="${rk.home}/shared/windows/wrapper/wrapper.rc" overwrite="true"/>
+
+			<!-- split the resources into chunks, creating a resource script of the chunks -->
+			<rsplit
+				resource="${rk.home}/shared/windows/wrapper/${windows-java.installer}"
+				outputDir="wrapped-installer"					
+				resourceScript="wrapped-installer/wrapper.rc"
+				resourceName="JAVA"
+				resourceType="EXE"
+				chunkSize="${resources.chunksize}"/>
+			<rsplit
+				resource="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"
+				outputDir="wrapped-installer"
+				resourceScript="wrapped-installer/wrapper.rc"
+				resourceName="JAR"
+				resourceType="JAR"
+				chunkSize="${resources.chunksize}"
+				/>
+
+			<!-- compile the resources -->
+			<exec executable="rc" dir="wrapped-installer">
+				<arg line="wrapper.rc"/>
+			</exec>
+
+			<!-- compile the wrapper -->
+			<exec executable="cl" dir="wrapped-installer">
+				<arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/>
+			</exec>
+			<exec executable="cl" dir="wrapped-installer">
+				<arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
+			</exec>
+
+			<!-- link wrapper -->
+			<exec executable="link" dir="wrapped-installer">
+				<arg line="/OUT:..\products\${projectname}-${version}${version-extra}-${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
+			</exec>
+
+		<!-- (linux) -->
+		<else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+			<!-- create the build directory -->
+			<mkdir dir="wrapped-installer"/>
+
+			<!-- copy the source into place --> 
+			<copy todir="wrapped-installer" overwrite="true">
+				<fileset file="${rk.home}/shared/linux/wrapper.cpp"/>
+				<fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
+			</copy>
+
+			<!-- copy bundled files into place -->
+			<copy todir="wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/>
+			<copy tofile="wrapped-installer/${projectname}.jar" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
+
+			<!-- substitute in real values -->
+			<rsr file="wrapped-installer/wrapper.cpp">
+				<job pattern="@projectname@" replacement="${projectname}"/>
+				<job pattern="@java.installer@" replacement="${linux-java.installer}"/>
+				<job pattern="@java.extracted@" replacement="${java.extracted}"/>
+				<job pattern="@java.min.version@" replacement="${java.min.version}"/>
+			</rsr>
+
+			<!-- create an object file (extension .o) for each file to bundle -->
+			<if><bool><equals arg1="${x64}" arg2="true"/></bool>
+			<exec executable="/usr/bin/objcopy" dir="wrapped-installer">
+			  <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${projectname}_jar_start=${projectname}jar --readonly-text ${projectname}.jar ${projectname}.jar.o"/>
+			</exec>
+			<exec executable="/usr/bin/objcopy" dir="wrapped-installer">
+			  <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
+			</exec>
+
+			<else>
+			  <exec executable="/usr/bin/objcopy" dir="wrapped-installer" failonerror="true">
+			    <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${projectname}_jar_start=${projectname}jar --readonly-text ${projectname}.jar ${projectname}.jar.o"/>
+			  </exec>
+			  <exec executable="/usr/bin/objcopy" dir="wrapped-installer" failonerror="true">
+			    <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>
+			 </else>
+			</if>
+
+			<!-- compile libsearch4j -->
+			<exec executable="g++" dir="wrapped-installer">
+				<arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
+			</exec>
+
+			<!-- figure out jar size (web jar) -->
+			<exec executable="ls" dir="wrapped-installer" outputproperty="project.jar.ls"><arg line="-l ${projectname}.jar"/></exec>
+			<exec executable="sed" inputstring="${project.jar.ls}" outputproperty="project.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
+
+			<!-- figure out java size -->
+			<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>
+
+			<!-- creating wrapper header file -->
+			<delete file="wrapper.h"/>
+			<!-- ensure no tabs/whitespaces in front of each line in the .h file owing to indentation here -->
+			<echo file="wrapped-installer/wrapper.h">extern const char ${projectname}jar[${project.jar.size}];
+extern const char java[${java.size}];
+#define java_is_bundled yes
+</echo>
+
+			<!-- compile the wrapper program -->
+			<exec executable="g++" dir="wrapped-installer" failonerror="true">
+				<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
+			</exec>
+
+			<!-- link the compiled code and bundled files -->
+			<exec executable="g++" dir="wrapped-installer">
+				<arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}-linux${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/>
+			</exec>
+
+		<!-- (mac) -->
+		<else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+
+			<!-- create and setup the build directory -->
+			<delete dir="wrapped-installer"/>
+			<mkdir dir="wrapped-installer"/>
+
+			<!-- create app for main installer -->
+			<copy todir="wrapped-installer/${projectname}${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
+			<copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
+			<chmod file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
+
+			<!-- copy bundled files -->
+			<copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
+
+			<!-- substitute in real values -->
+			<rsr file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Info.plist">
+				<job pattern="@jar@" replacement="${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
+				<job pattern="@projectname@" replacement="${projectname}"/>
+				<job pattern="@version@" replacement="${version}${version-extra}"/>
+			</rsr>
+
+			<!-- turn app into a dmg -->
+
+			<!-- get size of app -->
+			<exec executable="du" dir="wrapped-installer" outputproperty="app.du"><arg line="-ks ${projectname}${version}${version-extra}.app"/></exec>
+			<exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec>
+			<math result="dmg.size" operand1="${app.size}" operation="+" operand2="${dmg.overhead}" datatype="int"/>
+
+			<!-- create disk image -->
+			<property name="dmg.name" value="${projectname}-${version}${version-extra}-${os.suffix}"/>
+			<exec dir="products" executable="hdiutil" failonerror="true"><arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/></exec>
+			<!-- mount it -->
+			<exec executable="hdiutil" dir="products" failonerror="true"><arg line="attach ${dmg.name}.dmg"/></exec>
+			<!-- copy file into it -->
+			<exec executable="cp"><arg line="-r wrapped-installer/${projectname}${version}${version-extra}.app /Volumes/${dmg.name}"/></exec>
+			<!-- unmount it-->
+			<exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec>
+		</if></else></if></else></if>
+
+
+	</target>
+
+</project>
+
Index: other-projects/expeditee-release-kits/kits/rke/docs/LICENSE.txt
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/docs/LICENSE.txt	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/docs/LICENSE.txt	(revision 28695)
@@ -0,0 +1,346 @@
+Greenstone2 is licensed under the GNU General Public License v2
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Index: other-projects/expeditee-release-kits/kits/rke/docs/READMEar.txt
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/docs/READMEar.txt	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/docs/READMEar.txt	(revision 28695)
@@ -0,0 +1,142 @@
+﻿العنوان : برنامج قرينستون للمكتبة الرقمية 
+
+الغرض : مجموعة برامج للمكتبة الرقميه و التي تشمل القدرة على 
+         خدمة مجموعات المكتبه الرقميه وبناء مجموعات جديدة 
+
+المؤلف : مشروع مكتبه نيوزيلندا الرقميه 
+
+الرخصة: الرخصة العامة gnu   (النسخه 2) 
+         الاحكام والشروط الكاملة هي في ملف "COPYING" علي هذا القرص المدمج 
+
+التاريخ : حزيران / يونية 2007 
+
+النسخه : 2.74 
+
+التوثيق  : Install.pdf  برنامج قرينستون للمكتبة الرقمية ، دليل  المثبت 
+     User.pdf برنامج قرينستون للمكتبة الرقمية ، دليل المستخدم 
+     Develop.pdf برنامج قرينستون للمكتبة الرقمية ، دليل المطور 
+     Paper.pdf برنامج قرينستون للمكتبة الرقمية ،من الورق الي  المجموعة
+
+مرافق اضافية 
+         واجهة المكتبي        واجهة رسومية لبناء المجموعات باستخدام قرينستون  (يتطلب النسخه 1.4 من جافا 
+                                 وقت التشغيل البيئة ، وشملت هذه على قرص مدمج) 
+
+منصة حاسوب 
+         يونيكس والنوافذ. ثنائيات وشفره المصدر مدرجة. 
+
+          واجهة المستخدم لقرينستون تستخدم متصفحات ويب قادرة على جافا سكريبت ، 
+         الجداول ، واطارات. المتصفحات التي  تلبي هذه المتطلبات تشمل : 
+
+                 Netscape Navigator 4.0
+                Internet Explorer 4.0
+                Mozilla, Safari
+
+         أحدث نسخ من هذه المتصفحات ينبغي ايضا ان تعمل. 
+
+
+يونيكس  Unix  وقد تم تجميع واختبار شفره المصدر  على لينكس  Linux و سولاريس Solaris. 
+         الشفرة الثنائية تتطلب  وجود  انتل x86 الذي يوزع مع لينكس  و يشمل دعم  ELF الثنائي و دعم  مكتبة  GNU C  (glibc 2.0   او اكبر). التوزيعات التي تلبي هذه المتطلبات تشمل : 
+
+                 رد هات 5.1      Redhat 5.1 
+                 سوسا لينكس 6.1    SuSE Linux 6.1
+                 ديبيان 2.1       Debian 2.1
+                 سلاكوير 4.0      Slackware 4.0
+
+         أحدث نسخ من هذه التوزيعات وينبغي ايضا ان تعمل. 
+
+تم تجميع شفره المصدر في بيئة النوافذ وقد تم تجميع مع Microsoft Visual C++ 4.2 و 6.0 
+         تم إختبار الشفرة الثنائية  على ويندوز 3.1 ، 95/98 ، NT ، 2000 ، أكس بي 
+         التقييد : 
+                 وتتطلب عملية البناء بيرل  PERL، و لذلك لا يمكن بناء  المجموعات 
+                  في ظل ويندوز 3.1 
+
+التثبيت  : install.pdf يصف الاجراء لاكمال التثبيت علي كل من نظام يونيكس Unix
+         ويندوز Windows، ويتضمن معلومات عن إعداد برامج قرينستون  وإعداد مزود Apache ، pws و IIS 
+         بصورة ملائمة. 
+
+         تتوفر نصوص تثبيت مفسرة لكل من  من يونيكس  Unix و  ويندوز Windows، التي توجهك  خطوة تلو الاخرى من خلال إجراءات التثبيت  وتوفير الخيارات المناسبه في كل مرحلة. 
+
+                تثبيت ويندوز 3.1 ، 95/98 ، NT ، 2000 ، أكس بي  : تنفيذ setup.exe
+                تثبيت  يونيكس  Unix: تنفيذ setuplinux.bin 
+
+        تتوفر نصوص نقض التثبيت و تنظيف عملية التثبيت الفاشلة . 
+
+الدعم : يرجى الابلاغ عن اي مشاكل تثبيت وتشغيل برنامج قرينستون للمكتبة الرقمية باستخدام  استماره تقرير الأخطاء المنصوص عليه في   support.htm في  الدليل  في هذا القرص
+         
+
+القائمة البريديه :يمكنط الإنضمام لقائمة قريمستون البريدية  و المتوفرة في  Http://greenstone.org/english/docs.html. معا هذه الصفحة و صفحة الأسئلة الأكثر شيوعا. في  نقطة الموقع هذا توجيه الي الكثير من المعلومات المفيدة. 
+
+محتويات هذا القرص :
+
+         Readme.txt         هذه الوثيقة 
+         COPYING                   يعطي الشروط التي بموجبها يمكن نسخ هذا البرنامج. 
+         Support.htm     استماره للابلاغ عن مشاكل تثبيت و  تشغيل  برنامج قرينستون للمكتبة الرقمية. 
+         setup.exe            ملف ويندوز لينكس الذاتي تركيب البرنامج (ويشمل  الخيار لتثبيت ثنائيات او المصدر) 
+         Setuplinux.bin ملف لينكس  linuxالذاتي تركيب البرنامج (ويشمل   الخيار لتثبيت ثنائيات او المصدر) 
+
+
+docs               التوثيق ، يشمل  ما يلي : 
+        Install.pdf    دليل المثبت و يصف إجراءات التثبيت لكل من  لينكس  linuxو ويندوز لينكس على حد سواء ، ويشمل  معلومات تعليمية  حول قرينستون  و 
+                                                                  مزود الويب Apache
+        User.pdf             دليل المستخدم  و يقدم وصفا شاملا حول  كيفية استخدام  برنامج قرينستون  في الوصول وبناء مجموعات. 
+        Develop.pdf   دليل المطور  و يصف هذا الدليل كيف يعمل  قرينستون . وهو يستهدف  اولئك الذين يرغبون في  تعديل المجموعات و التطوير                                                                                           والمحافظة على البرنامج. 
+        Paper.pdf          من الورق  الي المجموعة وهذا الدليل يعطي معلومات عملية   عن الإعداد الرقمي للنصوص الكاملة للوثائق. 
+
+ Unix    يونكس        إصدارة  يونكس النسخه ، و تشمل ثنائيات  لينكس  Linux 
+
+                     أدلة و ملفات المستوي الأعلي هي : 
+        Install.sh     نص محارة تثبيت يونيكس Unix  (اذا كنت  على لينكس Linux، يشمل الخيار هنا تثبيت الثنائيات أو خلاف ذلك تثبيت المصدر ) 
+ bin          ملفات  لينكس الثنائية
+
+Windows       ملفات ويندوز Windows الثنائية 
+
+                     أدلة و ملفات المستوي الأعلي هي  : 
+
+ bin                        ملفات ويندوز Windows الثنائية 
+
+Gsdl          هيكل دليل برنامج قرينستون للمكتبة الرقمية .و هذا يتطابق مع هيكل دليل  المكتبة الرقمية التي سوف تثبت. 
+      bin                               شفرات التنفيذ 
+      cgi-bin                  نصوص CGI 
+      collect                  مجموعات قرينستون  (وتشمل مجموعة Demo ، و الكشافات و مصادر الوثائق قبل بنائها.) 
+      etc                               ملفات الإعداد ، المدونات .. الخ ، 
+      Gli                               أداة واجهة مكتبي قرينستون 
+      images                     الصور التي تستخدمها الواجهة 
+      macros                    عرض ماكرو 
+      Perllib                 وحدات Perl المستخدمة عند البناء 
+      mappings              يونيكود جداول الترجمة 
+
+                     اجراءات التثبيت تثبت ملفات في بعض  من  هذه الأدلة على النحو التالي : 
+
+                         المستوي الأعلي    الملفات الدفعية أو نص المحارة 
+        bin              شفرات التنفيذ  
+        cgi-bin  نصوص CGI                                      
+        collect    مجموعة Demo     و المجموعات الاضافية كما هو محدد  
+        src, lib, packages           شفرة المصدر إذا تم تحديدها في زمن التثبيت. 
+                          
+                                         
+                                        
+  collect         مجموعات الاخضر (قبل البناء) - نلاحظ انه على الرغم من  اجراء  التثبيت  يثبت  الكشافات التي لم تبني، إلا ان مصادر الوثائق الأصلية  هي 
+                                     متاحة على القرص مدمج. يمكن ان تكون مصادر الوثائق الأصلية  مفيدة لأولئك الذين يحاولون انشاء مجموعات جديدة و التي تنسخ  شكل  هذه المجموعات. 
+
+        demo                         مجموعة قرينستون التوضيحية 
+        dls-e                    المجموعة الفرعية لمكتبة التنمية  
+        Wrdpdf                 العرض التوضيحي  MSWord و PDF  
+        gsarch                  مجموعة أرشيفات قرينستون  
+        Cltbib                  مجموعة بيبليوجرافية 
+        Cltext                  ملحق بيبليوجرافي
+        MARC-e                   مثال مارك  
+        oai                            المجموعة التوضيحية لمبادرة الأرشيف المفتوح  oai  
+        image-e                مجموعة صورة بسيطة  
+        pagedimg-e      مجموعة صور الصفحات  
+        authen-e            مجموعة التعريف و نسق العرض 
+        garish                  مجموعة garish التوضيحية
+        style-e               مجموعة CSS التوضيحية
+        isis-e                  مجموعة CDS/ISIS
+
+ Src           ملفات  مصدر البرنامج 
+
+       Windows                  معلومات الإعداد  للنوافذ Windows 
+       Unix                           معلومات الإعداد للنظام يونيكس  Unix
+       lib                             الشفره المصدريه ++C 
+       packages            الشفره المصدريه ++C للحزم المستخدمة في قرينستون .
+       Src                            الشفره المصدريه ++C
Index: other-projects/expeditee-release-kits/kits/rke/docs/READMEen.txt
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/docs/READMEen.txt	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/docs/READMEen.txt	(revision 28695)
@@ -0,0 +1,217 @@
+Title	Greenstone digital library software
+
+Purpose
+		A suite of digital library software which includes the ability to
+		serve digital library collections and build new collections
+
+Author	New Zealand Digital Library Project
+
+License
+		GNU General Public Licence (Version 2)
+		Full terms and conditions are in the file "LICENSE.txt"
+
+Date	December 2008
+
+Version svn-trunk
+
+Contents: Programs
+
+	Greenstone library server
+		A cgi program to serve digital library collections
+
+	Greenstone server interface (GSI)
+		A graphical interface to start/stop the library server (see notes below)
+
+	Greenstone oaiserver
+		A cgi program to serve collections using the OAI-PMH protocol.
+
+	Greenstone Librarian Interface (GLI)
+		A graphical tool for collection building
+
+	Greenstone Editor for Metadata Sets (GEMS)
+		A graphical tool for creating and editing metadata sets used by GLI
+
+Contents: Directory Structure
+
+	bin		Executable code
+	cgi-bin		CGI scripts
+	collect		Collections
+	etc		Configuration files, log files, user databases etc
+	gli		Librarian Interface
+	images		Images and CSS files used by the interface
+	macros		Display macros
+	mappings	Unicode translation tables
+	perllib		Perl modules used for collection building
+
+	If source code is present (from a source release or by adding the 
+	source component):
+
+	common-src	Source code and packages used when building collections and at
+				runtime
+	build-src	Source code and packages only used when building collections
+	runtime-src	Source code and packages only used at runtime
+
+Contents: Additional Packages (available only in full binary releases)
+
+	Java Runtime 1.6 (installer release only)
+	ImageMagick
+	Ghostscript (Windows, Mac only)
+	Perl (Windows only)
+
+Documentation and Support
+	Greenstone Website:
+		http://www.greenstone.org
+		Greenstone's main website.
+	Greenstone Wiki: 
+		http://wiki.greenstone.org
+		Contains documentation, and links to manuals, tutorials etc.
+	Greenstone Mailing List:
+		(to subscribe)		
+		http://list.waikato.ac.nz/mailman/listinfo/greenstone-users
+		(to post)
+		greenstone-users@list.waikato.ac.nz
+	New Zealand Digital Library: 
+		http://www.nzdl.org
+		A demonstration site containing lots of collections
+
+
+Platform
+	Greenstone runs on Unix, Windows 2000/XP/2003/Vista/2008 and 
+	Mac OS 10.5.2 (Leopard).
+
+	The Greenstone Librarian Interface requires version 1.5 or later 
+	of the Java Runtime Environment. Java 1.6 is included in binary 
+	releases of Greenstone.
+
+	The Greenstone user interface uses a Web browser capable of Javascript,
+	Tables, and Frames. Browsers that meet these requirements include:
+
+		Netscape Navigator 4.0
+		Internet Explorer 4.0
+		Mozilla
+		Safari
+
+	More recent versions of these browsers should also work (recommended).
+		
+Unix
+	Source code has been compiled and tested on the following 
+	distributions:
+
+		Ubuntu 8.04 & 8.10
+		Mandriva 2008 Spring
+		OpenSUSE 11
+		Fedora 6 & 9
+		CentOS 5.2
+
+
+Windows
+	Source code can be compiled with Microsoft Visual C++ 6.0, 7 
+	(VS 2003.Net), 8 (VS 2005 Pro or VC++ Express 2005 with Microsoft 
+	Platform SDK 2003 R2).
+
+	Binary code has been tested on 32 bit versions of:
+		Windows 2000
+		Windows XP
+		Windows Server 2003
+		Windows Vista
+		Windows Server 2008
+
+	Greenstone software (version 2.81 and later) no longer runs on 
+		Windows 3.1
+		Windows 95
+		Windows 98
+		Windows Me
+		Windows NT
+
+Mac
+	Source code has been compiled with Xcode 3.1 on Intel Mac OS 10.5.2.
+	Binary has been tested on Intel Mac OS 10.5.2 (Leopard).
+
+	However the source code can be compiled with other versions of Mac OS 
+	and Xcode, in that case please download Imagemagick and Ghostscript to 
+	recompile them from source.
+
+
+
+The Greenstone Server Interface (GSI)
+
+	This is the application with a graphical user interface that allows you to
+	stop and start greenstone's Local Library Server (LLS) and change a few
+	settings like the server's port number. On Linux and Mac it uses the apache
+	web server that comes with Greenstone and on Windows it uses a separate
+	server program.
+
+	The Greenstone 2.8x binary release comes with the Local Library Server
+	ready for use.
+
+	If you're on Windows, then you can click on the Greenstone Server shortcut
+	in your Start Menu to run it.
+
+	If on Linux, you run it by executing the following from your Greenstone
+	installation directory:
+
+		./gs2-server.sh
+
+	This starts up the Greenstone Server Interface (GSI). Certain server
+	settings can be changed through its File > Settings menu.
+
+	For instructions on how to compile up the Local Library Server on Unix
+	systems and for further details on how to start the server through the
+	command line (without using the graphical interface of the GSI application),
+	see below.
+
+
+Local Library Server (LLS) on LINUX AND MAC
+	We've not tested the Local Library Server on Unix systems other than Linux
+	and Mac, but you can try the following out.
+
+	SUMMARY
+	1. If you're compiling and running it, run the following in sequence from your Greenstone installation directory:
+		./configure --enable-apache-httpd
+		make
+		make install
+
+	2.a Then you can launch the GSI graphical user application with:
+		./gs2-server.sh
+
+	2.b OR
+		If working on the command-line, you first need to configure the server
+		after compilation with:
+			./gsicontrol.sh configure-web
+		Then run it with:
+			./gsicontrol.sh web-start
+		To stop it, use:
+			./gsicontrol.sh web-stop
+
+		(If your Unix system can handle Makefiles, you can issue simila
+		commands to "make" as to gsicontrol.sh:
+			make configure-web
+			make web-start
+			make web-stop)
+
+		For a list of all commands that the gsi-control script takes (which is
+		what the Makefile ends up calling anyway), type
+			./gsicontrol.sh
+		This script can be used to change your Greenstone Admin password and
+		change the port number of your server. The same commands can also be
+		issued by running "make <command>", if your Unix machine can handle
+		Makefiles.
+		Some of this functionality to control the Local Library Server is also
+		available through the graphical GSI application, from its
+		File > Settings menu. 
+
+
+	If you've started the Local Libary Server, you can view the collections and
+	the documents it serves up by going to your digital library home. This is at
+	a URL that is of the form:
+		http://localhost:<portnumber>/greenstone/cgi-bin/library.cgi
+	by default it will try to use port 80 if this is available and accessible.
+	If you're using the GSI application and port 80 is in use, it will assign a
+	new one. Alternatively, you can change the port number
+		- through the File > Settings menu of the GSI application.
+		- or change it in the llssite.cfg file located in the Greenstone
+		  installation directory and then run
+			./gsicontrol.sh configure-apache
+
+	The GSI application will launch the library home page for you in your
+	browser if you click the button marked "Enter Library" or "Restart Library".
Index: other-projects/expeditee-release-kits/kits/rke/docs/READMEes.txt
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/docs/READMEes.txt	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/docs/READMEes.txt	(revision 28695)
@@ -0,0 +1,228 @@
+TÃ­tulo     Programa de Biblioteca Digital Greenstone
+
+Objeto     Una serie de programas de biblioteca digital que comprende
+           la capacidad de alimentar colecciones de bibliotecas digitales
+           y crear nuevas colecciones
+
+Autor      Proyecto de Biblioteca Digital de Nueva Zelandia
+
+Licencia   Licencia PÃºblica General GNU (VersiÃ³n 2)
+           Las condiciones completas figuran en el archivo "COPYING"
+           de este CD-ROM
+
+Fecha      Noviembre 2007
+
+VersiÃ³n    2.75
+
+DocumentaciÃ³n
+           Install.pdf    GuÃ­a de InstalaciÃ³n de la Biblioteca Digital
+                          Greenstone
+           User.pdf       GuÃ­a del Usuario de la Biblioteca Digital Greenstone
+           Develop.pdf    GuÃ­a del Programador de la Biblioteca Digital 
+                          Greenstone
+           Paper.pdf      Del Papel a la ColecciÃ³n
+
+Programas utilitarios suplementarios
+           Interfaz de la Biblioteca Digital  Una herramienta grÃ¡fica para 
+                                              crear y construir colecciones 
+                                              por medio de Greenstone
+                                              (requiere la versiÃ³n 1.4 del 
+                                              Ambiente de EjecuciÃ³n Java 
+                                              incluido en este CD-ROM)
+
+Plataformas
+           Unix y Windows. Comprende los binarios y el cÃ³digo fuente.
+
+           La interfaz de usuario de Greenstone utiliza un navegador Web con
+           capacidad para Javascript, tablas y marcos. Entre los navegadores
+           que cumplen esos requisitos cabe mencionar:
+
+                      Netscape Navigator 4.0
+                      Internet Explorer 4.0
+                      Mozilla, Safari
+
+           Las versiones mÃ¡s recientes  de  estos  navegadores  deben
+           funcionar tambiÃ©n.
+
+Unix       El cÃ³digo fuente se ha compilado y probado en Linux
+           y Solaris.
+           El cÃ³digo binario requiere una distribuciÃ³n Linux basada en un
+           procesador Intel x86 que incluye un apoyo binario ELF y admite la
+           biblioteca GNU C (glibc 2.0 o superior). Las distribuciones que
+           cumplen esos requisitos son:
+
+                      RedHat 5.1
+                      SuSe Linux 6.1
+                      Debian 2.1
+                      Slackware 4.0
+
+           Las versiones mÃ¡s recientes de estas distribuciones deben funcionar
+           tambiÃ©n.
+
+Windows    El cÃ³digo fuente de Windows se ha compilado con Microsoft Visual
+           C++ 4.2 y 6.0.
+           El cÃ³digo binario se ha probado con Windows 3.1, 95/98, NT, 2000
+           y XP.
+           RestricciÃ³n:
+                      El proceso de creaciÃ³n requiere PERL, por lo que las
+                      colecciones no pueden crearse con Windows 3.1.
+
+InstalaciÃ³n
+           En Install.pdf se expone el  procedimiento  completo de instalaciÃ³n
+           para Unix y Windows, y se incluye una guÃ­a informativa sobre la
+           configuraciÃ³n de Greenstone y la configuraciÃ³n adecuada de los
+           servidores Web Apache, PWS e IIS.
+
+           Se proporcionan instrucciones claras de instalaciÃ³n para Unix y
+           Windows que indican paso por paso el procedimiento de instalaciÃ³n y
+           ofrecen opciones apropiadas en cada etapa.
+
+            InstalaciÃ³n de Windows 9x/NT/2000/XP:
+                      ejecÃºtese setup.exe
+            InstalaciÃ³n de Unix:
+                      ejecÃºtese setupLinux.bin
+
+           Se proporcionan tambiÃ©n guiones de desinstalaciÃ³n que permiten
+           comenzar de nuevo en caso de que falle la instalaciÃ³n.
+
+Servicio de apoyo tÃ©cnico
+           SÃ­rvase seÃ±alar cualquier problema de instalaciÃ³n o de
+           funcionamiento del programa de Biblioteca Digital Greenstone
+           utilizando el formulario de comunicaciÃ³n de errores Support.htm que
+           se encuentra en el directorio de nivel superior de este CD-ROM.
+
+           Existe una lista de correo Greenstone en la que usted puede 
+           participar en http://greenstone.org/english/docs.html. Tanto esta 
+           pÃ¡gina como la lista de preguntas mÃ¡s frecuentes de este sitio 
+           contienen una gran cantidad de informaciÃ³n que le puede ser 
+           de utilidad.
+
+Contenido de este CD-ROM
+
+           README.TXT   El presente documento
+
+           COPYING      Expone las condiciones en que se puede copiar este
+                        programa 
+
+           Support.htm  Formulario para comunicar los problemas de instalaciÃ³n
+                        o de funcionamiento de Greenstone
+
+           setup.exe    El software de autoinstalaciÃ³n de Windows (comprende
+                        una opciÃ³n para instalar binarios o el cÃ³digo fuente)
+
+           setupLinux.bin    El software de autoinstalaciÃ³n de Linux (comprende
+                        una opciÃ³n para instalar binarios o el cÃ³digo fuente)
+
+           docs         DocumentaciÃ³n, a saber:
+
+                          Install.pdf   GuÃ­a de InstalaciÃ³n
+                                        Describe el procedimiento de instalaciÃ³n
+                                        de Unix y Windows y comprende una guÃ­a 
+                                        informativa sobre la configuraciÃ³n de 
+                                        Greenstone y el servidor Web Apache.
+
+                          User.pdf      GuÃ­a del Usuario
+                                        Da una explicaciÃ³n exhaustiva sobre cÃ³mo
+                                        utilizar el programa Greenstone de
+                                        creaciÃ³n de colecciones y acceso a
+                                        ellas.
+
+                          Develop.pdf   GuÃ­a del Programador
+                                        En este manual se explica cÃ³mo funciona
+                                        Greenstone. EstÃ¡ destinado a quienes
+                                        desean personalizar las colecciones y
+                                        desarrollar y mantener el programa.
+
+                          Paper.pdf     Del Papel a la ColecciÃ³n
+                                        En este manual se proporciona
+                                        informaciÃ³n prÃ¡ctica sobre la creaciÃ³n
+                                        de colecciones digitalizadas a partir de
+                                        documentos en texto completo.
+
+           Unix         Esta versiÃ³n Unix comprende binarios Linux
+
+                        Los archivos  y directorios de nivel superior son los
+                        siguientes:
+
+                          Install.sh    El guiÃ³n de shell de instalaciÃ³n (si
+                                        funciona con Linux comprende una opciÃ³n
+                                        para instalar binarios; de otro modo
+                                        instala el cÃ³digo fuente)
+                          bin           Binarios de Linux
+
+           Windows      Binarios de Windows
+
+                        Los archivos y directorios de nivel superior son 
+                        los siguientes:
+
+                          bin           Binarios de Windows
+
+           gsdl         La estructura de los directorios del programa de
+                        Biblioteca Digital Greenstone. Refleja la estructura de
+                        los directorios del Programa de Biblioteca Digital
+                        Greenstone que se instalarÃ¡n.
+
+                          bin           CÃ³digo ejecutable
+                          cgi-bin       Guiones CGI
+                          collect       Colecciones
+                          Greenstone    (comprende la colecciÃ³n de demostraciÃ³n,
+                                        los Ã­ndices creados previamente y los
+                                        documentos fuente)
+                          etc           Archivos de configuraciÃ³n, registros,
+                                        etc.
+                          gli           herramienta de la Interfaz de la
+                                        Biblioteca Digital Greenstone
+                          images        ImÃ¡genes utilizadas por la interfaz
+                          macros        Macros de visualizaciÃ³n
+                          perllib       MÃ³dulos Perl utilizados para la creaciÃ³n
+                          mappings      Tablas de traducciÃ³n Unicode
+
+                        El procedimiento de instalaciÃ³n instala archivos en 
+                        algunos de los directorios siguientes:
+
+                          nivel superior Archivo de proceso por lotes o guiÃ³n
+                                         de shell
+                          bin            CÃ³digo ejecutable
+                          cgi-bin        Guiones CGI
+                          collect        La colecciÃ³n de demostraciÃ³n de
+                                         Greenstone. Las colecciones 
+                                         suplementarias indicadadas en
+                                         el momento de la instalaciÃ³n
+                          src, lib, packages
+                                         CÃ³digo fuente en caso que se lo
+                                         especifique en el momento de la
+                                         instalaciÃ³n
+
+           collect      Colecciones Greenstone (creadas previamente) - nÃ³tese
+                        que aunque el procedimiento de instalaciÃ³n sÃ³lo instala
+                        los Ã­ndices creados previamente, los documentos fuente
+                        originales de cada colecciÃ³n estÃ¡n disponibles en el 
+                        CD-ROM. Los documentos fuente pueden ser Ãºtiles para
+                        quienes traten de crear nuevas colecciones que copien el
+                        fomato de aquellas colecciones.
+
+                          demo          ColecciÃ³n de muestra Greenstone
+                          dls-e         Subconjunto de la Biblioteca para
+                                        el Desarrollo
+                          wrdpdf-e      DemostraciÃ³n en MSWord y PDF
+                          gsarch-e      ColecciÃ³n de Archivos Greenstone
+                          cltbib-e      ColecciÃ³n bibliogrÃ¡fica
+                          cltext-e      Suplemento bibliogrÃ¡fico
+                          MARC-e        ColecciÃ³n de muestra MARC
+                          oai-e         ColecciÃ³n de muestra OAI
+                          image-e       ColecciÃ³n de imÃ¡genes sencillas
+			  pagedimg-e
+                          authen-e      DemostraciÃ³n de formateo y autenticaciÃ³n
+                          garish        VersiÃ³n Garish de la colecciÃ³n de muestra
+			  style-e
+                          isis-e        ColecciÃ³n de muestra CDS/ISIS
+
+           src            Archivos fuente del programa
+
+                          Windows       InformaciÃ³n de configuraciÃ³n para
+                                        Windows
+                          Unix          InformaciÃ³n de configuraciÃ³n para Unix
+                          lib           CÃ³digo de biblioteca C++
+                          packages      CÃ³digo fuente C++ para paquetes
+                                        utilizados por Greenstone
+                          src           CÃ³digo fuente C++
Index: other-projects/expeditee-release-kits/kits/rke/docs/READMEfr.txt
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/docs/READMEfr.txt	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/docs/READMEfr.txt	(revision 28695)
@@ -0,0 +1,232 @@
+Titre   Logiciel de bibliothÃšque numÃ©rique Greenstone
+
+But     Une suite de logiciels de bibliothÃšque numÃ©rique qui comprend
+        la possibilitÃ© de servir et de construire des collections de
+        bibliothÃšques numÃ©riques
+
+Auteur  Projet de bibliothÃšque numÃ©rique de Nouvelle-ZÃ©lande (New
+        Zealand Digital Library Project)
+
+Licence Licence publique gÃ©nÃ©rale de GNU (GNU General Public License)
+        (Version 2)
+        Les clauses et conditions complÃštes se trouvent dans le fichier
+        "COPYING" de ce cÃ©dÃ©rom
+
+Date    Novembre 2007
+
+Version 2.75
+
+Documentation
+        Install.pdf
+            Guide d'installation de la bibliothÃšque numÃ©rique Greenstone
+        User.pdf
+            Guide de l'utilisateur de la bibliothÃšque numÃ©rique Greenstone
+        Develop.pdf
+            Guide du dÃ©veloppeur de la bibliothÃšque numÃ©rique Greenstone
+        Paper.pdf
+            BibliothÃšque numÃ©rique Greenstone: du papier Ã  la collection
+
+Outils complÃ©mentaires
+        Librarian Interface     Un outil graphique pour la construction de
+                                collection utilisant Greenstone (nÃ©cessite
+                                une version 1.4 de Java Runtime
+                                Environement, intÃ©grÃ©e dans ce CD-ROM)
+
+Plates-formes
+        Unix et Windows.  Les binaires et le code source sont fournis.
+
+        L'interface utilisateur de Greenstone utilise un navigateur web
+        gÃ©rant le Javascript, les tableaux, et les cadres. Exemples de
+        navigateurs convenables:
+
+                Netscape Navigator 4.0
+                Internet Explorer 4.0
+                Mozilla, Safari
+
+        Des versions plus rÃ©centes de ces navigateurs devraient
+        Ã©galement convenir.
+
+
+Unix    Le code source a Ã©tÃ© compilÃ© et testÃ© sous Linux et sous
+        Solaris. Le code binaire est prÃ©vu pour une distribution Linux sur
+        processeur x86 qui comprend un support pour les binaires au
+        format ELF et qui dispose de la bibliothÃšque C de GNU (glibc 2.0
+        ou une version ultÃ©rieure). Exemples de distributions
+        convenables:
+
+                RedHat 5.1
+                SuSE Linux 6.1
+                Debian 2.1
+                Slackware 4.0
+
+        Des versions plus rÃ©centes de ces distributions devraient
+        Ã©galement convenir.
+
+Windows Le code source a Ã©tÃ© compilÃ© avec Microsoft Visual C++ 4.2 et 6.0
+        Le code binaire a Ã©tÃ© testÃ© sur Windows 3.1, 95/98, NT, 2000, XP
+        Restriction:
+                Le processus de construction utilise Perl; les
+                collections ne peuvent donc pas Ãªtre construites sous
+                Windows 3.1 
+
+Installation
+        Install.pdf dÃ©crit la procÃ©dure d'installation complÃšte Ã  la
+        fois pour Unix et pour Windows, et comprend des didacticiels pour 
+        configurer Greenstone, et les serveurs web Apache, PWS et IIS
+        de maniÃšre appropriÃ©e.
+
+        Des scripts d'installation auto-documentÃ©s sont fournis Ã  la
+        fois pour Unix et pour Windows, qui vous emmÃšnent pas Ã  pas Ã 
+        travers la procÃ©dure d'installation et proposent les options
+        appropriÃ©es Ã  chaque Ã©tape.
+
+                Installation sous Windows 9x/NT/2000/XP:
+                    exÃ©cuter setup.exe
+                Installation sous Unix:
+                    exÃ©cuter setupLinux.bin
+
+        Des scripts de dÃ©sinstallation sont fournis qui nettoient tout
+        si le processus d'installation venait Ã  Ã©chouer.
+
+Support Veuillez nous faire part de tout problÃšme d'installation ou
+        d'exÃ©cution du logiciel de bibliothÃšque numÃ©rique Greenstone en
+        utilisant le formulaire de rapport de bogues fourni dans le fichier 
+        Support.htm dans le rÃ©pertoire de premier niveau de ce cÃ©dÃ©rom.
+
+        Il y a une liste de diffusion Greenstone que vous pouvez joindre Ã 
+        http://greenstone.org/english/docs.html. Cette page ainsi que la
+        liste faq pointent vers des informations utiles.
+
+Contenu de ce cÃ©dÃ©rom
+
+        README.TXT  Le prÃ©sent document
+
+        COPYING     Donne les conditions selon lesquelles ce logiciel
+                    peut Ãªtre copiÃ©
+
+        Support.htm Formulaire pour faire part de problÃšmes
+                    d'installation ou d'exÃ©cution de Greenstone
+
+        setup.exe   Programme d'auto-installation pour Windows
+                    (comprend une option pour installer les binaires ou
+                    le code source)
+
+        setupLinux.bin   Programme d'auto-installation pour Linux
+                    (comprend une option pour installer les binaires ou
+                    le code source)
+
+        docs        Documentation, comprenant:
+
+                        Install.pdf     Guide d'installation
+                                        DÃ©crit la procÃ©dure d'installation
+                                        pour Unix et pour Windows, et
+                                        comprend des didacticiels sur la
+                                        configuration de Greenstone et du
+                                        serveur web Apache.
+                                        
+                        User.pdf        Guide de l'utilisateur
+                                        Fournit une description complÃšte
+                                        de la maniÃšre d'utiliser le logiciel
+                                        Greenstone pour accÃ©der Ã  et
+                                        construire des collections.
+
+                        Develop.pdf     Guide du dÃ©veloppeur 
+                                        Ce manuel dÃ©crit le fonctionnement
+                                        de Greenstone. Il vise ceux qui
+                                        souhaitent personnaliser des
+                                        collections et dÃ©velopper et
+                                        maintenir le logiciel. 
+
+                        Paper.pdf       Du papier Ã  la collection
+                                        Ce manuel donne des informations
+                                        pratiques sur la crÃ©ation de
+                                        collections numÃ©risÃ©es Ã  partir
+                                        de documents textuels.
+
+        Unix        Version Unix, comprenant des binaires pour Linux
+
+                    Les fichiers et rÃ©pertoires de premier niveau sont:
+
+                        Install.sh      Script d'installation shell pour
+                                        Unix (exÃ©cutÃ© sous Linux, comprend
+                                        des options pour installer des
+                                        binaires; dans le cas contraire,
+                                        installe le code source). 
+                        bin             Binaires Linux
+
+        Windows     Binaires Windows
+
+                    Les fichiers et rÃ©pertoires de premier niveau sont:
+
+                        bin             Binaires Windows
+
+        gsdl        Structure de rÃ©pertoires du logiciel de bibliothÃšque
+                    numÃ©rique Greenstone. Miroir de la structure qui
+                    sera installÃ©e.
+
+                        bin             Code exÃ©cutable
+                        cgi-bin         Scripts CGI
+                        collect         Collections Greenstone
+                                        (comprend la collection Â«DemoÂ»,
+                                        les index prÃ©-construits et
+                                        les documents source)
+                        etc             Fichiers de configuration,
+                                        journaux, etc.
+                        gli             Outil de Greenstone Librarian
+                                        Interface
+                        images          Images utilisÃ©es par l'interface
+                        macros          Macros d'affichage
+                        perllib         Modules Perl utilisÃ©s lors de la
+                                        construction
+                        mappings        Tables Unicode
+
+                    La procÃ©dure d'installation installe des fichiers
+                    dans certains de ces rÃ©pertoires comme suit:
+
+                        premier niveau  Fichier de traitement par lots ou
+                                        script shell
+                        bin             Code exÃ©cutable 
+                        cgi-bin         Scripts CGI
+                        collect         La collection Â«DemoÂ» de Greenstone
+                                        Collections supplÃ©mentaires telles que
+                                        spÃ©cifiÃ© au moment de l'installation 
+                        src, lib, packages
+                                        Code source si tel a Ã©tÃ©
+                                        spÃ©cifiÃ© au moment de l'installation
+
+        collect     Collections Greenstone (prÃ©-construites) - remarquez que
+                    bien que la procÃ©dure d'installation n'installe que
+                    les index prÃ©-construits, les documents source de chaque
+                    collection sont disponibles sur le cÃ©dÃ©rom. Les documents
+                    source peuvent Ãªtre utiles Ã  ceux qui essaient de crÃ©er
+                    de nouvelles collections qui reprennent le format de ces
+                    collections.
+
+                        demo            DÃ©mo Greenstone
+                        dls-e           Sous-ensemble de la collection
+                                        BibliothÃ©que de DÃ©veloppement
+                        wrdpdf-e        DÃ©monstration MSWord et PDF
+                        gsarch-e        Collection des Archives de Greenstone
+                        cltbib-e        Collection bibliographie
+                        cltext-e        SupplÃ©ment bibliographie
+                        MARC-e          Exemple MARC
+                        oai-e           DÃ©mo OAI
+                        image-e         Collection d'images simple
+			pagedimg-e
+                        authen-e        DÃ©monstration de formatage et
+                                        d'authentification
+                        garish          Version Garish de la collection de
+                                        dÃ©monstration
+			style-e		
+			isis-e          Exemple CDS/ISIS
+
+        src         Fichiers source du programme
+
+                        Windows         Informations de configuration
+                                        pour Windows
+                        Unix            Informations de configuration
+                                        pour Unix
+                        lib             Code de bibliothÃšque C++
+                        packages        Code source C++ pour les
+                                        paquetages utilisÃ©s par Greenstone
+                        src             Code source C++
Index: other-projects/expeditee-release-kits/kits/rke/docs/READMEru.txt
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/docs/READMEru.txt	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/docs/READMEru.txt	(revision 28695)
@@ -0,0 +1,241 @@
+ÐÐ°Ð·Ð²Ð°ÐœÐžÐµ ÐÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÐŸÐµ ÐŸÐ±ÐµÑÐ¿ÐµÑÐµÐœÐžÐµ ÑÐžÑÑÐŸÐ²ÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž Greenstone.
+
+ÐŠÐµÐ»Ñ     ÐÐŸÐŒÐ¿Ð»ÐµÐºÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÐŸÐ³ÐŸ ÐŸÐ±ÐµÑÐ¿ÐµÑÐµÐœÐžÑ ÑÐžÑÑÐŸÐ²ÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž, ÐºÐŸÑÐŸÑÑÐ¹
+         Ð²ÐºÐ»ÑÑÐ°ÐµÑ Ð²ÐŸÐ·ÐŒÐŸÐ¶ÐœÐŸÑÑÑ ÐŸÐ±ÑÐ»ÑÐ¶ÐžÐ²Ð°ÐœÐžÑ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹ ÑÐžÑÑÐŸÐ²ÑÑ
+ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐº Ðž 
+         Ð¿ÐŸÑÑÑÐŸÐµÐœÐžÑ ÐœÐŸÐ²ÑÑ
+ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹
+
+ÐÐ²ÑÐŸÑ    ÐÐŸÐ²ÐŸÐ·ÐµÐ»Ð°ÐœÐŽÑÐºÐžÐ¹ ÐÑÐŸÐµÐºÑ ÐŠÐžÑÑÐŸÐ²ÐŸÐ¹ ÐÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž
+
+ÐÐžÑÐµÐœÐ·ÐžÑ ÐÑÐœÐŸÐ²ÐœÐ°Ñ ÐŸÐ±ÑÐµÑÑÐ²ÐµÐœÐœÐ°Ñ Ð»ÐžÑÐµÐœÐ·ÐžÑ GNU (Ð²ÐµÑÑÐžÑ 2).
+         ÐÐŸÐ»ÐœÑÐµ ÑÐµÑÐŒÐžÐœÑ Ðž ÑÑÐ»ÐŸÐ²ÐžÑ ÐœÐ°Ñ
+ÐŸÐŽÑÑÑÑ Ð² ÑÐ°Ð¹Ð»Ðµ COPYING ÐœÐ° ÑÑÐŸÐŒ CD-ROM
+
+ÐÐ°ÑÐ°     ÐÐºÑÑÐ±ÑÑ 2005
+
+ÐÐµÑÑÐžÑ   2.62
+
+ÐÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÑ
+         Install.pdf   Ð ÑÐºÐŸÐ²ÐŸÐŽÑÑÐ²ÐŸ Ð¿ÐŸ ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž ÑÐžÑÑÐŸÐ²ÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž Greenstone
+         User.pdf      Ð ÑÐºÐŸÐ²ÐŸÐŽÑÑÐ²ÐŸ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»Ñ ÑÐžÑÑÐŸÐ²ÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž Greenstone
+         Develop.pdf   Ð ÑÐºÐŸÐ²ÐŸÐŽÑÑÐ²ÐŸ ÑÐ°Ð·ÑÐ°Ð±ÐŸÑÑÐžÐºÐ° ÑÐžÑÑÐŸÐ²ÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž Greenstone
+         Paper.pdf     ÐÑ Ð±ÑÐŒÐ°Ð³Ðž Ðº ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž 
+
+ÐÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÑÐµ
+         ÑÑÐžÐ»ÐžÑÑ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÑÐœÐŸÐ³ÐŸ ÐžÐœÑÐµÑÑÐµÐ¹ÑÐ°
+         ÐÑÐ°ÑÐžÑÐµÑÐºÐžÐ¹ ÐžÐœÑÑÑÑÐŒÐµÐœÑ ÐŽÐ»Ñ ÑÐŸÐ·ÐŽÐ°ÐœÐžÑ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž Ñ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÐœÐžÐµÐŒ
+         Greenstone (ÑÑÐµÐ±ÑÐµÐŒÐ°Ñ Ð²ÐµÑÑÐžÑ 1.4 JRE, Ð²ÐºÐ»ÑÑÐµÐœÐœÐ°Ñ Ð² ÑÑÐŸÑ CD-ROM
+
+ÐÐ»Ð°ÑÑÐŸÑÐŒÐ°
+         Unix Ðž Windows. ÐÐžÐœÐ°ÑÐœÑÐµ ÐºÐŸÐŽÑ Ðž ÐžÑÑ
+ÐŸÐŽÐœÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° Ð²ÐºÐ»ÑÑÐµÐœÑ
+
+         ÐÐœÑÐµÑÑÐµÐ¹Ñ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»Ñ Greenstone ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑ Web-Ð±ÑÐ°ÑÐ·ÐµÑ,
+         Ð²ÐŸÑÐ¿ÑÐžÐœÐžÐŒÐ°ÑÑÐžÐ¹ ÑÐ°Ð±Ð»ÐžÑÑ Ðž ÑÑÐµÐ¹ÐŒÑ Javascript.
+         ÐÑÐ°ÑÐ·ÐµÑÑ, ÐºÐŸÑÐŸÑÑÐµ ÑÐŸÐŸÑÐ²ÐµÑÑÑÐ²ÑÑÑ ÑÑÐžÐŒ ÑÑÐµÐ±ÐŸÐ²Ð°ÐœÐžÑÐŒ:
+
+                  Netscape Navigator 4.0
+                  Internet Explorer 4.0
+                  Mozilla, Safari
+
+         ÐÐŸÐ»ÐµÐµ Ð¿ÐŸÐ·ÐŽÐœÐžÐµ Ð²ÐµÑÑÐžÐž ÑÑÐžÑ
+ Ð±ÑÐ°ÑÐ·ÐµÑÐŸÐ² ÑÐ°ÐºÐ¶Ðµ ÐŽÐŸÐ»Ð¶ÐœÑ ÑÐ°Ð±ÐŸÑÐ°ÑÑ.
+
+         CD-ROM ÑÐŸÐŽÐµÑÐ¶ÐžÑ Windows- Ð²ÐµÑÑÐžÑ Netscape 4.05 Ð² ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž
+         Windows\bin\windows\netscape.
+
+Unix     ÐÑÑ
+ÐŸÐŽÐœÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° ÐºÐŸÐŒÐ¿ÐžÐ»ÐžÑÐŸÐ²Ð°Ð»Ð° Ðž Ð±ÑÐ»Ð° Ð¿ÑÐŸÐ²ÐµÑÐµÐœÐ° ÐœÐ° Linux Ðž
+         Solaris. ÐÐžÐœÐ°ÑÐœÑÐ¹ ÐºÐŸÐŽ ÑÑÐµÐ±ÑÐµÑ Intel Ñ
+86, ÐºÐŸÑÐŸÑÑÐ¹ Ð²ÐºÐ»ÑÑÐ°ÐµÑ
+         Ð±ÐžÐœÐ°ÑÐœÑÑ Ð¿ÐŸÐŽÐŽÐµÑÐ¶ÐºÑ ELF Ðž Ð¿ÐŸÐŽÐŽÐµÑÐ¶ÐžÐ²Ð°ÐµÑ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÑ GNU Ð¡ (glibc 2.0
+         ÐžÐ»Ðž Ð²ÑÑÐµ). ÐÐžÑÑÑÐžÐ±ÑÑÐžÐ²Ñ, ÐºÐŸÑÐŸÑÑÐµ ÐŸÑÐ²ÐµÑÐ°ÑÑ ÑÑÐžÐŒ ÑÑÐµÐ±ÐŸÐ²Ð°ÐœÐžÑÐŒ,
+         Ð²ÐºÐ»ÑÑÐ°ÑÑ:
+
+                  RedHat 5.1
+                  SuSE Linux 6.1
+                  Debian 2.1
+                  Slackware 4.0
+
+         ÐÐŸÐ»ÐµÐµ Ð¿ÐŸÐ·ÐŽÐœÐžÐµ Ð²ÐµÑÑÐžÐž ÑÑÐžÑ
+ ÐŽÐžÑÑÑÐžÐ±ÑÑÐžÐ²ÐŸÐ² ÑÐ°ÐºÐ¶Ðµ ÐŽÐŸÐ»Ð¶ÐœÑ ÑÐ°Ð±ÐŸÑÐ°ÑÑ.
+
+Windows  ÐÑÑ
+ÐŸÐŽÐœÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° Ð¿ÐŸÐŽ Windows ÐºÐŸÐŒÐ¿ÐžÐ»ÐžÑÐŸÐ²Ð°Ð»Ð°ÑÑ Ñ Microsoft Visual
+         C++ 4.2 Ðž 6.0; Ð±ÐžÐœÐ°ÑÐœÑÐ¹ ÐºÐŸÐŽ Ð±ÑÐ» Ð¿ÑÐŸÐ²ÐµÑÐµÐœ ÐœÐ° Windows 3.1, 95/98,
+         NT, 2000, XP
+
+         ÐÐ³ÑÐ°ÐœÐžÑÐµÐœÐžÐµ: 
+             ÐÑÐŸÑÐµÑÑ ÑÐŸÐ·ÐŽÐ°ÐœÐžÑ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž ÑÑÐµÐ±ÑÐµÑ ÐœÐ°Ð»ÐžÑÐžÑ PERL, Ðž Ð¿ÐŸÑÑÐŸÐŒÑ
+             ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž ÐœÐµ ÐŒÐŸ-Ð³ÑÑ ÑÐŸÐ·ÐŽÐ°Ð²Ð°ÑÑÑÑ  Ð¿ÐŸÐŽ Windows 3.1
+
+ÐÐœÑÑÐ°Ð»Ð»ÑÑÐžÑ  
+         Install.pdf ÐŸÐ¿ÐžÑÑÐ²Ð°ÐµÑ Ð¿ÐŸÐ»ÐœÑÑ Ð¿ÑÐŸÑÐµÐŽÑÑÑ ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž ÐºÐ°Ðº ÐŽÐ»Ñ Unix,
+         ÑÐ°Ðº Ðž ÐŽÐ»Ñ Windows Ðž Ð²ÐºÐ»ÑÑÐ°ÐµÑ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÐŸÐœÐœÑÑ ÐŸÐ±ÑÑÐ°ÑÑÑÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ
+         ÐºÐŸÐœÑÐžÐ³ÑÑÐžÑÐŸÐ²Ð°ÐœÐžÑ Greenstone, Ð° ÑÐ°ÐºÐ¶Ðµ ÑÐµÑÐ²ÐµÑÐŸÐ² Apache, PWS Ðž IIS Web
+         Servers, ÑÐŸÐŸÑÐ²ÐµÑÑÑÐ²ÐµÐœÐœÐŸ.
+
+         Ð¡Ð°ÐŒÐŸÑÑÑÐ°ÐœÐ°Ð²Ð»ÐžÐ²Ð°ÑÑÐžÐµÑÑ ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐŸÐœÐœÑÐµ ÑÐºÑÐžÐ¿ÑÑ ÐžÐŒÐµÑÑÑÑ Ðž ÐŽÐ»Ñ Windows,
+         Ðž ÐŽÐ»Ñ Unix, ÐºÐŸÑÐŸÑÑÐµ Ð¿ÑÐŸÐ²ÐŸÐŽÑÑ ÐÐ°Ñ ÑÐ°Ð³ Ð·Ð° ÑÐ°Ð³ÐŸÐŒ ÑÐµÑÐµÐ· ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐŸÐœÐœÑÐµ
+         Ð¿ÑÐŸÑÐµÐŽÑÑÑ Ðž ÐŸÐ±ÐµÑÐ¿ÐµÑÐžÐ²Ð°ÑÑ ÑÐŸÐŸÑÐ²ÐµÑÑÑÐ²ÑÑÑÐžÐµ Ð²Ð°ÑÐžÐ°ÐœÑÑ ÐœÐ° ÐºÐ°Ð¶ÐŽÐŸÐ¹ ÑÑÐ°ÐŽÐžÐž.
+
+             ÐÐ»Ñ ÑÑÑÐ°ÐœÐŸÐ²ÐºÐž Windows 9Ñ
+/NT/2000/XP Ð²ÑÐ¿ÐŸÐ»ÐœÐžÑÐµ Setup.exe
+             ÐÐ»Ñ ÑÑÑÐ°ÐœÐŸÐ²ÐºÐž  Unix Ð²ÑÐ¿ÐŸÐ»ÐœÐžÑÐµ Unix/Install.sh
+
+         ÐÐŒÐµÑÑÑÑ ÐŽÐµÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐŸÐœÐœÑÐµ ÑÐºÑÐžÐ¿ÑÑ, ÐºÐŸÑÐŸÑÑÐµ ÐŽÐŸÐ»Ð¶ÐœÑ Ð¿ÑÐŸÐžÐ·Ð²ÐŸÐŽÐžÑÑ
+         ÑÐŽÐ°Ð»ÐµÐœÐžÐµ, ÐµÑÐ»Ðž ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÑ ÐœÐµÑÐŽÐ°ÑÐœÐ°.
+
+ÐÐŸÐŽÐŽÐµÑÐ¶ÐºÐ°
+         ÐÐŸÐ¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐŸÐŸÐ±ÑÐžÑÐµ ÐŸ Ð»ÑÐ±ÑÑ
+ Ð¿ÑÐŸÐ±Ð»ÐµÐŒÐ°Ñ
+ Ð² ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž ÐžÐ»Ðž ÐŽÐ°Ð»ÑÐœÐµÐ¹ÑÐµÐ¹
+         ÑÐ°Ð±ÐŸÑÐµ Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÑÐŒ ÐŸÐ±ÐµÑÐ¿ÐµÑÐµÐœÐžÐµÐŒ ÑÐžÑÑÐŸÐ²ÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž Geenstone, 
+         ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÑ ÑÐŸÐŸÐ±ÑÐµÐœÐžÑ ÐŸÐ± ÐŸÑÐžÐ±ÐºÐ°Ñ
+, ÑÐŸÐŽÐµÑÐ¶Ð°ÑÐžÑ
+ÑÑ Ð² Support.htm ÐœÐ° Ð²ÐµÑÑ
+ÐœÐµÐŒ 
+         ÑÑÐŸÐ²ÐœÐµ Ð² ÑÑÐŸÐŒ CD-ROM.
+
+         ÐÐŒÐµÐµÑÑÑ ÑÐ¿ÐžÑÐŸÐº Ð°ÐŽÑÐµÑÐ°ÑÐŸÐ² Greenstone, Ðº ÐºÐŸÑÐŸÑÐŸÐŒÑ ÐÑ ÐŒÐŸÐ¶ÐµÑÐµ 
+         Ð¿ÑÐžÑÐŸÐµÐŽÐžÐœÐžÑÑÑÑ, ÐœÐ° http: //greenstone.org/English/docs.html. Ð ÑÑÐ° 
+         ÑÑÑÐ°ÐœÐžÑÐ°, Ðž ÑÐ¿ÐžÑÐŸÐº ÐœÐ°ÐžÐ±ÐŸÐ»ÐµÐµ ÑÐ°ÑÑÐŸ Ð·Ð°ÐŽÐ°Ð²Ð°ÐµÐŒÑÑ
+ Ð²ÐŸÐ¿ÑÐŸÑÐŸÐ² ÐœÐ° ÑÑÐŸÐŒ ÑÐ°Ð¹ÑÐµ 
+         Ð²ÑÐ²ÐŸÐŽÑÑ ÐœÐ° Ð±ÐŸÐ»ÑÑÐŸÐµ ÐºÐŸÐ»ÐžÑÐµÑÑÐ²ÐŸ Ð¿ÐŸÐ»ÐµÐ·ÐœÐŸÐ¹ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÐž.
+
+Ð¡ÐŸÐŽÐµÑÐ¶Ð°ÐœÐžÐµ ÐŽÐ°ÐœÐœÐŸÐ³ÐŸ CD-ROM
+
+         README.TXT   ÐÐŸÐºÑÐŒÐµÐœÑ, ÐºÐŸÑÐŸÑÑÐ¹ ÐÑ ÑÐžÑÐ°ÐµÑÐµ
+
+         COPYING      ÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ¿ÐžÑÑÐ²Ð°ÐµÑ ÑÑÐ»ÐŸÐ²ÐžÑ, Ð¿ÑÐž ÐºÐŸÑÐŸÑÑÑ
+ ÑÑÐŸ
+                      Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÐŸÐµ ÐŸÐ±ÐµÑÐ¿ÐµÑÐµÐœÐžÐµ ÐŒÐŸÐ¶ÐµÑ Ð±ÑÑÑ ÑÐºÐŸÐ¿ÐžÑÐŸÐ²Ð°ÐœÐŸ        
+
+         Support.htm  Ð€ÐŸÑÐŒÐ° ÑÐŸÐŸÐ±ÑÐµÐœÐžÑ ÐŸ Ð¿ÑÐŸÐ±Ð»ÐµÐŒÐ°Ñ
+  Ð¿ÑÐž ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž ÐžÐ»Ðž
+                      Ð¿ÑÐŸÐŽÐŸÐ»Ð¶ÐµÐœÐžÐž ÑÐ°Ð±ÐŸÑÑ Ñ  Grenstone
+
+         Setup.exe    Ð¡Ð°ÐŒÐŸÐžÐœÑÑÐ°Ð»Ð»ÐžÑÑÐµÐŒÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° Ð¿ÐŸÐŽ Windows, ÐºÐŸÑÐŸÑÐ°Ñ 
+                      Ð²ÐºÐ»ÑÑÐ°ÐµÑ Ð²ÐŸÐ·ÐŒÐŸÐ¶ÐœÐŸÑÑÑ Ð²ÑÐ±ÐŸÑÐ° ÐŽÐ»Ñ ÑÑÑÐ°ÐœÐŸÐ²ÐºÐž Ð±ÐžÐœÐ°ÑÐœÑÑ
+
+                      ÐºÐŸÐŽÐŸÐ² ÐžÐ»Ðž ÐžÑÑ
+ÐŸÐŽÐœÐŸÐ¹ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ
+
+         docs         ÐÐŸÐºÑÐŒÐµÐœÑÐ°ÑÐžÑ, ÐºÐŸÑÐŸÑÐ°Ñ Ð²ÐºÐ»ÑÑÐ°ÐµÑ ÑÐ»ÐµÐŽÑÑÑÐµÐµ:
+
+                  Install.pdf   Ð ÑÐºÐŸÐ²ÐŸÐŽÑÑÐ²ÐŸ Ð¿ÐŸ ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž.
+                                ÐÐ¿ÐžÑÑÐ²Ð°ÐµÑ Ð¿ÑÐŸÑÐµÑÑ  ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž ÐŽÐ»Ñ Unix Ðž
+                                Windows Ðž Ð²ÐºÐ»ÑÑÐ°ÐµÑ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÐŸÐœÐœÑÑ ÐŸÐ±ÑÑÐ°ÑÑÑÑ
+                                Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ Ð¿ÐŸ ÐºÐŸÐœÑÐžÐ³ÑÑÐžÑÐŸÐ²Ð°ÐœÐžÑ Greenstone, Web
+                                Server Ðž Apache
+
+                  User.pdf      Ð ÑÐºÐŸÐ²ÐŸÐŽÑÑÐ²ÐŸ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»Ñ. 
+                                ÐÐ°ÑÑ Ð²ÑÐµÑÑÐŸÑÐŸÐœÐœÐµÐµ ÐŸÐ¿ÐžÑÐ°ÐœÐžÐµ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÐœÐžÑ
+                                Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÐŸÐ³ÐŸ ÐŸÐ±ÐµÑÐ¿ÐµÑÐµÐœÐžÑ Greenstone ÐŽÐ»Ñ
+                                Ð¿ÐŸÐŽÐŽÐµÑÐ¶ÐºÐž Ðž Ð¿ÐŸÑÑÑÐŸÐµÐœÐžÑ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹
+
+                  Develop.pdf   Ð ÑÐºÐŸÐ²ÐŸÐŽÑÑÐ²ÐŸ Ð Ð°Ð·ÑÐ°Ð±ÐŸÑÑÐžÐºÐ°.
+                                Ð­ÑÐŸ ÑÑÐºÐŸÐ²ÐŸÐŽÑÑÐ²ÐŸ ÐŸÐ¿ÐžÑÑÐ²Ð°ÐµÑ, ÐºÐ°Ðº ÑÐ°Ð±ÐŸÑÐ°ÐµÑ
+                                Greenstone. ÐÐœÐŸ Ð¿ÑÐµÐŽÐœÐ°Ð·ÐœÐ°ÑÐµÐœÐŸ ÐŽÐ»Ñ ÑÐµÑ
+, ÐºÑÐŸ
+                                Ð¶ÐµÐ»Ð°ÐµÑ ÐœÐ°ÑÑÑÐ°ÐžÐ²Ð°ÑÑ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž, Ð° ÑÐ°ÐºÐ¶Ðµ ÑÐ°Ð·Ð²ÐžÐ²Ð°ÑÑ
+                                Ðž Ð¿ÐŸÐŽÐŽÐµÑÐ¶ÐžÐ²Ð°ÑÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÐŸÐµ ÐŸÐ±ÐµÑÐ¿ÐµÑÐµÐœÐžÐµ.
+
+                  Paper.pdf     ÐÑ Ð±ÑÐŒÐ°Ð³Ðž Ðº ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž.
+                                Ð­ÑÐŸ ÑÑÐºÐŸÐ²ÐŸÐŽÑÑÐ²ÐŸ ÑÐŸÐŽÐµÑÐ¶ÐžÑ Ð¿ÑÐ°ÐºÑÐžÑÐµÑÐºÑÑ
+                                ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑ Ð¿ÐŸ ÑÐŸÐ·ÐŽÐ°ÐœÐžÑ ÑÐžÑÑÐŸÐ²ÑÑ
+ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹
+                                Ð¿ÐŸÐ»ÐœÐŸÑÐµÐºÑÑÐŸÐ²ÑÑ
+  ÐŽÐŸÐºÑÐŒÐµÐœÑÐŸÐ².
+
+         Unix         ÐÐµÑÑÐžÑ Unix, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ°Ñ Ð±ÐžÐœÐ°ÑÐœÑÐµ ÐºÐŸÐŽÑ Linux, ÑÐ»ÐµÐŽÑÑÑÐžÐµ
+                      ÑÐ°Ð¹Ð»Ñ Ð²ÐµÑÑ
+ÐœÐµÐ³ÐŸ ÑÑÐŸÐ²ÐœÑ Ðž ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž:            
+
+                  Install.sh    ÑÐºÑÐžÐ¿ÑÑ ÑÑÑÐ°ÐœÐŸÐ²ÐºÐž Ðž ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐž Unix (ÐµÑÐ»Ðž
+                                ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ Linux, ÑÐŸ Ð²ÐºÐ»ÑÑÐ°ÐµÑ ÑÑÑÐ°ÐœÐŸÐ²ÐºÐž
+                                Ð±ÐžÐœÐ°ÑÐœÑÑ
+ ÐºÐŸÐŽÐŸÐ²; Ð² Ð¿ÑÐŸÑÐžÐ²ÐœÐŸÐŒ ÑÐ»ÑÑÐ°Ðµ
+                                ÑÑÑÐ°ÐœÐ°Ð²Ð»ÐžÐ²Ð°ÐµÑÑÑ ÐžÑÑ
+ÐŸÐŽÐœÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ°)
+                  bin           Ð±ÐžÐœÐ°ÑÐœÑÐµ ÐºÐŸÐŽÑ ÐŽÐ»Ñ Linux.
+
+         Windows      Ð±ÐžÐœÐ°ÑÐœÑÐµ ÐºÐŸÐŽÑ ÐŽÐ»Ñ Windows
+
+                  bin           Ð±ÐžÐœÐ°ÑÐœÑÐµ ÐºÐŸÐŽÑ ÐŽÐ»Ñ Windows
+
+         gsdl         Ð¡ÑÑÑÐºÑÑÑÐ° ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÐŸÐ³ÐŸ ÐŸÐ±ÐµÑÐ¿ÐµÑÐµÐœÐžÑ ÑÐžÑÑÐŸÐ²ÐŸÐ¹
+                      Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž Greenstone. ÐÐžÐ¶Ðµ ÑÐºÐ°Ð·Ð°ÐœÑ Ð·ÐµÑÐºÐ°Ð»Ð° ÑÑÑÑÐºÑÑÑÑ
+                      ÐŽÐžÑÐµÐºÑÐŸÑÐžÐ¹ ÑÐžÑÑÐŸÐ²ÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž Greenstone, ÐºÐŸÑÐŸÑÑÐµ ÐŽÐŸÐ»Ð¶ÐœÑ
+                      Ð±ÑÑÑ ÑÑÑÐ°ÐœÐŸÐ²Ð»ÐµÐœÑ
+
+                  bin           ÐžÑÐ¿ÐŸÐ»ÐœÑÐµÐŒÑÐ¹ ÐºÐŸÐŽ
+                  cgi-bin       CGI-ÑÐºÑÐžÐ¿ÑÑ
+                  collect       ÐÐŸÐ»Ð»ÐµÐºÑÐžÐž Greenstone (Ð²ÐºÐ»ÑÑÐ°ÐµÑ ÐŽÐµÐŒÐŸÐœÑÑÑÐ°ÑÐžÐŸÐœÐœÑÑ
+                                ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ, Ð¿ÑÐµÐŽÐ¿ÐŸÑÑÑÐŸÐµÑÐœÑÐµ ÐžÐœÐŽÐµÐºÑÑ Ðž ÐžÑÑ
+ÐŸÐŽÐœÑÐµ
+                                ÐŽÐŸÐºÑÐŒÐµÐœÑÑ)
+                  etc           ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÐŸÐœÐœÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð¶ÑÑÐœÐ°Ð»Ñ ÑÐµÐ³ÐžÑÑÑÐ°ÑÐžÐž
+                                Ðž Ñ.ÐŽ.
+                  gli           ÐžÐœÑÑÑÑÐŒÐµÐœÑ ÐžÐœÑÐµÑÑÐµÐ¹ÑÐ° Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž Greenstone
+                  images        ÐžÐ·ÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÑ, ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÐŒÑÐµ ÐžÐœÑÐµÑÑÐµÐ¹ÑÐŸÐŒ;
+                  macros        ÐŒÐ°ÐºÑÐŸÑ Ð¿ÐŸÐºÐ°Ð·Ð°;
+                  perllib       ÐŒÐŸÐŽÑÐ»Ðž Perl, ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÐŒÑÐµ Ð¿ÑÐž ÑÐŸÐ·ÐŽÐ°ÐœÐžÐž
+                                ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹;  
+                  mappings      ÑÐ°Ð±Ð»ÐžÑÑ ÑÑÐ°ÐœÑÐ»ÑÑÐžÐž Unicode.
+
+                      ÐÐœÑÑÐ°Ð»Ð»ÑÑÐžÐŸÐœÐœÐ°Ñ Ð¿ÑÐŸÑÐµÐŽÑÑÐ° ÑÑÑÐ°ÐœÐ°Ð²Ð»ÐžÐ²Ð°ÐµÑ ÑÐ°Ð¹Ð»Ñ Ð² ÐœÐµÐºÐŸÑÐŸÑÑÐµ
+                      ÐžÐ· ÑÑÐžÑ
+ ÐŽÐžÑÐµÐºÑÐŸÑÐžÐ¹ ÑÐ»ÐµÐŽÑÑÑÐžÐŒ ÐŸÐ±ÑÐ°Ð·ÐŸÐŒ:
+
+                  top level     ÐºÐŸÐŒÐ°ÐœÐŽÐœÑÐ¹ ÑÐ°Ð¹Ð» ÐžÐ»Ðž ÑÐºÑÐžÐ¿Ñ ÐŸÐ±ÐŸÐ»ÐŸÑÐºÐž;
+                  bin           ÐžÑÐ¿ÐŸÐ»ÐœÑÐµÐŒÑÐ¹ ÐºÐŸÐŽ;   
+                  cgi-bin       ÑÐºÑÐžÐ¿ÑÑ Ð¡GL;
+                  collect       ÐŽÐµÐŒÐŸÐœÑÑÑÐ°ÑÐžÐŸÐœÐœÐ°Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ Greenstone.
+                                ÐÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÑÐµ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž, ÐŸÐ¿ÑÐµÐŽÐµÐ»ÐµÐœÐœÑÐµ Ð²ÐŸ
+                                Ð²ÑÐµÐŒÑ ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž;
+                  src, lib, packages
+                                ÐžÑÑ
+ÐŸÐŽÐœÑÐ¹ ÐºÐŸÐŽ, ÐµÑÐ»Ðž ÐŸÐœ ÐŸÐ¿ÑÐµÐŽÐµÐ»ÐµÐœ Ð²ÐŸ Ð²ÑÐµÐŒÑ
+                                ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž.
+
+        collect       ÐÐŸÐ»Ð»ÐµÐºÑÐžÐž Greenstone, Ð¿ÑÐµÐŽÐ²Ð°ÑÐžÑÐµÐ»ÑÐœÐŸ ÑÐŸÐ·ÐŽÐ°ÐœÐœÑÐµ. ÐÐ±ÑÐ°ÑÐžÑÐµ
+                      Ð²ÐœÐžÐŒÐ°ÐœÐžÐµ, ÑÑÐŸ Ñ
+ÐŸÑÑ Ð¿ÑÐŸÑÐµÐŽÑÑÐ° ÐžÐœÑÑÐ°Ð»Ð»ÑÑÐžÐž ÑÐŸÐ»ÑÐºÐŸ
+                      ÑÑÑÐ°ÐœÐ°Ð²Ð»ÐžÐ²Ð°ÐµÑ ÐžÐœÐŽÐµÐºÑÑ Ð¿ÑÐµÐŽÐ¿ÐŸÑÑÑÐŸÐµÐœÐžÑ, ÐŸÑÐžÐ³ÐžÐœÐ°Ð»ÑÐœÑÐµ
+                      ÐžÑÑ
+ÐŸÐŽÐœÑÐµ ÐŽÐŸÐºÑÐŒÐµÐœÑÑ ÐŽÐ»Ñ ÐºÐ°Ð¶ÐŽÐŸÐ¹ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž ÐŽÐŸÑÑÑÐ¿ÐœÑ ÐœÐ°
+                      CD-ROM. ÐÑÑ
+ÐŸÐŽÐœÑÐµ ÐŽÐŸÐºÑÐŒÐµÐœÑÑ ÐŒÐŸÐ³ÑÑ Ð±ÑÑÑ Ð¿ÐŸÐ»ÐµÐ·ÐœÑ ÐŽÐ»Ñ ÑÐµÑ
+,
+                      ÐºÑÐŸ Ð¿ÑÑÐ°ÐµÑÑÑ ÑÐŸÐ·ÐŽÐ°Ð²Ð°ÑÑ ÐœÐŸÐ²ÑÐµ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž, ÐºÐŸÑÐŸÑÑÐµ ÐºÐŸÐ¿ÐžÑÑÑÑ 
+                      ÑÐŸÑÐŒÐ°Ñ ÑÑÐžÑ
+ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹.
+
+                   demo         ÐŽÐµÐŒÐŸÐœÑÑÑÐ°ÑÐžÐŸÐœÐœÑÐ¹ Ð¿ÑÐžÐŒÐµÑ Greenstone
+                   dls-e        Ð¡ÑÐ±ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ ÐÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž ÑÐ°Ð·Ð²ÐžÑÐžÑ
+                   wrdpdf-e     ÐÐµÐŒÐŸÐœÑÑÑÐ°ÑÐžÑ MSWord Ðž PDF
+                   gsarch-e     ÐÐŸÐ»Ð»ÐµÐºÑÐžÑ Ð°ÑÑ
+ÐžÐ²ÐŸÐ² Greenstone
+                   cltbib-e     ÐÐžÐ±Ð»ÐžÐŸÐ³ÑÐ°ÑÐžÑÐµÑÐºÐ°Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ
+                   cltext-e     ÐÑÐžÐ»ÐŸÐ¶ÐµÐœÐžÐµ Ð±ÐžÐ±Ð»ÐžÐŸÐ³ÑÐ°ÑÐžÐž
+                   MARC-e       ÐÑÐžÐŒÐµÑ MARC
+                   oai-e        ÐÐµÐŒÐŸÐœÑÑÑÐ°ÑÐž-ÐŸÐœÐœÐ°Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ OAI
+                   image-e      ÐÑÐŸÑÑÐ°Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ ÐžÐ·ÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÐ¹
+                   authen-e     ÐÐµÐŒÐŸÐœÑÑÑÐ°ÑÐžÑ ÑÐŸÑÐŒÐ°ÑÐžÑÐŸÐ²Ð°-ÐœÐžÑ Ðž Ð°ÑÑÐµÐœÑÐžÑÐžÐºÐ°ÑÐžÐž
+                   garish       Ð ÐµÐ·ÐºÐ°Ñ Ð²ÐµÑÑÐžÑ ÐŽÐµÐŒÐŸÐœÑÑÑÐ°ÑÐžÐŸÐœ-ÐœÐŸÐ¹ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž
+                   isis-e       ÐÑÐžÐŒÐµÑ CDS/ISIS
+
+        src           ÑÐ°Ð¹Ð»Ñ ÐžÑÑ
+ÐŸÐŽÐœÐŸÐ³ÐŸ ÑÐµÐºÑÑÐ° Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ
+
+                   Windows      ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÐŸÐœÐœÐ°Ñ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑ ÐŽÐ»Ñ Windows
+                   Unix         ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÐŸÐœÐœÐ°Ñ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑ ÐŽÐ»Ñ Unix  
+                   lib          Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐ° ÐºÐŸÐŽÐŸÐ² C++
+                   packages     ÐžÑÑ
+ÐŸÐŽÐœÑÐ¹ ÐºÐŸÐŽ C++ ÐŽÐ»Ñ Ð¿Ð°ÐºÐµÑÐŸÐ², ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÐŒÑÑ
+ 
+                                Greenstone
+                   src          ÐžÑÑ
+ÐŸÐŽÐœÑÐ¹ ÐºÐŸÐŽ C++ (ÑÐµÐºÑÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÑ).
Index: other-projects/expeditee-release-kits/kits/rke/docs/SUPPORT.txt
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/docs/SUPPORT.txt	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/docs/SUPPORT.txt	(revision 28695)
@@ -0,0 +1,30 @@
+GREENSTONE SUPPORT
+
+A complete list of Greenstone support options is available at:
+http://www.greenstone.org/support
+
+In particular, 
+	Greenstone Website:
+		http://www.greenstone.org
+		Greenstone's main website.
+	Greenstone Wiki: 
+		http://wiki.greenstone.org
+		Contains documentation, and links to manuals, tutorials etc.
+	Greenstone Mailing List:
+		(to subscribe)		
+		http://list.waikato.ac.nz/mailman/listinfo/greenstone-users
+		(to post)
+		greenstone-users@list.waikato.ac.nz
+
+Documentation Manuals are available on CD-ROM releases of Greenstone in the
+"Documentation" folder.
+
+To submit bug reports, follow these steps:
+
+1.	Register as a developer to gain access to Greenstone's bug tracking
+	system at http://www.greenstone.org/developers-register
+2.	Go to http://trac.greenstone.org/ in your web browser and click "login"
+	near the top of the screen. Login with your username and password.
+3.	Click on "New Ticket" near the top of the screen and fill in the Create
+	New Ticket form.
+
Index: other-projects/expeditee-release-kits/kits/rke/installer/antinstall-config.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/installer/antinstall-config.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/installer/antinstall-config.xml	(revision 28695)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN" "http://antinstaller.sf.net/dtd/antinstall-config-0.8.dtd">
+<installer
+			ui="swing,text"
+			verbose="true"
+			debug="false"
+			lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
+			name="Greenstone@version@ Installer"
+			windowIcon="/resources/icon.png"
+			defaultImageResource="/resources/header.png"
+			minJavaVersion="1.4">
+
+	<!-- select language page -->
+	<page type="input" name="language-selector" displayText="">
+		<comment name="language-selector-explanation"/>
+		<select property="language" defaultValue="en" displayText="" useAsLocale="true">
+			<option value="en" text="English"/>
+			<option value="fr" text="FranÃ§ais (French)"/>
+			<option value="es" text="EspaÃ±ol (Spanish)"/>
+			<option value="de" text="Deutsch (German)"/>
+			<option value="ru" text="ÑÑÑÑÐºÐžÐ¹ ÑÐ·ÑÐº (Russian)"/>
+			<option value="zh" text="äž­æ (Chinese)"/>
+			<option value="ar" text="Arabic"/>
+		</select>
+	</page>
+
+	<!-- intro page -->
+	<page type="input" name="intro" displayText="">
+		<comment name="welcome"/>
+	</page>
+
+	<!-- licence page -->
+	<page type="license" name="license" resource="/LICENSE.txt"  displayText="" />
+
+	<!--  install destination page -->
+	<page type="input" name="destination" displayText="">
+
+		<!-- if linux|mac -->
+		<directory property="installDir"
+			defaultValue="/usr/local/Greenstone,${env.HOME}/Greenstone"
+			create="true"
+			displayText=""
+			flagFile="_uninst"
+			flagFileExistsProperty="ISInstallDetected"
+			/>
+		<!-- /if -->
+		<!-- if windows -->
+		<directory property="installDir"
+			defaultValue="C:\Program Files\Greenstone,${env.HOMEDRIVE}\${env.HOMEPATH}\Greenstone"
+			create="true"
+			displayText=""
+			flagFile="_uninst"
+			flagFileExistsProperty="ISInstallDetected"
+			/>
+		<!-- /if -->
+
+	</page>
+
+	<!-- don't budge if installshield installation found -->
+	<page type="input" name="dontBudge" displayText="" ifProperty="(${ISInstallDetected}==true)" showNextButton="false">
+		<comment name="is-install-detected"/>
+	</page>
+
+	<!-- components -->
+	<page type="input" name="selector" displayText="">
+		<comment name="choose-components"/>
+
+		<!-- if linux|windows -->
+		<target
+			target="Initialising"
+			diskRequirement="x"
+			defaultValue="true"
+			displayText="x"
+			force="true"
+			hidden="true"/>
+		<!-- /if -->
+
+		<target
+			target="Installing Core System"
+			diskRequirement="@component.size.core@"
+			displayText=""
+			defaultValue="true"
+			force="true"/>
+
+		<target
+		        target="Installing Apache Web Server"
+			diskRequirement="@component.size.httpd@"
+			displayText=""
+			defaultValue="true"/>
+
+		<target
+			target="Installing ImageMagick"
+			diskRequirement="@component.size.imagemagick@"
+			defaultValue="true" 
+			displayText=""/>
+
+		<!-- if windows|mac -->
+		<target
+			target="Installing Ghostscript"
+			diskRequirement="@component.size.ghostscript@"
+			defaultValue="true" 
+			displayText=""/>
+		<!-- /if -->
+
+
+		<!-- start cdrom -->
+		<!-- the size of this component has to be maintained manually as we can't
+			know at compile time how big the documented examples are -->
+		<target
+			target="Installing Documented Examples"
+			diskRequirement="108 MB"
+			defaultValue="true" 
+			displayText=""/>
+		<!-- end cdrom -->
+
+		<!-- if windows -->
+		<target
+			target="Installing Start Menu Shortcuts"
+			diskRequirement="~10 KB"
+			defaultValue="true"
+			displayText=""/>
+		<!-- /if -->
+
+	</page>
+
+	<!-- page to ask if we should enable admin pages -->
+	<page type="input" name="admin-pages" displayText="">
+		<comment name="admin-expl"/>
+		<comment name="admin-expl-2"/>
+		<comment name="admin-expl-3"/>
+		<checkbox property="enable.admin.pages" displayText="" defaultValue="false"/>
+	</page>
+
+	<!-- only if they said yes above, set a password -->
+	<page type="input" name="admin-password" displayText="" ifProperty="(${enable.admin.pages}==true)" target="Configuring Administration Pages">
+		<comment name="admin-password-expl"/>
+		<validated property="admin.password" defaultValue="" displayText="" regex="^.{3,20}$"/>
+	</page>
+
+	<!-- progress page -->
+	<page type="progress" name="progress" showTargets="true" displayText=""/>
+
+</installer>
Index: other-projects/expeditee-release-kits/kits/rke/installer/build.xml
===================================================================
--- other-projects/expeditee-release-kits/kits/rke/installer/build.xml	(revision 28695)
+++ other-projects/expeditee-release-kits/kits/rke/installer/build.xml	(revision 28695)
@@ -0,0 +1,392 @@
+<?xml version="1.0"?>
+<!--
+This is the build.xml run by AntInstaller for the installer
+-->
+
+<project name="Installation">
+
+	<!-- this is required to pick up the properties generated during the install pages -->
+	<property file="${basedir}/ant.install.properties"/>
+
+	<!-- set some properties to keep track of the OS -->
+	<!-- if windows -->
+	<property name="rk.os" value="windows"/>
+	<property name="shell.name" value="windows"/>
+	<!-- /if -->
+	<!-- if linux -->
+	<property name="rk.os" value="linux"/>
+	<property name="shell.name" value="linux"/>
+	<!-- /if -->
+	<!-- if mac -->
+	<property name="rk.os" value="mac"/>
+	<property name="shell.name" value="darwin"/>
+	<!-- /if -->
+
+	<!-- classpath -->
+	<path id="project.classpath">
+		<pathelement path="${antinstaller.jar}"/>
+	</path>
+
+	<!-- custom tasks -->
+	<taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/>
+	<typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
+	<typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/>
+	<!-- if windows -->
+	<taskdef name="shortcut" classname="com.orangevolt.tools.ant.Win32ShortcutTask" classpathref="project.classpath"/>
+	<taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/> 
+	<typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
+	<!-- /if -->
+	<!-- if linux|mac -->
+	<taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
+	<!-- /if -->
+
+	<!-- determine if a bundled java exists -->
+	<condition property="bundled.java.exists">
+		<or>
+			<available file="../@java.extracted@/bin/java"/>
+			<available file="../@java.extracted@/bin/java.exe"/>
+		</or>
+	</condition>
+
+	<!-- determine if there is an existing installation in the installDir-->
+	<available file="${installDir}\etc\installation.properties" property="is.overinstall"/>
+
+	<!-- create a local installDir String -->
+	<path id="installDir.path"><pathelement location="${installDir}"/></path>
+	<property name="installDir.local" refid="installDir.path"/>
+
+	<!-- if windows -->
+	<!-- load windows properties -->
+	<winprops/>
+	<!-- /if -->
+
+	<!-- load the properties of the previous installation if this is an overinstall -->
+	<target name="Looking For Previous Installation" if="is.overinstall">
+		<property file="${installDir}\etc\installation.properties"/>
+		<delete dir="${installed.startmenu.path}" failonerror="false"/>
+	</target>
+
+	<!-- copy jre -->
+	<target name="Initialising" if="bundled.java.exists">
+		<mkdir dir="${installDir}/packages"/>
+		<copy todir="${installDir}/packages/jre" failonerror="false">
+			<fileset dir="../@java.extracted@"/>
+		</copy>
+		<chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>		
+	</target>
+
+	<!-- core system -->
+	<target name="Installing Core System">
+
+		<!-- if windows -->
+		<!-- figure out the start menu path -->
+		<getfreepath path="${win32.personal.programs_menu}\${projectname}" property="startmenu.path"/>		
+		<path id="startmenu.path.path" path="${startmenu.path}"/>
+		<pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
+
+		<!-- extract 7za tool -->
+		<unzip src="${antinstaller.jar}" dest="${basedir}">
+			<patternset><include name="7za.exe"/></patternset>
+		</unzip>
+		<!-- /if -->
+
+		<!-- start web -->
+		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
+		<!-- if linux|mac --><sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/><!-- /if -->
+		<!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec><!-- /if -->
+		<delete file="core.lzma"/>
+		<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/${rk.os}"/><!-- /if -->
+		</copy>
+		<!-- if windows -->
+		<copy todir="${installDir}/packages/jre" failonerror="false">
+			<fileset dir="${orig.dir}/Java/Windows/jre"/>
+		</copy>
+		<!-- /if -->
+		<!-- end cdrom -->
+
+		<echo>Setting Binaries to Executable</echo>
+		<chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/>
+		<chmod dir="${installDir}/bin" includes="*" perm="775"/>
+		<chmod dir="${installDir}/cgi-bin/${shell.name}" includes="*" perm="775"/>
+		<chmod dir="${installDir}/bin/script" includes="**/*" perm="775"/>
+		<chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
+		<!-- if linux|mac -->
+		<chmod dir="${installDir}/bin/${shell.name}" includes="**/*" perm="775"/>
+		<!-- /if -->
+
+		<echo>Filling in concrete values in config files</echo>
+		<copy file="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg.in" tofile="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg"/>
+		<rsr file="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg" pattern="&quot;?\*\*GSDLHOME\*\*&quot;?" replacement="&quot;${installDir.local}&quot;"/>
+
+		<echo>Correcting perl shebangs in perl scripts</echo>
+		<!-- if linux|mac -->
+		<exec executable="which" outputproperty="perl.executable"><arg value="perl"/></exec>
+		<rsr file="${installDir}/cgi-bin/${shell.name}/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/>
+		<rsr file="${installDir}/cgi-bin/${shell.name}/metadata-server.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/>
+		<rsr file="${installDir}/cgi-bin/${shell.name}/checksum.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/>
+		<!-- /if -->
+		<!-- if windows -->
+		<property name="perl.executable" value="${installDir.local}\bin\windows\perl\bin\perl.exe"/>
+		<rsr file="${installDir}/cgi-bin/${shell.name}/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/>
+		<rsr file="${installDir}/cgi-bin/${shell.name}/metadata-server.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/>
+		<rsr file="${installDir}/cgi-bin/${shell.name}/checksum.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/>
+		<!-- /if -->
+
+		<echo>Creating the english dictionary</echo>
+		<copy file="${installDir}/gli/classes/dictionary.properties" tofile="${installDir}/gli/classes/dictionary_en.properties"/>
+
+		<!-- if linux|mac -->
+		<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}"/>
+		<!-- /if -->
+		<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 message="Creating installation properties file"/>
+		<!-- if linux|mac -->
+		<echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
+		<!-- /if -->
+		<!-- if windows -->
+		<echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
+		<!-- /if -->
+		
+		<!-- if mac -->
+		<copy file="${installDir}/gli.app/Contents/document.wflow.in" tofile="${installDir}/gli.app/Contents/document.wflow"/>
+		<rsr file="${installDir}/gli.app/Contents/document.wflow" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+		
+		<copy file="${installDir}/gs2-server.app/Contents/document.wflow.in" tofile="${installDir}/gs2-server.app/Contents/document.wflow"/>
+		<rsr file="${installDir}/gs2-server.app/Contents/document.wflow" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+		
+		<copy file="${installDir}/gems.app/Contents/document.wflow.in" tofile="${installDir}/gems.app/Contents/document.wflow"/>
+		<rsr file="${installDir}/gems.app/Contents/document.wflow" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+		
+		<copy file="${installDir}/client-gli.app/Contents/document.wflow.in" tofile="${installDir}/client-gli.app/Contents/document.wflow"/>
+		<rsr file="${installDir}/client-gli.app/Contents/document.wflow" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
+
+		<chmod dir="${installDir}" includes="*.app" perm="755"/>
+		<chmod dir="${installDir}" includes="*.app/**/*" perm="755"/>
+		<!-- /if -->
+	</target>
+
+	<!-- Apache HTTPD  -->
+	<target name="Installing Apache Web Server">
+		<echo>Installing the Apache Web Server</echo>
+
+		<!-- start web -->
+		<unzip src="${antinstaller.jar}" dest="${basedir}">
+			<patternset>
+				<include name="apachehttpd.lzma"/>
+			</patternset>
+		</unzip>
+
+		<!-- if linux|mac -->
+		<sevenzip task="decode" input="${basedir}/apachehttpd.lzma" output="${basedir}/apachehttpd.comp"/>
+		<!-- /if -->
+		<!-- if windows -->
+		<exec dir="${basedir}" executable="${basedir}/7za.exe">
+			<arg line="x apachehttpd.lzma"/>
+		</exec>
+		<!-- /if -->
+		<unzip src="${basedir}/apachehttpd.comp" dest="${installDir}"/>
+		<delete file="apachehttpd.comp"/>
+		<!-- end web -->
+
+		<!-- start cdrom -->
+		<mkdir dir="${installDir}/apache-httpd"/>
+		<mkdir dir="${installDir}/apache-httpd/${shell.name}"/>
+		<copy todir="${installDir}/apache-httpd/${shell.name}">
+			<fileset dir="${orig.dir}/Software/apache-httpd/${shell.name}"/>
+		</copy>
+		<!-- end cdrom -->
+
+		<!-- if linux|mac -->
+		<chmod dir="${installDir}/apache-httpd/${shell.name}/bin" includes="*" perm="775"/>
+		<chmod dir="${installDir}/apache-httpd/${shell.name}" includes="*.sh" perm="775"/>
+		<echo>Setting up apache web server</echo>
+		<exec dir="${installDir}" executable="${installDir}/apache-httpd/${shell.name}/install-bindist.sh">
+			<arg value="${installDir}/apache-httpd/${shell.name}"/>
+		</exec>
+		<!-- /if -->
+	</target>
+
+	<!-- ImageMagick -->
+	<target name="Installing ImageMagick">
+		<echo>Installing ImageMagick</echo>
+		<!-- start web -->
+		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
+		<!-- if linux|mac --><sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/><!-- /if -->
+		<!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec><!-- /if -->
+		<delete file="imagemagick.lzma"/>
+		<unzip src="${basedir}/imagemagick.comp" dest="${installDir}"/>
+		<delete file="imagemagick.comp"/>
+		<!-- end web -->
+
+		<!-- start cdrom -->
+		<copy todir="${installDir}">
+			<fileset dir="${orig.dir}/Software/imagemagick/${rk.os}"/>
+		</copy>
+		<!-- end cdrom -->
+
+		<if><bool><available file="${installDir}/bin/${shell.name}/imagemagick" type="dir"/></bool>
+			<chmod dir="${installDir}/bin/${shell.name}/imagemagick/bin" includes="*" perm="775"/>
+		<else>
+			<chmod dir="${installDir}/ext/imagemagick/${shell.name}/bin" includes="*" perm="775"/>
+		</else>
+		</if>
+
+	</target>
+
+	<!-- Ghostscript -->
+	<target name="Installing Ghostscript" depends="">
+		<echo message="Installing Ghostscript"/>
+		<!-- start web -->
+		<unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
+		<!-- if linux|mac --><sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/><!-- /if -->
+		<!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec><!-- /if -->
+		<delete file="ghostscript.lzma"/>
+		<unzip src="${basedir}/ghostscript.comp" dest="${installDir}" />
+		<delete file="ghostscript.comp"/>
+		<!-- end web -->
+
+		<!-- start cdrom -->
+		<copy todir="${installDir}">
+			<fileset dir="${orig.dir}/Software/ghostscript/${rk.os}"/>
+		</copy>
+		<!-- end cdrom -->
+
+		<chmod dir="${installDir}/bin/${shell.name}/ghostscript/bin" includes="*" perm="775"/>
+	</target>	
+
+	<!-- Start menu shortcuts -->
+	<target name="Installing Start Menu Shortcuts">
+
+		<mkdir dir="${startmenu.path}\Documentation"/>
+
+		<!-- Server shortcut -->
+		<if><bool><available file="${installDir}/web/images/server.ico"/></bool>
+			<property name="servericon" value="${installDir}\web\images\server.ico"/> 
+			<else>
+				<property name="servericon" value="${installDir}\web\images\serverico.ico"/> 
+			</else>
+		</if>
+
+		<shortcut
+			file="${startmenu.path}\Greenstone Server.lnk"
+			execute="${installDir}\gs2-server.bat"
+			workingDirectory="${installDir}"
+			iconFile="${servericon}"
+			iconIndex="0" />
+
+		<!-- Librarian shortcut -->
+		<if><bool><available file="${installDir}/web/images/librarian.ico"/></bool>
+			<property name="libraryicon" value="${installDir}\web\images\librarian.ico"/> 
+			<else>
+				<property name="libraryicon" value="${installDir}\web\images\icon.ico"/>
+			</else>
+		</if>
+
+		<shortcut
+			file="${startmenu.path}\Librarian Interface (GLI).lnk"
+			execute="${installDir}\gli\gli.bat"
+			workingDirectory="${installDir}\gli"
+			iconFile="${libraryicon}"
+			iconIndex="0" />
+			
+		<!-- Remote Server shortcut -->
+		<if><bool><available file="${installDir}/web/images/clientgli.ico"/></bool>
+			<property name="clientgliicon" value="${installDir}\web\images\clientgli.ico"/> 
+			<else>
+				<property name="clientgliicon" value="${installDir}\web\images\icon.ico"/>
+			</else>
+		</if>
+
+		<shortcut
+			file="${startmenu.path}\Remote Librarian Interface (Client GLI).lnk"
+			execute="${installDir}\gli\client-gli.bat"
+			workingDirectory="${installDir}\gli"
+			iconFile="${clientgliicon}"
+			iconIndex="0" />
+
+		<!-- GEMS shortcut -->
+		<if><bool><available file="${installDir}/web/images/metadata.ico"/></bool>
+			<property name="gemsicon" value="${installDir}\web\images\metadata.ico"/> 		
+			<else>
+				<property name="gemsicon" value="${installDir}\web\images\gems.ico"/> 	
+			</else>
+		</if>
+
+		<shortcut
+			file="${startmenu.path}\Metadata Set Editor (GEMS).lnk"
+			execute="${installDir}\gli\gems.bat"
+			workingDirectory="${installDir}\gli"
+			iconFile="${gemsicon}"
+			iconIndex="0" />
+
+		<!-- Uninstall shortcut -->
+		<if><bool><available file="${installDir}/web/images/newuninstall.ico"/></bool>
+			<property name="uninstallicon" value="${installDir}\web\images\newuninstall.ico"/> 		
+			<else>
+				<property name="uninstallicon" value="${installDir}\web\images\uninstall.ico"/> 	
+			</else>
+		</if>
+		
+		<shortcut
+			file="${startmenu.path}\Uninstall.lnk"
+			execute="${installDir}\uninstall\Uninstall.bat"
+			workingDirectory="${installDir}\uninstall"
+			iconFile="${uninstallicon}"
+			iconIndex="0" />
+
+		<!-- Misc shortcuts -->
+		<shortcut
+			file="${startmenu.path}\Documentation\READMEen.lnk"
+			execute="${installDir}\READMEen.txt" />
+
+		<shortcut
+			file="${startmenu.path}\Documentation\Greenstone Wiki.url"
+			url="http://wiki.greenstone.org" />
+
+		<shortcut
+			file="${startmenu.path}\Documentation\Greenstone Website.url"
+			url="http://www.greenstone.org" />
+
+	</target>
+
+	<target name="Configuring Administration Pages" if="enable.admin.pages">
+		<echo>Enabling Admin Pages</echo>
+		<rsr file="${installDir}/etc/main.cfg" pattern="^\s*status\s+.*" replacement="status enabled"/>
+		<echo>Creating admin and demo users</echo>
+		<adduser txt2db="${installDir}/bin/${shell.name}/txt2db"
+			usersDb="${installDir}/etc/users.gdb"
+			username="admin"
+			password="${admin.password}"
+			groups="administrator,colbuilder,all-collections-editor"
+			comment="created at install time"/>
+		<adduser
+			txt2db="${installDir}/bin/${shell.name}/txt2db"
+			usersDb="${installDir}/etc/users.gdb"
+			username="demo"
+			password="demo"
+			groups="demo"
+			comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
+	</target>
+
+	<target name="Installing Documented Examples">
+		<unzip src="${orig.dir}/documented-examples.zip" dest="${installDir}/collect"/>
+	</target>
+
+</project>
Index: other-projects/expeditee-release-kits/linux_wrapper.cpp
===================================================================
--- other-projects/expeditee-release-kits/linux_wrapper.cpp	(revision 28695)
+++ other-projects/expeditee-release-kits/linux_wrapper.cpp	(revision 28695)
@@ -0,0 +1,299 @@
+#include <iostream>
+#include <fstream>
+#include <iomanip>
+#include <string.h>
+#include <cstdlib>
+#include <sstream>
+using namespace std;
+ 
+#ifndef CDROM
+#include "wrapper.h"
+#include "libsearch4j.h"
+bool extract_bundled_file( const char[], int, char*, bool );
+#else
+bool prep_java( string wd );
+#endif
+
+void usage( char* progname, int exitvalue = -1 ) {
+	cerr
+		<< "Usage: " << progname << " [OPTIONS]" << endl
+		<< "OPTIONS: " << endl
+		<< " -h, -help	 Display this usage message" << endl
+		<< " -textonly   Do a non-graphical command line installation" << endl
+		<< " -extract    Extract the jar file, this can " << endl;
+	#ifdef CDROM
+	cerr << " -wd PATH			Look for the CD-ROM at PATH" << endl;
+	#endif
+
+	exit( exitvalue );
+}
+
+int main(int argc, char** argv) {
+
+	char wdc[1024];
+	getcwd(wdc, sizeof(wdc));
+	string wd = "";
+	wd.append( wdc );
+	
+	string scratch = (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR");
+	string tempdir = scratch + "/@projectname@-installer.tmp"; //temporary directory where we will store extracted files
+	bool succeeded = false;
+	bool text_mode = false;
+
+	//parse arguments
+	string a;
+	for ( int i=1; i<argc; i++ ) {
+		a = argv[i];
+		if ( a.compare("-wd") == 0 ) {
+			wd = "";
+			wd.append( argv[++i] );
+		} else if ( a.compare("-h") == 0 || a.compare("-help") == 0 || a.compare("--help") == 0) {
+			usage( argv[0], 0 );
+		} else if ( a.compare("-textonly") == 0 || a.compare("-text") == 0 || a.compare("text") == 0 ) {
+			//cerr << "-text is deprecated, please use -extract and then run \"java -jar @projectname@.jar text\"" << endl;
+			text_mode = true;
+#ifndef CDROM
+		} else if ( a.compare("-extract") == 0 || a.compare("--extract") || a.compare("-x")) {
+			cout << "----------------------------" << endl;
+			cout << "Extracting java installer..." << endl;
+			cout << "----------------------------" << endl;
+			bool result = extract_bundled_file( @projectname@jar, sizeof(@projectname@jar), "@projectname@.jar", false);
+			if(result){
+				cout << "\nExtraction Complete" << endl;
+				cout << "You can now run \"java -jar @projectname@.jar text\" to run the installer from the command line\n" << endl;
+				return 0;
+			}
+			else{
+				cerr << "\nThere was an error while extracting the java installer" << endl;
+				return 1;
+			}
+#endif
+		} else {
+			cerr << "Unrecognised option '" << a << "'" << endl;
+			usage(argv[0]);
+		}
+	}
+
+	#ifdef CDROM
+	//ensure working directory is correct
+	FILE* pFile;
+	pFile = fopen( (wd+"/Software/core/all/uninst.jar").c_str(), "r");
+	if ( pFile == NULL ) {
+		cerr << "Could not find cdrom at '" << wd << "'." << endl;
+		cerr << "Please enter the path the CDROM [/media/cdrom]: ";
+		getline(cin, wd);
+		if ( wd.compare("") == 0 ) {
+			wd = "/media/cdrom";
+		}
+	} else {
+		fclose(pFile);
+	}
+
+	pFile = fopen( (wd+"/Software/core/all/uninst.jar").c_str(), "r");
+	if ( pFile == NULL ) {
+		cerr << "Could not find cdrom at '"<< wd << "'." << endl;
+		cerr << "Please run the installer again" << endl;
+		exit(-1);
+	} else {
+		fclose(pFile);
+	}
+	#endif
+
+	//create the temp folder
+	cout << "Creating temp directory..." << endl;
+	succeeded = ( 0 == system( ("mkdir " + tempdir).c_str() ) );
+	if ( !succeeded ) {
+		cerr << "Failed to create the temp directory '" << tempdir << "'. " <<
+		 "Check that it does not already exist. Also check that you have write " <<
+		 "permissions to '" << scratch << "', or set the environment variable TMPDIR to " <<
+		 "a directory where you do have write permissions." << endl <<
+		"Exiting" << endl;
+		return 1;
+	}
+	
+	#ifndef CDROM
+
+	string jarfile = tempdir + "/@projectname@.jar"; //where we will store the jar file
+	string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file
+
+
+	//extract files
+	cout << "Extracting installer jar..." << endl;
+	succeeded = extract_bundled_file( @projectname@jar, sizeof(@projectname@jar), (char*)jarfile.c_str(), false);
+
+	#ifdef java_is_bundled
+	cout << "Preparing @projectname@ installer..." << endl;
+	succeeded = extract_bundled_file( java, sizeof(java), (char*)javafile.c_str(), true ) && succeeded;
+	#endif
+		
+	if ( !succeeded ) {
+		cerr << "Failed to extract one or more resources" << endl;
+		cerr << "This installer may not have sufficient file permissions to write it to disk" << endl;
+		cerr << "Or, the files may be corrupt or missing from this executable" << endl;
+		cerr << "Exiting" << endl;
+		return 1;
+	}
+
+	#endif
+
+	//change to the temp directory
+	chdir( tempdir.c_str() );
+
+
+	#ifndef CDROM
+	#ifdef java_is_bundled
+	succeeded = (system( "/bin/sh -c ./@java.installer@ > /dev/null" ) == 0);
+	succeeded = succeeded && ( system( "tar -xf jre.tar" ) == 0 );
+	if ( !succeeded ) {
+		cout << "Failed to extract the bundled java archive to the temp directory" << endl;
+		cout << "You need the tar program on your PATH" << endl;
+		cout << "Exiting" << endl;
+		return 1;
+	}
+	#endif
+
+	//check if an appropriate java is found
+	Jvm minimum; minimum.setVersionFromString( "@java.min.version@" );
+	string phint = "./@java.extracted@";
+	string hint = "";
+	Jvm foundJvm;
+	bool jvmFound = find( foundJvm, true, minimum, false, false, phint, hint, false );
+
+	//if the jvm was not found, report not found
+	if ( !jvmFound ) {
+
+		//did not find a good java
+		cout << "@projectname@ requires java @java.min.version@ or greater." << endl;
+		
+		//tell them if java is absent or just too old
+		Jvm tmpJvm;
+		if ( find( tmpJvm, false, minimum, false, false, phint, hint, false ) ) {
+			cout << "You have java, but it is too old." << endl;
+		} else {
+			cout << "Could not find java on your system." << endl;
+		}
+		
+		cout << "Install java (@java.min.version@ or greater) and set JAVA_HOME or JRE_HOME, and try again" << endl;
+		#ifndef java_is_bundled
+		cout << "Or, download a greentsone3 installer with bundled java and use that instead of this one" << endl;
+		#endif
+
+	//if we have found it, launch the installer
+	} else {
+
+		cout << "Launching Installer ..." << endl;
+		int launch_exit_code = 0;
+		launch_exit_code = system( (foundJvm.getExecutable() + " -Xmx200M -jar @projectname@.jar" + (text_mode?" text":"") ).c_str() );
+
+		//report how it went
+		if ( launch_exit_code == 0 ) {
+			cout << "Setup complete" << endl;
+		} else {
+			cout << "The installer exited with an error" << endl;
+			cout << "@projectname@ may not be correctly installed" << endl;
+		}
+
+	}
+	#else
+		bool java_ready = prep_java( wd );
+		if ( java_ready ) {
+			string cmd = "./jre/bin/java -Dorig.dir=\"" + wd + "\" -jar " + wd + "/Java/Jars/linux.jar" + (text_mode?" text":"");
+			system( cmd.c_str() );
+		}
+	#endif
+
+	//change to the scratch dir for the following operation
+	chdir(scratch.c_str());
+
+	//delete the temp files
+	cout << "Deleting the temp directory" << endl;
+	system( ("rm -rf " + tempdir).c_str() );
+
+	return 0;
+
+}
+#ifndef CDROM
+bool extract_bundled_file( const char data[], int size, char* filename, bool make_executable) {
+
+	if ( size == 0 ) return false;
+
+	//delete the file if it exists
+	remove( filename );
+
+	//open the file
+	fstream binary_file( filename, ios::out|ios::binary );
+	if ( !binary_file.good() ) {
+		binary_file.close();
+		return false;
+	}
+
+	//write the file
+	binary_file.write( data, size );
+	if ( !binary_file.good() ) {
+		binary_file.close();
+		return false;
+	}
+
+	//close the file
+	binary_file.close();
+	if ( !binary_file.good() ) {
+		binary_file.close();
+		return false;
+	}
+
+	if ( make_executable ) {
+		string command = "chmod a+x " + string(filename);
+		system( command.c_str() );
+	}
+
+	return true;
+
+}
+#else
+
+bool prep_java( string wd ) {
+
+
+  string jTestCmd = "./jre/bin/java -version >/dev/null 2>&1";
+
+  //try to extract straight off cd
+  string j1cmd = wd + "/Java/Linux/jre_bin && tar -xf jre.tar && " + jTestCmd;
+  int j1status = system(j1cmd.c_str());
+  system("/bin/rm -f jre.tar");
+  
+  if (WEXITSTATUS(j1status)!=0) {
+    cerr << "Unable to extract java straight off CD-ROM." << endl;
+    cerr << "This is probably because your CD-ROM was mounted with 'noexec'." << endl;
+    cerr << "It can be changed by a system administrator" << endl << endl;
+    cerr << "Copying Java to local disk so it can be run" << endl;
+    
+    string cdtar_home = wd + "/Java/Linux/";
+    string tcmd = "(cd \"" + cdtar_home + "\" ; tar cf - jre_bin )";
+    tcmd += "| tar xvf - ";
+    //tcmd += "| awk 'BEGIN{C=0}{C++; printf(\".\"); if (C%70==0) printf(\"\\n\");}END{printf(\"\\n\")}'";
+
+    int tstatus = system(tcmd.c_str());
+    
+    if (WEXITSTATUS(tstatus)!=0) {
+      cerr << "Failed to copy Java to disk" << endl;
+      cerr << "Please make sure you have write permissions in the directory where you run the installer" << endl;
+    }
+    else {
+
+      string j2cmd = "./jre_bin && tar -xf jre.tar && " + jTestCmd;
+      int j2status = system(j2cmd.c_str());
+      system("/bin/rm -f jre.tar jre_bin");
+
+      if (WEXITSTATUS(j2status)!=0) {
+        cerr << "Unable to run copied Java" << endl;
+        return false;
+      }
+    }
+  }
+
+  // to get to here, full_java must be set (and working)
+
+  return true;
+}
+
+#endif
Index: other-projects/expeditee-release-kits/windows_wrapper.cpp
===================================================================
--- other-projects/expeditee-release-kits/windows_wrapper.cpp	(revision 28695)
+++ other-projects/expeditee-release-kits/windows_wrapper.cpp	(revision 28695)
@@ -0,0 +1,473 @@
+#include <windows.h>
+
+#include <fstream>
+#include <iostream>
+#include <conio.h>
+#include <string>
+#include <time.h>
+#include <shellapi.h>
+#include <direct.h>
+
+using namespace std;
+
+#ifndef CDROM
+#include "libsearch4j.h"
+#endif
+
+//globals
+HBITMAP g_splash = NULL; //the main splash bitmap
+HFONT g_hfFont = NULL; //the main splash bitmap
+char step[10] = "TMP"; //the current step
+char progress[4] = "0"; //progress in the current step
+HWND splashWnd;
+HINSTANCE mainInstance;
+int mainCmdShow;
+bool window_loaded = false;
+
+void set_splash_step( char* new_step ) {
+	strcpy( step, new_step );
+	InvalidateRect(splashWnd, NULL, FALSE);
+	UpdateWindow(splashWnd);
+}
+
+void set_splash_progress( int percent_progress ) {
+	percent_progress = ( percent_progress / 10 ) * 10;
+	char p[4] = {0};
+	strcpy( progress, itoa( percent_progress, p, 10 ) );
+	InvalidateRect(splashWnd, NULL, FALSE);
+	//RedrawWindow(splashWnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW | RDW_INTERNALPAINT);
+	UpdateWindow(splashWnd);
+}
+
+void spoof_progress( int interval ) {
+	int tenPercentWait = interval / 11;
+	for ( int i=0; i <= 100; i+=10 ) {
+		set_splash_progress( i );
+		Sleep( tenPercentWait );
+	}
+}
+
+//extracts a resource in chunks
+int extractResource( const char * basename, const char * type, char * file ) {
+
+	HMODULE hModule = GetModuleHandle(NULL);
+	set_splash_progress( 0 );
+
+	int no_chunks;
+	bool chunk_available = true;
+	for ( no_chunks = 0; chunk_available; no_chunks++ ) {
+
+		//construct the chunk name
+		char chunkname[127] = {0};
+		strcpy( chunkname, basename );
+		strcat( chunkname, "_" );
+		char chunknum[5] = {0};
+		itoa( no_chunks+1, chunknum, 10 );
+		strcat( chunkname, chunknum );
+		
+		if ( FindResource(hModule, chunkname, type) == NULL ) {
+			chunk_available = false;
+			break;
+		}
+	}
+	
+	if ( no_chunks == 0 ) {
+		return 1;
+	}
+	
+	for ( int i=0; i<no_chunks; i++ ) {
+	
+		//construct the chunk name
+		char chunkname[127] = {0};
+		strcpy( chunkname, basename );
+		strcat( chunkname, "_" );
+		char chunknum[5] = {0};
+		itoa( i+1, chunknum, 10 );
+		strcat( chunkname, chunknum );
+		
+		//find it
+		HRSRC hRsrc = FindResource(hModule, chunkname, type);
+		if (hRsrc == NULL ) return 1; //couldn't find the chunk
+		
+		//load it
+		HGLOBAL hGlobal = LoadResource(hModule, hRsrc);
+		if (hGlobal == NULL) return 1; //couldn't lock
+		
+		//lock it
+		BYTE* pBytes = (BYTE*) LockResource(hGlobal);
+		if (pBytes == NULL) return 1; //couldn't lock
+		
+		//put it on disk
+		DWORD dwLength = SizeofResource(hModule, hRsrc);
+		ofstream fStream(file, ios::binary | ios::out | ios::app );
+		fStream.write((char*) pBytes, dwLength);
+		fStream.close();
+		
+		//unload
+		UnlockResource(hGlobal);
+		FreeResource(hGlobal);
+		
+		//update the progress
+		set_splash_progress( i * 100 / no_chunks );
+		
+	}
+
+	return 0;
+
+}
+
+//the splash window procedure
+LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
+	switch(msg) {
+
+		case WM_CREATE: {
+			//load in the reusable resources
+			g_splash = LoadBitmap(GetModuleHandle(NULL),"SPLASH");
+			g_hfFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
+			if(g_splash == NULL) {
+				MessageBox(hwnd, "Could not load splash bitmap!", "Error", MB_OK | MB_ICONEXCLAMATION);
+			}
+			
+			//center the window automatically
+			RECT rect;
+			GetWindowRect(hwnd, &rect);
+			int x = (GetSystemMetrics(SM_CXSCREEN) - (rect.right - rect.left)) / 2;
+			int y = (GetSystemMetrics(SM_CYSCREEN) - (rect.bottom - rect.top)) / 2;
+			SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOSIZE);
+		}
+		
+		case WM_PAINT: {
+			// Don't use MessageBox from inside WM_PAINT
+		
+			//load in the correct resources
+			HBITMAP g_progress = NULL;
+			HBITMAP g_step = NULL;
+			char progress_res[20] = "PROGRESS_";
+			strcat( progress_res, progress );
+			char step_res[20] = "STEP_";
+			strcat( step_res, step );
+			g_progress = LoadBitmap(GetModuleHandle(NULL), progress_res );
+			g_step = LoadBitmap(GetModuleHandle(NULL), step_res );
+			if( g_progress == NULL || g_step == NULL ) {
+				//MessageBox(hwnd, "Could not load an image!", "Error", MB_OK | MB_ICONEXCLAMATION);
+			}
+		
+			BITMAP bm; //holds info about the width and height
+			PAINTSTRUCT ps;
+			
+			HDC hdc = BeginPaint(hwnd, &ps);
+			HDC hdcMem = CreateCompatibleDC(hdc);
+			
+			//paint the main splash screen
+			GetObject(g_splash, sizeof(bm), &bm);
+			HBITMAP hbmOld = (HBITMAP)SelectObject(hdcMem, g_splash);
+			BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY);
+						
+			//paint in the progress
+			GetObject(g_progress, sizeof(bm), &bm);
+			SelectObject(hdcMem, g_progress);
+			BitBlt(hdc, 0, 270, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY);
+			
+			//paint in the step with transparency
+			GetObject(g_step, sizeof(bm), &bm);
+			SelectObject(hdcMem, g_step);
+			BitBlt(hdc, 0, 276, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCPAINT);
+			
+			//print the step with text
+			RECT rcClient;
+			GetClientRect(hwnd, &rcClient);
+			//DrawText(hdc, "This is the step", -1, &rcClient, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
+			
+			//restore the hdc
+			SelectObject(hdcMem, hbmOld);
+			
+			//release resources
+			DeleteDC(hdcMem);
+			EndPaint(hwnd, &ps);
+			DeleteObject(g_progress);
+			DeleteObject(g_step);
+			
+		}
+		break;
+		
+		/*
+		case WM_LBUTTONDOWN: {
+			DeleteObject(g_splash);
+			PostQuitMessage(0);
+		}
+		break;
+		*/
+		
+		case WM_CLOSE:
+			DestroyWindow(hwnd);
+			break;
+		
+		case WM_DESTROY:
+			DeleteObject(g_splash);
+			PostQuitMessage(0);
+			break;
+		
+		default:
+			return DefWindowProc(hwnd, msg, wParam, lParam);
+	}
+
+	return 0;
+
+}
+
+//function to process the window
+DWORD WINAPI ProcessWindow( LPVOID lpParam ) {
+	
+	const char g_szClassName[] = "splash";
+	WNDCLASSEX wc;
+	MSG Msg;
+
+	//Step 1: Registering the Window Class
+	wc.cbSize = sizeof(WNDCLASSEX);
+	wc.style = 0;
+	wc.lpfnWndProc = WndProc;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = 0;
+	wc.hInstance = mainInstance;
+	wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+	wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
+	wc.lpszMenuName = NULL;
+	wc.lpszClassName = g_szClassName;
+	wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
+	if(!RegisterClassEx(&wc)) {
+		MessageBox(NULL, "Window Registration Failed!", "Error!",
+		MB_ICONEXCLAMATION | MB_OK);
+		return 0;
+	}
+
+	// Step 2: Creating the Window
+	splashWnd = CreateWindowEx( WS_EX_TOOLWINDOW, g_szClassName, "", WS_POPUP | SS_BITMAP, 0, 0, 420, 300, NULL, NULL, mainInstance, NULL);
+	if( splashWnd == NULL ) {
+		MessageBox(NULL, "Window Creation Failed!", "Error!", MB_ICONEXCLAMATION | MB_OK);
+		return 0;
+	}
+	ShowWindow(splashWnd, mainCmdShow);
+	UpdateWindow(splashWnd);
+
+	window_loaded = true;
+	
+	// Step 3: The Message Loop
+	while(GetMessage(&Msg, NULL, 0, 0) > 0) {
+		TranslateMessage(&Msg);
+		DispatchMessage(&Msg);
+	}
+	return 0;
+} 
+
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
+	
+	const int SPOOF_TIME = 1000;
+	string command = lpCmdLine;
+
+	if((command.compare("-extract") == 0) || (command.compare("--extract") == 0) || (command.compare("-x") == 0)){
+		printf("----------------------------\n");
+		printf("Extracting java installer...\n");
+		printf("----------------------------\n");
+		int result = extractResource( "JAR", "JAR", "@projectname@.jar" );
+		
+		if(result == 0){
+			printf("\n");
+			printf("Extraction complete\n");
+			printf("You can now type java -jar @projectname@.jar to run the installer from the command line\n");
+			return 0;	
+		}
+		else{
+			return 1;
+		}
+	}
+	else if(command.compare("-text") == 0 || command.compare("text") == 0 )
+	{
+		cerr << "-text is depricated, please use -extract and then run \"java -jar @projectname@.jar text\"" << endl;
+	}
+	
+	srand( time(0) );
+	mainInstance = hInstance;
+	mainCmdShow = nCmdShow;
+	
+	//start the window
+	HANDLE hThread;
+	DWORD dwThreadId, dwThrdParam = 1;
+	hThread = CreateThread( 
+       NULL,                        // no security attributes 
+       0,                           // use default stack size  
+       ProcessWindow,               // thread function 
+       &dwThrdParam,	            // argument to thread function 
+       0,                           // use default creation flags 
+       &dwThreadId);                // returns the thread identifier 
+	if ( hThread == NULL ) {
+		return -1;
+		//ErrorExit( "CreateThread failed." );
+	}
+	CloseHandle( hThread );
+	
+	while ( !window_loaded ) {
+		Sleep( 100 );
+	}
+	
+	//create the temp folder and change to it
+	set_splash_step( "TMP" );
+	spoof_progress( SPOOF_TIME );
+	
+	//get the original working directory
+	char* owdChar = _getcwd(NULL, 1024);
+	string owd = "";
+	owd.append( owdChar );
+	free(owdChar);
+	
+	//strip trailing slash
+	if ( owd.substr(owd.length()-1,1).compare( "\\" ) == 0 ) {
+		owd = owd.substr(0, owd.length()-1);
+	}
+		
+	//using the users TMP directory for temp files rather than the current directory so
+	//installation from cdrom works
+	char* tmp = getenv( "TMP" );
+	char id[6]; for( int i=0; i<5; i++ ) id[i] = (char)((rand()%26) + 97); id[5] = '\0'; //id for this instance
+	string tempdir = ""; tempdir.append( tmp ); tempdir.append( "\\@projectname@-" ); tempdir.append( id );
+	const char* tmpdir = tempdir.c_str();
+	if ( _mkdir( tmpdir ) != 0 ) {
+		string title = "Failed to create the temp folder.";
+		string message = "Failed to create the temp folder.\nPlease set the environment variable TMP to a folder you have permission to write to.";
+		//ShowWindow(splashWnd, SW_HIDE); //hide splash screen
+		MessageBox(splashWnd, message.c_str(), title.c_str(), MB_OK);
+		return -1;
+	}
+	//SetFileAttributes(tmpdir, FILE_ATTRIBUTE_HIDDEN);
+	SetCurrentDirectory(tmpdir);
+	// delete tmp; //  should be tmpdir? ??? (deallocate memory)
+	
+	#ifdef CDROM
+
+	//ask if they want to install, then do it if so
+	int choice = MessageBox(splashWnd, "Install @projectname@?", "@projectname@", MB_OKCANCEL | MB_ICONQUESTION );
+	if ( choice == IDOK ) {
+
+		//prepare to launch the jar
+		set_splash_step( "LAUNCHING" );
+		spoof_progress( SPOOF_TIME );
+	
+		string cmd = "\"";
+		cmd.append( owd );
+		cmd.append( "\\Java\\Windows\\jre\\bin\\java.exe\" \"-Dorig.dir=" );
+		cmd.append( owd );
+		cmd.append( "\" -jar \"" );
+		cmd.append( owd );
+		cmd.append( "\\Java\\Jars\\windows.jar\"" );
+		char cmdLpstr[1024];
+		strcpy( cmdLpstr, cmd.c_str() );
+		
+		
+		STARTUPINFO si;
+		PROCESS_INFORMATION pi;
+		memset(&pi, 0, sizeof(pi));
+		memset(&si, 0, sizeof(si));
+		si.cb = sizeof(si);
+		DWORD dwExitCode = -1;
+
+		//hide splash screen
+		ShowWindow(splashWnd, SW_HIDE);
+
+		//launch the jar
+		bool result;
+		result = CreateProcess(NULL, cmdLpstr, NULL, NULL, TRUE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
+
+		WaitForSingleObject(pi.hProcess, INFINITE);
+		GetExitCodeProcess(pi.hProcess, &dwExitCode);
+		CloseHandle(pi.hThread);
+		CloseHandle(pi.hProcess);
+
+	}	
+	#else
+
+	//rip out java archive if it is bundled
+	set_splash_step( "XJAVA" );
+	int javaIsBundled = (extractResource( "JAVA", "EXE", "@java.installer@" ) == 0);
+	if ( javaIsBundled ) {
+		process( "@java.installer@", false );
+	}
+
+	//find java
+	set_splash_step( "SEARCHING" );
+	spoof_progress( SPOOF_TIME );
+	bool use_minimum = true;
+	Jvm minimum;
+	minimum.setVersionFromString( "@java.min.version@" );
+	string phint = "@java.extracted@";
+	string hint = "";
+	bool verbose = true;
+	Jvm foundJvm;
+	bool jvmFound = find( foundJvm, use_minimum, minimum, false, false, phint, hint, verbose );
+	
+	//if the jvm was not found, try to fix it and find it
+	if ( !jvmFound ) {
+
+		//did not find a good java
+		string message = "This version of @projectname@ requires java @java.min.version@ or greater, but ";
+		
+		//tell them if java is absent or just too old
+		if ( find( foundJvm, false, minimum, false, false, "", "", false ) ) {
+			message.append( "your java is too old.");
+		} else {
+			message.append( "java could not be found on your computer." );
+		}
+		message.append( "\n" );
+		
+		string title = "Installation Failed: Couldn't find java";
+		//ShowWindow(splashWnd, SW_HIDE); //hide splash screen
+		MessageBox(splashWnd, message.c_str(), title.c_str(), MB_OK);
+
+	//if java was found, carry on
+	} else {
+
+		//extract the jar
+		string jarLocation = "@projectname@.jar";
+		
+		set_splash_step( "XJAR" );
+		extractResource( "JAR", "JAR", (char*) jarLocation.c_str() );
+
+		//launch the jar
+		set_splash_step( "LAUNCHING" );
+		spoof_progress( SPOOF_TIME );
+		string cmd = "\"";
+		cmd.append( foundJvm.getWinExecutable() );
+		cmd.append( "\" \"-Dorig.dir=" );
+		cmd.append( owd );
+		cmd.append( "\" -jar @projectname@.jar" );
+		
+		
+		//hide splash screen
+		ShowWindow(splashWnd, SW_HIDE);
+		
+		//run the jar
+		int launch_exit_code = process( cmd, true );
+		
+		//report how it went
+		if ( launch_exit_code != 0 ) {
+			string title = "Installation Error";
+			string message = "The installation exited with an error. Java may not be installed properly, or the installation may have been interrupted partway through. Please try again.";
+			//ShowWindow(splashWnd, SW_HIDE); //hide splash screen
+			MessageBox(NULL, message.c_str(), title.c_str(), MB_OK);
+		}
+	}
+	#endif
+	
+	//clean up the temp directory
+	_unlink( "ant.install.log" );
+	#ifndef CDROM
+	_unlink( "@projectname@.jar" );
+	_unlink( "@java.installer@" );
+	process( "cmd.exe /c rd /s /q @java.extracted@", false );
+	#endif
+
+	SetCurrentDirectory( ".." );
+	_rmdir( tempdir.c_str() );
+	
+	return 0;
+	
+}
Index: other-projects/expeditee-release-kits/wrapper.cpp
===================================================================
--- other-projects/expeditee-release-kits/wrapper.cpp	(revision 28695)
+++ other-projects/expeditee-release-kits/wrapper.cpp	(revision 28695)
@@ -0,0 +1,473 @@
+#include <windows.h>
+
+#include <fstream>
+#include <iostream>
+#include <conio.h>
+#include <string>
+#include <time.h>
+#include <shellapi.h>
+#include <direct.h>
+
+using namespace std;
+
+#ifndef CDROM
+#include "libsearch4j.h"
+#endif
+
+//globals
+HBITMAP g_splash = NULL; //the main splash bitmap
+HFONT g_hfFont = NULL; //the main splash bitmap
+char step[10] = "TMP"; //the current step
+char progress[4] = "0"; //progress in the current step
+HWND splashWnd;
+HINSTANCE mainInstance;
+int mainCmdShow;
+bool window_loaded = false;
+
+void set_splash_step( char* new_step ) {
+	strcpy( step, new_step );
+	InvalidateRect(splashWnd, NULL, FALSE);
+	UpdateWindow(splashWnd);
+}
+
+void set_splash_progress( int percent_progress ) {
+	percent_progress = ( percent_progress / 10 ) * 10;
+	char p[4] = {0};
+	strcpy( progress, itoa( percent_progress, p, 10 ) );
+	InvalidateRect(splashWnd, NULL, FALSE);
+	//RedrawWindow(splashWnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW | RDW_INTERNALPAINT);
+	UpdateWindow(splashWnd);
+}
+
+void spoof_progress( int interval ) {
+	int tenPercentWait = interval / 11;
+	for ( int i=0; i <= 100; i+=10 ) {
+		set_splash_progress( i );
+		Sleep( tenPercentWait );
+	}
+}
+
+//extracts a resource in chunks
+int extractResource( const char * basename, const char * type, char * file ) {
+
+	HMODULE hModule = GetModuleHandle(NULL);
+	set_splash_progress( 0 );
+
+	int no_chunks;
+	bool chunk_available = true;
+	for ( no_chunks = 0; chunk_available; no_chunks++ ) {
+
+		//construct the chunk name
+		char chunkname[127] = {0};
+		strcpy( chunkname, basename );
+		strcat( chunkname, "_" );
+		char chunknum[5] = {0};
+		itoa( no_chunks+1, chunknum, 10 );
+		strcat( chunkname, chunknum );
+		
+		if ( FindResource(hModule, chunkname, type) == NULL ) {
+			chunk_available = false;
+			break;
+		}
+	}
+	
+	if ( no_chunks == 0 ) {
+		return 1;
+	}
+	
+	for ( int i=0; i<no_chunks; i++ ) {
+	
+		//construct the chunk name
+		char chunkname[127] = {0};
+		strcpy( chunkname, basename );
+		strcat( chunkname, "_" );
+		char chunknum[5] = {0};
+		itoa( i+1, chunknum, 10 );
+		strcat( chunkname, chunknum );
+		
+		//find it
+		HRSRC hRsrc = FindResource(hModule, chunkname, type);
+		if (hRsrc == NULL ) return 1; //couldn't find the chunk
+		
+		//load it
+		HGLOBAL hGlobal = LoadResource(hModule, hRsrc);
+		if (hGlobal == NULL) return 1; //couldn't lock
+		
+		//lock it
+		BYTE* pBytes = (BYTE*) LockResource(hGlobal);
+		if (pBytes == NULL) return 1; //couldn't lock
+		
+		//put it on disk
+		DWORD dwLength = SizeofResource(hModule, hRsrc);
+		ofstream fStream(file, ios::binary | ios::out | ios::app );
+		fStream.write((char*) pBytes, dwLength);
+		fStream.close();
+		
+		//unload
+		UnlockResource(hGlobal);
+		FreeResource(hGlobal);
+		
+		//update the progress
+		set_splash_progress( i * 100 / no_chunks );
+		
+	}
+
+	return 0;
+
+}
+
+//the splash window procedure
+LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
+	switch(msg) {
+
+		case WM_CREATE: {
+			//load in the reusable resources
+			g_splash = LoadBitmap(GetModuleHandle(NULL),"SPLASH");
+			g_hfFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
+			if(g_splash == NULL) {
+				MessageBox(hwnd, "Could not load splash bitmap!", "Error", MB_OK | MB_ICONEXCLAMATION);
+			}
+			
+			//center the window automatically
+			RECT rect;
+			GetWindowRect(hwnd, &rect);
+			int x = (GetSystemMetrics(SM_CXSCREEN) - (rect.right - rect.left)) / 2;
+			int y = (GetSystemMetrics(SM_CYSCREEN) - (rect.bottom - rect.top)) / 2;
+			SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOSIZE);
+		}
+		
+		case WM_PAINT: {
+			// Don't use MessageBox from inside WM_PAINT
+		
+			//load in the correct resources
+			HBITMAP g_progress = NULL;
+			HBITMAP g_step = NULL;
+			char progress_res[20] = "PROGRESS_";
+			strcat( progress_res, progress );
+			char step_res[20] = "STEP_";
+			strcat( step_res, step );
+			g_progress = LoadBitmap(GetModuleHandle(NULL), progress_res );
+			g_step = LoadBitmap(GetModuleHandle(NULL), step_res );
+			if( g_progress == NULL || g_step == NULL ) {
+				//MessageBox(hwnd, "Could not load an image!", "Error", MB_OK | MB_ICONEXCLAMATION);
+			}
+		
+			BITMAP bm; //holds info about the width and height
+			PAINTSTRUCT ps;
+			
+			HDC hdc = BeginPaint(hwnd, &ps);
+			HDC hdcMem = CreateCompatibleDC(hdc);
+			
+			//paint the main splash screen
+			GetObject(g_splash, sizeof(bm), &bm);
+			HBITMAP hbmOld = (HBITMAP)SelectObject(hdcMem, g_splash);
+			BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY);
+						
+			//paint in the progress
+			GetObject(g_progress, sizeof(bm), &bm);
+			SelectObject(hdcMem, g_progress);
+			BitBlt(hdc, 0, 270, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY);
+			
+			//paint in the step with transparency
+			GetObject(g_step, sizeof(bm), &bm);
+			SelectObject(hdcMem, g_step);
+			BitBlt(hdc, 0, 276, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCPAINT);
+			
+			//print the step with text
+			RECT rcClient;
+			GetClientRect(hwnd, &rcClient);
+			//DrawText(hdc, "This is the step", -1, &rcClient, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
+			
+			//restore the hdc
+			SelectObject(hdcMem, hbmOld);
+			
+			//release resources
+			DeleteDC(hdcMem);
+			EndPaint(hwnd, &ps);
+			DeleteObject(g_progress);
+			DeleteObject(g_step);
+			
+		}
+		break;
+		
+		/*
+		case WM_LBUTTONDOWN: {
+			DeleteObject(g_splash);
+			PostQuitMessage(0);
+		}
+		break;
+		*/
+		
+		case WM_CLOSE:
+			DestroyWindow(hwnd);
+			break;
+		
+		case WM_DESTROY:
+			DeleteObject(g_splash);
+			PostQuitMessage(0);
+			break;
+		
+		default:
+			return DefWindowProc(hwnd, msg, wParam, lParam);
+	}
+
+	return 0;
+
+}
+
+//function to process the window
+DWORD WINAPI ProcessWindow( LPVOID lpParam ) {
+	
+	const char g_szClassName[] = "splash";
+	WNDCLASSEX wc;
+	MSG Msg;
+
+	//Step 1: Registering the Window Class
+	wc.cbSize = sizeof(WNDCLASSEX);
+	wc.style = 0;
+	wc.lpfnWndProc = WndProc;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = 0;
+	wc.hInstance = mainInstance;
+	wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+	wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
+	wc.lpszMenuName = NULL;
+	wc.lpszClassName = g_szClassName;
+	wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
+	if(!RegisterClassEx(&wc)) {
+		MessageBox(NULL, "Window Registration Failed!", "Error!",
+		MB_ICONEXCLAMATION | MB_OK);
+		return 0;
+	}
+
+	// Step 2: Creating the Window
+	splashWnd = CreateWindowEx( WS_EX_TOOLWINDOW, g_szClassName, "", WS_POPUP | SS_BITMAP, 0, 0, 420, 300, NULL, NULL, mainInstance, NULL);
+	if( splashWnd == NULL ) {
+		MessageBox(NULL, "Window Creation Failed!", "Error!", MB_ICONEXCLAMATION | MB_OK);
+		return 0;
+	}
+	ShowWindow(splashWnd, mainCmdShow);
+	UpdateWindow(splashWnd);
+
+	window_loaded = true;
+	
+	// Step 3: The Message Loop
+	while(GetMessage(&Msg, NULL, 0, 0) > 0) {
+		TranslateMessage(&Msg);
+		DispatchMessage(&Msg);
+	}
+	return 0;
+} 
+
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
+	
+	const int SPOOF_TIME = 1000;
+	string command = lpCmdLine;
+
+	if((command.compare("-extract") == 0) || (command.compare("--extract") == 0) || (command.compare("-x") == 0)){
+		printf("----------------------------\n");
+		printf("Extracting java installer...\n");
+		printf("----------------------------\n");
+		int result = extractResource( "JAR", "JAR", "@projectname@.jar" );
+		
+		if(result == 0){
+			printf("\n");
+			printf("Extraction complete\n");
+			printf("You can now type java -jar @projectname@.jar to run the installer from the command line\n");
+			return 0;	
+		}
+		else{
+			return 1;
+		}
+	}
+	else if(command.compare("-text") == 0 || command.compare("text") == 0 )
+	{
+		cerr << "-text is depricated, please use -extract and then run \"java -jar @projectname@.jar text\"" << endl;
+	}
+	
+	srand( time(0) );
+	mainInstance = hInstance;
+	mainCmdShow = nCmdShow;
+	
+	//start the window
+	HANDLE hThread;
+	DWORD dwThreadId, dwThrdParam = 1;
+	hThread = CreateThread( 
+       NULL,                        // no security attributes 
+       0,                           // use default stack size  
+       ProcessWindow,               // thread function 
+       &dwThrdParam,	            // argument to thread function 
+       0,                           // use default creation flags 
+       &dwThreadId);                // returns the thread identifier 
+	if ( hThread == NULL ) {
+		return -1;
+		//ErrorExit( "CreateThread failed." );
+	}
+	CloseHandle( hThread );
+	
+	while ( !window_loaded ) {
+		Sleep( 100 );
+	}
+	
+	//create the temp folder and change to it
+	set_splash_step( "TMP" );
+	spoof_progress( SPOOF_TIME );
+	
+	//get the original working directory
+	char* owdChar = _getcwd(NULL, 1024);
+	string owd = "";
+	owd.append( owdChar );
+	free(owdChar);
+	
+	//strip trailing slash
+	if ( owd.substr(owd.length()-1,1).compare( "\\" ) == 0 ) {
+		owd = owd.substr(0, owd.length()-1);
+	}
+		
+	//using the users TMP directory for temp files rather than the current directory so
+	//installation from cdrom works
+	char* tmp = getenv( "TMP" );
+	char id[6]; for( int i=0; i<5; i++ ) id[i] = (char)((rand()%26) + 97); id[5] = '\0'; //id for this instance
+	string tempdir = ""; tempdir.append( tmp ); tempdir.append( "\\@projectname@-" ); tempdir.append( id );
+	const char* tmpdir = tempdir.c_str();
+	if ( _mkdir( tmpdir ) != 0 ) {
+		string title = "Failed to create the temp folder.";
+		string message = "Failed to create the temp folder.\nPlease set the environment variable TMP to a folder you have permission to write to.";
+		//ShowWindow(splashWnd, SW_HIDE); //hide splash screen
+		MessageBox(splashWnd, message.c_str(), title.c_str(), MB_OK);
+		return -1;
+	}
+	//SetFileAttributes(tmpdir, FILE_ATTRIBUTE_HIDDEN);
+	SetCurrentDirectory(tmpdir);
+	// delete tmp; //  should be tmpdir? ??? (deallocate memory)
+	
+	#ifdef CDROM
+
+	//ask if they want to install, then do it if so
+	int choice = MessageBox(splashWnd, "Install @projectname@?", "@projectname@", MB_OKCANCEL | MB_ICONQUESTION );
+	if ( choice == IDOK ) {
+
+		//prepare to launch the jar
+		set_splash_step( "LAUNCHING" );
+		spoof_progress( SPOOF_TIME );
+	
+		string cmd = "\"";
+		cmd.append( owd );
+		cmd.append( "\\Java\\Windows\\jre\\bin\\java.exe\" \"-Dorig.dir=" );
+		cmd.append( owd );
+		cmd.append( "\" -jar \"" );
+		cmd.append( owd );
+		cmd.append( "\\Java\\Jars\\windows.jar\"" );
+		char cmdLpstr[1024];
+		strcpy( cmdLpstr, cmd.c_str() );
+		
+		
+		STARTUPINFO si;
+		PROCESS_INFORMATION pi;
+		memset(&pi, 0, sizeof(pi));
+		memset(&si, 0, sizeof(si));
+		si.cb = sizeof(si);
+		DWORD dwExitCode = -1;
+
+		//hide splash screen
+		ShowWindow(splashWnd, SW_HIDE);
+
+		//launch the jar
+		bool result;
+		result = CreateProcess(NULL, cmdLpstr, NULL, NULL, TRUE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
+
+		WaitForSingleObject(pi.hProcess, INFINITE);
+		GetExitCodeProcess(pi.hProcess, &dwExitCode);
+		CloseHandle(pi.hThread);
+		CloseHandle(pi.hProcess);
+
+	}	
+	#else
+
+	//rip out java archive if it is bundled
+	set_splash_step( "XJAVA" );
+	int javaIsBundled = (extractResource( "JAVA", "EXE", "@java.installer@" ) == 0);
+	if ( javaIsBundled ) {
+		process( "@java.installer@", false );
+	}
+
+	//find java
+	set_splash_step( "SEARCHING" );
+	spoof_progress( SPOOF_TIME );
+	bool use_minimum = true;
+	Jvm minimum;
+	minimum.setVersionFromString( "@java.min.version@" );
+	string phint = "@java.extracted@";
+	string hint = "";
+	bool verbose = true;
+	Jvm foundJvm;
+	bool jvmFound = find( foundJvm, use_minimum, minimum, false, false, phint, hint, verbose );
+	
+	//if the jvm was not found, try to fix it and find it
+	if ( !jvmFound ) {
+
+		//did not find a good java
+		string message = "This version of @projectname@ requires java @java.min.version@ or greater, but ";
+		
+		//tell them if java is absent or just too old
+		if ( find( foundJvm, false, minimum, false, false, "", "", false ) ) {
+			message.append( "your java is too old.");
+		} else {
+			message.append( "java could not be found on your computer." );
+		}
+		message.append( "\n" );
+		
+		string title = "Installation Failed: Couldn't find java";
+		//ShowWindow(splashWnd, SW_HIDE); //hide splash screen
+		MessageBox(splashWnd, message.c_str(), title.c_str(), MB_OK);
+
+	//if java was found, carry on
+	} else {
+
+		//extract the jar
+		string jarLocation = "@projectname@.jar";
+		
+		set_splash_step( "XJAR" );
+		extractResource( "JAR", "JAR", (char*) jarLocation.c_str() );
+
+		//launch the jar
+		set_splash_step( "LAUNCHING" );
+		spoof_progress( SPOOF_TIME );
+		string cmd = "\"";
+		cmd.append( foundJvm.getWinExecutable() );
+		cmd.append( "\" \"-Dorig.dir=" );
+		cmd.append( owd );
+		cmd.append( "\" -jar @projectname@.jar" );
+		
+		
+		//hide splash screen
+		ShowWindow(splashWnd, SW_HIDE);
+		
+		//run the jar
+		int launch_exit_code = process( cmd, true );
+		
+		//report how it went
+		if ( launch_exit_code != 0 ) {
+			string title = "Installation Error";
+			string message = "The installation exited with an error. Java may not be installed properly, or the installation may have been interrupted partway through. Please try again.";
+			//ShowWindow(splashWnd, SW_HIDE); //hide splash screen
+			MessageBox(NULL, message.c_str(), title.c_str(), MB_OK);
+		}
+	}
+	#endif
+	
+	//clean up the temp directory
+	_unlink( "ant.install.log" );
+	#ifndef CDROM
+	_unlink( "@projectname@.jar" );
+	_unlink( "@java.installer@" );
+	process( "cmd.exe /c rd /s /q @java.extracted@", false );
+	#endif
+
+	SetCurrentDirectory( ".." );
+	_rmdir( tempdir.c_str() );
+	
+	return 0;
+	
+}
