Installer moved into trunk

git-svn-id: http://svn.dmdirc.com/trunk@2741 00569f92-eb28-0410-84fd-f71c24880f

installer/linux/makeInstallerLinux.sh

@@ -0,0 +1,481 @@
+#!/bin/sh
+#
+# This script generates a .run file that will install DMDirc
+#
+# DMDirc - Open Source IRC Client
+# Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Final Name of the installer (without file extention)
+INSTALLERNAME=DMDirc-Setup
+# Location of .run stub start
+STARTLINE=`grep -n "^###START INCLUDE###$" $0`
+STARTLINE=$((${STARTLINE%%:*} + 1))
+# full name of the file to output to
+RUNNAME="${PWD}/${INSTALLERNAME}.run"
+
+# Compress stuff!
+compress() {
+	tar cvfh - $@ | gzip - 2>/dev/null >>${RUNNAME} || {
+		echo "Compression failed."
+		kill -15 $$;
+	};
+}
+
+# Go!
+echo "-----------"
+if [ -e "${RUNNAME}" ]; then
+	echo "Removing existing .run file"
+	rm -Rf ./*.run
+fi
+
+showHelp() {
+	echo "This will generate a DMDirc installer for a unix based system."
+	echo "The following command line arguments are known:"
+	echo "---------------------"
+	echo "-h, --help                Help information"
+	echo "-r, --release [version]   Generate a file based on an svn tag (or branch with -b aswell)"
+	echo "-b, --branch              Release in -r is a branch "
+	echo "-c, --compile             Recompile the .jar file"
+	echo "-t, --tag [tag]           Tag to add to final exe name to distinguish this build from a standard build"
+	echo "-k, --keep                Keep the existing source tree when compiling"
+	echo "                          (don't svn update beforehand)"
+	echo "---------------------"
+	exit 0;
+}
+
+# Check for some CLI params
+compileJar="false"
+updateSVN="true"
+isRelease=""
+finalTag=""
+BRANCH="0"
+location="../../../"
+while test -n "$1"; do
+	case "$1" in
+		--compile|-c)
+			compileJar="true"
+			;;
+		--release|-r)
+			shift
+			isRelease=${1}
+			;;
+		--tag|-t)
+			shift
+			RUNNAME="${PWD}/${INSTALLERNAME}-${1}.run"
+			;;
+		--keep|-k)
+			updateSVN="false"
+			;;
+		--help|-h)
+			showHelp;
+			;;
+		--branch|-b)
+			BRANCH="1"
+			;;
+	esac
+	shift
+done
+
+jarPath="${location}trunk"
+if [ "${isRelease}" != "" ]; then
+	if [ "${BRANCH}" != "0" ]; then
+		if [ -e "${location}branches/"${isRelease} ]; then
+			jarPath="${location}branches/"${isRelease}
+		else
+			echo "Branch "${isRelease}" not found."
+			exit 1;
+		fi
+	else
+		if [ -e "${location}tags/"${isRelease} ]; then
+			jarPath="${location}tags/"${isRelease}
+		else
+			echo "Tag "${isRelease}" not found."
+			exit 1;
+		fi
+	fi
+fi
+
+if [ ! -e ${jarPath}"/dist/DMDirc.jar" -o "${compileJar}" = "true" ]; then
+	echo "Creating jar.."
+	OLDPWD=${PWD}
+	cd ${jarPath}
+	if [ "${updateSVN}" = "true" ]; then
+		svn update
+	fi
+	rm -Rf build dist
+	ant jar
+	if [ ! -e "dist/DMDirc.jar" ]; then
+		echo "There was an error creating the .jar file. Aborting."
+		exit 0;
+	fi;
+	cd ${OLDPWD}
+fi;
+
+echo "Linking jar.."
+ln -s ${jarPath}"/dist/DMDirc.jar" "./DMDirc.jar"
+
+echo "Creating .run file"
+echo "Adding stub.."
+tail -n +${STARTLINE} $0 > ${RUNNAME}
+
+# Add release info.
+awk '{gsub(/###ADDITIONAL_STUFF###/,"isRelease=\"'${isRelease}'\"");print}' ${RUNNAME} > ${RUNNAME}.tmp
+mv ${RUNNAME}.tmp ${RUNNAME}
+
+FILES="DMDirc.jar";
+echo "Compressing files.."
+if [ -e "setup.sh" ]; then
+	FILES="${FILES} setup.sh"
+else
+	echo "[WARNING] Creating setup-less archive. This will just extract and immediately delete the .jar file unless the -e flag is used"
+fi 
+
+if [ -e "../common/installer.jar" ]; then
+	ln -s ../common/installer.jar ./installer.jar
+	FILES="${FILES} installer.jar"
+else
+	echo "[WARNING] Creating installer-less archive - relying on setup.sh"
+fi 
+
+if [ -e ${jarPath}"/src/com/dmdirc/res/logo.svg" ]; then
+	ln -s ${jarPath}"/src/com/dmdirc/res/logo.svg" ./icon.svg
+	FILES="${FILES} icon.svg"
+fi
+
+if [ "${isRelease}" != "" ]; then
+	DOCSDIR=${jarPath}
+else
+	DOCSDIR="../common"
+fi
+
+if [ -e "${DOCSDIR}/README.TXT" ]; then
+	ln -s "${DOCSDIR}/README.TXT" .
+	FILES="${FILES} README.TXT"
+fi
+
+if [ -e "${DOCSDIR}/CHANGES.TXT" ]; then
+	ln -s "${DOCSDIR}/CHANGES.TXT" .
+	FILES="${FILES} CHANGES.TXT"
+elif [ -e "${DOCSDIR}/CHANGELOG.TXT" ]; then
+	ln -s "${DOCSDIR}/CHANGELOG.TXT" .
+	FILES="${FILES} CHANGELOG.TXT"
+fi
+
+compress $FILES
+
+MD5BIN=`which md5sum`
+AWK=`which awk`
+getMD5() {
+	# Everything below the MD5SUM Line
+	MD5LINE=`grep -na "^MD5=\".*\"$" ${1}`
+	MD5LINE=$((${MD5LINE%%:*} + 1))
+
+	MD5SUM=`tail -n +${MD5LINE} "${1}" | ${MD5BIN} - | ${AWK} '{print $1}'`
+	return;
+}
+
+if [ "${MD5BIN}" != "" -a "${AWK}" != "" ]; then
+	echo "Adding MD5.."
+	
+	MD5SUM=""
+	getMD5 ${RUNNAME} ${MD5SUM}
+	
+	echo "SUM obtained is: ${MD5SUM}"
+	
+	LINENUM=`grep -na "^MD5=\"\"$" ${RUNNAME}`
+	LINENUM=${LINENUM%%:*}
+	
+	head -n $((${LINENUM} -1)) ${RUNNAME} > ${RUNNAME}.tmp
+	echo 'MD5="'${MD5SUM}'"' >> ${RUNNAME}.tmp
+	tail -n +$((${LINENUM} +1)) ${RUNNAME} >> ${RUNNAME}.tmp
+	mv ${RUNNAME}.tmp ${RUNNAME}
+else
+	echo "Not Adding MD5.."
+fi;
+
+echo "Chmodding"
+chmod a+x ${RUNNAME}
+
+if [ "${isRelease}" != "" ]; then
+	mv ${RUNNAME} ../output/DMDirc-${isRelease}-Setup.run
+else
+	mv ${RUNNAME} ../output/
+fi;
+mv setup.sh setup.sh.tmp
+rm -f ${FILES}
+mv setup.sh.tmp setup.sh
+
+echo "-----------"
+echo "Done."
+echo "-----------"
+
+# and Done \o
+exit 0;
+### Everything below here is part of the .run stub.
+###START INCLUDE###
+#!/bin/sh
+#
+# This script installs dmdirc
+#
+# DMDirc - Open Source IRC Client
+# Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+MD5=""
+
+# Check the which command exists
+WHICH=`which`
+if [ "" != "${WHICH}" ]; then
+	echo "which command not found. Aborting.";
+	exit 0;
+fi
+
+
+###ADDITIONAL_STUFF###
+
+# Location of .run stub end
+ENDLINE=`grep -na "^###END INCLUDE###$" $0`
+ENDLINE=$((${ENDLINE%%:*} + 1))
+
+if [ "" = "${ENDLINE}" ]; then
+	echo "End of stub not found. Aborting.";
+	exit 0;
+fi
+
+# Attempt to get a name for a random dir in /tmp
+random() {
+	# First off, lets try mktemp.
+	MKTEMP=`which mktemp`
+	if [ "" != "${MKTEMP}" ]; then
+		# mktemp exists \o
+		DIR=`${MKTEMP} -d`
+		eval "$1=${DIR}"
+		return;
+	fi
+	
+	TMPDIR=${TMPDIR:=/tmp}
+	BASEDIR=${TMPDIR}dmdirc_`whoami`_
+	DIR=${PWD}
+	while [ -d "${DIR}" ]; do
+		if [ "" != "${RANDOM}" ]; then
+			# Bash has a psuedo random number generator that can be accessed
+			# using ${RANDOM}
+			RND=${RANDOM}${RANDOM}${RANDOM}
+		else
+			# Dash (the ubuntu default sh) however does not.
+			# od and awk however usually exist, and we can get a random number
+			# from /dev/urandom or /dev/random
+			OD=`which od`
+			AWK=`which awk`
+			RND=""
+			if [ "" != "$OD" -a "" != "$AWK" ]; then
+				# Try /dev/urandom first
+				RAND=/dev/urandom
+				# If it doesn't exist try /dev/random
+				if [ ! -e "${RAND}" ]; then
+					RAND=/dev/urandom;
+				fi
+				# This makes sure we only try to read if one exists
+				if [ ! -e "${RAND}" ]; then
+					RND=$(head -1 ${RAND} | od -N 3 -t u | awk '{ print $2 }')
+				fi;
+			fi;
+			
+			# No random number was generated, getting to here means that
+			# ${RANDOM} doesn't exist, /dev/random doesn't exist, /dev/urandom doesn't exist
+			# or that od/awk don't exist. Annoying.
+			# Try using this processes PID instead!
+			if [ "${RND}" = "" ]; then
+				RND=$$
+				DIR=${BASEDIR}${RND}
+				if [ -e "${DIR}" ]; then
+					# Lets hope this never happens.
+					echo "Unable to create random directory";
+					exit 0;
+				fi;
+			fi;
+		fi;
+		DIR=${BASEDIR}${RND}
+	done
+	mkdir ${DIR}
+	eval "$1=${DIR}"
+}
+
+uncompress() {
+	tail -n +${ENDLINE} "${OLDPWD}/$0" | gzip -cd | tar -xvf - 2>/dev/null || {
+		echo "Decompression failed."
+		kill -15 $$;
+	};
+}
+
+showHelp() {
+	echo "This will install DMDirc on a unix based system."
+	echo "The following command line arguments are known:"
+	echo "---------------------"
+	echo "-h, --help        Help information"
+	echo "-e, --extract     Extract .run file only, do not run setup.sh"
+	echo "-s, --script      Don't use installer.jar (not implemented yet)"
+	echo "---------------------"
+	exit 0;
+}
+
+# Defaults
+extractOnly="false"
+setupParams=""
+skipMD5="false"
+
+# Begin
+echo "---------------------"
+echo "DMDirc Unix Setup"
+if [ "${isRelease}" != "" ]; then
+	echo "Version: "${isRelease};
+	setupParams="${setupParams} --release "${isRelease}
+fi;
+echo "---------------------"
+# Check for cmdline args
+while test -n "$1"; do
+	case "$1" in
+		--help|-h)
+			showHelp
+			;;
+		--extract|-e)
+			extractOnly="true"
+			;;
+		--script|-s)
+			setupParams="${setupParams} --script"
+			;;
+		--nomd5)
+			skipMD5="true"
+			;;
+	esac
+	shift
+done
+
+MD5BIN=`which md5sum`
+AWK=`which awk`
+getMD5() {
+	# Everything below the MD5SUM Line
+	MD5LINE=`grep -na "^MD5=\".*\"$" ${1}`
+	MD5LINE=$((${MD5LINE%%:*} + 1))
+
+	MD5SUM=`tail -n +${MD5LINE} "${1}" | ${MD5BIN} - | ${AWK} '{print $1}'`
+	return;
+}
+
+if [ "${MD5BIN}" != "" ]; then
+	if [ ${skipMD5} != "true" ]; then
+		if [ -e "${0}.md5"  ]; then
+			echo "Checking MD5 using ${0}.md5.."
+			${MD5BIN} --check --status ${0}.md5
+			if [ $? = 0 ]; then
+				echo "MD5 Check Passed!"
+			else
+				echo ""
+				echo "MD5 Check Failed!"
+				echo "--------------------------"
+				echo "This copy of the DMDirc installer appears to be damaged and will now exit.";
+				echo "You may choose to skip this check and run it anyway by passing the --nomd5 parameter";
+				exit 1;
+			fi
+		elif [ "${MD5}" != ""  ]; then
+			echo "Checking MD5 using built in hash.."
+			if [ "${AWK}" != "" ]; then
+				MD5SUM=""
+				getMD5 ${0} ${MD5SUM}
+			
+				echo "SUM obtained is: ${MD5SUM}"
+				echo "SUM expected is: ${MD5}"
+				if [ "${MD5SUM}" = "${MD5}" ]; then
+					echo "MD5 Check Passed!"
+				else
+					echo ""
+					echo "MD5 Check Failed!"
+					echo "--------------------------"
+					echo "This copy of the DMDirc installer appears to be damaged and will now exit.";
+					echo "You may choose to skip this check and run it anyway by passing the --nomd5 parameter";
+					exit 1;
+				fi;
+			else
+				echo "MD5 Check skipped (awk not found).."
+			fi;
+		else
+			if [ "${MD5BIN}" = "" ]; then
+				echo "MD5 Check skipped (md5sum not found).."
+			else
+				echo "MD5 Check skipped (No MD5 hash found to compare against).."
+			fi
+		fi;
+	else
+		echo "MD5 Check skipped (Requested).."
+	fi
+fi;
+
+OLDPWD=${PWD}
+echo "Getting Temp Dir"
+random TEMPDIR
+echo "Got Temp Dir: ${TEMPDIR}"
+cd ${TEMPDIR}
+echo "Uncompressing to temp dir.."
+uncompress
+echo "Done."
+# Check if extract only was wanted.
+if [ "${extractOnly}" = "true" ]; then
+	echo "Extracted. (Files can be found in: ${TEMPDIR})"
+	exit 0;
+fi
+
+if [ -e "${TEMPDIR}/setup.sh" ]; then
+	echo "Running setup.."
+	chmod a+x ${TEMPDIR}/setup.sh
+	${TEMPDIR}/setup.sh ${setupParams}
+	echo ""
+	if [ $? -eq 0 ]; then
+		echo "Setup completed."
+	else
+		echo "Setup failed."
+	fi
+else
+	echo "No setup.sh found. This was pointless?"
+fi
+echo "Removing temp dir"
+cd ${OLDPWD}
+rm -Rf ${TEMPDIR}
+echo "Installation Completed."
+# Job Done!
+exit 0;
+###END INCLUDE###

installer/linux/setup.sh

@@ -0,0 +1,125 @@
+#!/bin/sh
+#
+# This script launches the dmdirc java-based installer.
+#
+# DMDirc - Open Source IRC Client
+# Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+echo ""
+echo "---------------------"
+echo "Setup.sh"
+echo "---------------------"
+echo -n "Looking for java.. ";
+JAVA=`which java`
+
+if [ "" != "${JAVA}" ]; then
+	echo "Success!"
+else
+	echo "Failed!"
+	# This should in future offer to download and install the JVM automatically.
+	echo ""
+	echo "-----------------------------------------------------------------------"
+	echo "Unable to complete setup!"
+	echo "-----------------------------------------------------------------------"
+	echo "Sorry, java is not installed on this machine."
+	echo ""
+	echo "DMDirc requires a 1.6.0 compatible JVM, you can get one from:"
+	echo "http://jdl.sun.com/webapps/getjava/BrowserRedirect"
+	echo "-----------------------------------------------------------------------"
+	exit 1;
+fi
+
+echo "Success!"
+
+if [ "${UID}" = "" ]; then
+	UID=`id -u`;
+fi
+if [ "0" = "${UID}" ]; then
+	echo "Running as root.."
+	isRoot="--isroot";
+else
+	echo "Running as user.."
+	isRoot="";
+fi
+
+showHelp() {
+	echo "This will setup DMDirc on a unix based system."
+	echo "The following command line arguments are known:"
+	echo "---------------------"
+	echo "-h, --help                Help information"
+	echo "-r, --release [version]   This is a release"
+	echo "-s, --script              Don't use installer.jar (not implemented yet)"
+	echo "---------------------"
+	exit 0;
+}
+
+# Check for some CLI params
+scriptOnly="false"
+isRelease=""
+while test -n "$1"; do
+	case "$1" in
+		--script|-s)
+			scriptOnly="true"
+			shift
+			;;
+		--release|-r)
+			shift
+			isRelease=${1}
+			shift
+			;;
+		--help|-h)
+			showHelp;
+			;;
+	esac
+done
+
+if [ "${isRelease}" != "" ]; then
+	isRelease=" --release "${isRelease}
+fi
+
+if [ -e "installer.jar" ]; then
+	if [ "${scriptOnly}" = "true" ]; then
+		echo "Script-only install requested."
+	else
+		echo "Running installer.."
+		${JAVA} -cp DMDirc.jar -jar installer.jar ${isRoot}${isRelease}
+		if [ $? -ne 0 ]; then
+			echo ""
+			echo "-----------------------------------------------------------------------"
+			echo "Unable to complete setup!"
+			echo "-----------------------------------------------------------------------"
+			echo "Sorry, the currently installed version of java is not compatible with"
+			echo "DMDirc."
+			echo ""
+			echo "DMDirc requires a 1.6.0 compatible JVM, you can get one from:"
+			echo "http://jdl.sun.com/webapps/getjava/BrowserRedirect"
+			echo "-----------------------------------------------------------------------"
+			exit 1;
+		fi
+		exit 0;
+	fi
+else 
+	echo "No installer found!"
+fi
+
+## Script-Only install goes here.
+echo "Script-Only functionality not implemented."
+exit 1;

installer/release.sh

@@ -0,0 +1,149 @@
+#!/bin/sh
+
+showHelp() {
+	echo "This will generate the different DMDirc installers."
+	echo "Usage: ${0} [params] <release>"
+	echo "Release can be either 'trunk', a valid tag, or a branch (if -b is passed)"
+	echo "The following params are known:"
+	echo "---------------------"
+	echo "-b, --branch              <release> is a branch"
+	echo "-h, --help                Help information"
+	echo "-o, --opt [options]       Additional options to pass to the make*Installer.sh files"
+	echo "---------------------"
+	exit 0;
+}
+
+# Check for some CLI params
+LAST=""
+OPT=""
+BRANCH=""
+while test -n "$1"; do
+	LAST=${1}
+	case "$1" in
+		--opt|-o)
+			shift
+			OPT="${1} "
+			;;
+		--help|-h)
+			showHelp;
+			;;
+		--branch|-b)
+			BRANCH="-b "
+			;;
+	esac
+	shift
+done
+
+if [ "${LAST}" != "" ]; then
+	if [ "${LAST}" = "trunk" ]; then
+		RELEASE=""
+	elif [ "${BRANCH}" != "" -a ! -e "../../branches/"${LAST} ]; then
+		echo "Branch '"${LAST}"' not found."
+		exit 1;
+	elif [ "${BRANCH}" = "" -a ! -e "../../tags/"${LAST} ]; then
+		echo "Tag '"${LAST}"' not found."
+		exit 1;
+	else
+		RELEASE="-r "${LAST}
+	fi
+else
+	echo "Usage: ${0} [params] <release>"
+	echo "Release can be either 'trunk' or a valid tag. (see ${0} --help for further information)"
+	exit 1;
+fi
+
+JAR=/usr/bin/jar
+JAVAC=/usr/bin/javac
+THISDIR=${PWD}
+
+echo "================================================================"
+echo "Removing existing releases from output directory"
+echo "================================================================"
+rm -Rf output/*.run output/*.exe
+echo "================================================================"
+echo "Building Installer JAR "
+echo "================================================================"
+mkdir -p installer_temp/build
+cd installer_temp
+ln -s ../../src/com
+ln -s ../../src/net
+# I don't know why, but -d doesn't nicely put ALL generated class files here,
+# just those that were in the dir of the java file that was requested for compile
+# So we specify each of the different ones we want built into the jar file here.
+${JAVAC} -d ./build com/dmdirc/installer/*.java
+${JAVAC} -d ./build com/dmdirc/installer/cliparser/*.java
+${JAVAC} -d ./build com/dmdirc/ui/swing/dialogs/wizard/*.java
+${JAVAC} -d ./build com/dmdirc/ui/interfaces/MainWindow.java
+${JAVAC} -d ./build com/dmdirc/ui/swing/MainFrame.java
+${JAVAC} -d ./build com/dmdirc/ui/swing/UIUtilities.java
+${JAVAC} -d ./build com/dmdirc/ui/swing/UIUtilities.java
+${JAVAC} -d ./build com/dmdirc/ui/swing/components/StandardDialog.java
+${JAVAC} -d ./build com/dmdirc/util/ListenerList.java
+${JAVAC} -d ./build com/dmdirc/util/WeakMapList.java
+${JAVAC} -d ./build com/dmdirc/util/WeakList.java
+#${JAVAC} -d ./build net/miginfocom/layout/*.java
+#${JAVAC} -d ./build net/miginfocom/swing/*.java
+if [ $? -ne 0 ]; then
+	echo "================================================================"
+	echo "Building installer failed."
+	echo "================================================================"
+	cd ${THISDIR}
+	rm -Rf installer_temp
+	exit 1;
+fi
+cd build
+echo "Manifest-Version: 1.0" > manifest.txt
+echo "Created-By: DMDirc Installer" >> manifest.txt
+echo "Main-Class: com.dmdirc.installer.Main" >> manifest.txt
+echo "Class-Path: " >> manifest.txt
+echo "" >> manifest.txt
+${JAR} cmf manifest.txt installer.jar com #net
+if [ $? -ne 0 ]; then
+	echo "================================================================"
+	echo "Building installer failed."
+	echo "================================================================"
+	cd ${THISDIR}
+	rm -Rf installer_temp	
+	exit 1;
+else
+	rm -Rf ${THISDIR}/common/installer.jar
+	mv installer.jar ${THISDIR}/common/installer.jar
+fi
+
+cd ${THISDIR}
+rm -Rf installer_temp
+echo "================================================================"
+echo "Building linux installer"
+echo "================================================================"
+cd linux
+./makeInstallerLinux.sh ${OPT}-c -k ${BRANCH}${RELEASE}
+cd ${THISDIR}
+
+echo "================================================================"
+echo "Building Windows installer"
+echo "================================================================"
+cd windows
+./makeInstallerWindows.sh ${OPT}-k -s ${BRANCH}${RELEASE}
+cd ${THISDIR}
+
+MD5BIN=`which md5sum`
+if [ "${MD5BIN}" != "" ]; then
+	echo "================================================================"
+	echo "Creating MD5SUM files"
+	echo "================================================================"
+	cd output
+	for outputFile in *; do
+		if [ "${outputFile##*.}" != "md5" ]; then
+			if [ -e "${outputFile}.md5" ]; then
+				rm -f "${outputFile}.md5"
+			fi
+			${MD5BIN} "${outputFile}" > "${outputFile}.md5"
+		fi
+	done
+	cd ${THISDIR}
+fi
+
+echo "================================================================"
+echo "Release ready - see output folder"
+echo "================================================================"
+exit 0;

installer/windows/Launcher.dpr

@@ -0,0 +1,89 @@
+program Launcher;
+{$MODE Delphi}
+{$APPTYPE GUI}
+
+uses Windows, SysUtils, classes, MD5;
+
+//{$R files.res}
+//{$R version.res}
+//{$R icon.res}
+{$R all.res}
+
+{$I consts.inc}
+
+function GetTempDirectory(): String;
+var
+	buf: array[0..MAX_PATH] of Char;
+	wintemp, temp: String;
+begin
+	GetTempPath(SizeOf(buf)-1, buf);
+	wintemp := StrPas(buf);
+	Randomize;
+	temp := '\DMDirc-installer-'+inttostr(1000 + Random(1000));
+	while (DirectoryExists(wintemp+temp+'\')) do begin
+		temp := temp+'-'+inttostr(1+Random(1000));
+	end;
+	MkDir(wintemp+temp+'\');
+	result := wintemp+temp+'\';
+end;
+
+procedure ExtractResource(name: string; filename: string; dir: string = '');
+var
+	rStream: TResourceStream;
+	fStream: TFileStream;
+	fname: string;
+begin
+	if (dir = '') or (not DirectoryExists(dir)) then dir := IncludeTrailingPathDelimiter(ExtractFileDir(paramstr(0)));
+	fname := dir+filename;
+	if FileExists(fname) then DeleteFile(fname);
+	
+	rStream := TResourceStream.Create(hInstance, name, RT_RCDATA);
+	try
+		fStream := TFileStream.Create(fname, fmCreate);
+		try
+			fStream.CopyFrom(rStream, 0);
+		finally
+			fStream.Free;
+		end;
+	finally
+		rStream.Free;
+	end;
+end;
+
+procedure Launch(sProgramToRun: String);
+var
+	StartupInfo: TStartupInfo;
+	ProcessInfo: TProcessInformation;
+begin
+	FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
+	with StartupInfo do begin
+		cb := SizeOf(TStartupInfo);
+		dwFlags := STARTF_USESHOWWINDOW;
+		wShowWindow := SW_SHOWNORMAL;
+	end;
+
+	CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, ProcessInfo);
+end;
+
+function checkMD5(filename: String): boolean;
+var
+	hash: String;
+begin
+	hash := MD5Print(MD5File(filename));
+	result := (hash = MD5SUM);
+//	if not result then begin
+//		MessageBox(0, PChar('MD5Hash Result:'+#10+'Got: '+hash+#10+'Exp: '+MD5SUM+#10+'Res:'+booltostr(hash = MD5SUM)), 'Test', MB_OK + MB_ICONSTOP);
+//	end;
+
+// Uncomment this to disable MD5 Check
+//	result := true;
+end;
+
+var
+	ErrorMessage: String;
+	TempDir: String;
+begin
+	TempDir := GetTempDirectory;
+	ErrorMessage := '';
+	{$I ExtractCode.inc}
+end.

installer/windows/MD5.pas

@@ -0,0 +1,393 @@
+                                                                              // tabs = 2
+// -----------------------------------------------------------------------------------------------
+//
+//                                 MD5 Message-Digest for Delphi 4
+//
+//                                 Delphi 4 Unit implementing the
+//                      RSA Data Security, Inc. MD5 Message-Digest Algorithm
+//
+//                          Implementation of Ronald L. Rivest's RFC 1321
+//
+//                      Copyright � 1997-1999 Medienagentur Fichtner & Meyer
+//                                  Written by Matthias Fichtner
+//
+// -----------------------------------------------------------------------------------------------
+//               See RFC 1321 for RSA Data Security's copyright and license notice!
+// -----------------------------------------------------------------------------------------------
+//
+//     14-Jun-97  mf  Implemented MD5 according to RFC 1321                           RFC 1321
+//     16-Jun-97  mf  Initial release of the compiled unit (no source code)           RFC 1321
+//     28-Feb-99  mf  Added MD5Match function for comparing two digests               RFC 1321
+//     13-Sep-99  mf  Reworked the entire unit                                        RFC 1321
+//     17-Sep-99  mf  Reworked the "Test Driver" project                              RFC 1321
+//     19-Sep-99  mf  Release of sources for MD5 unit and "Test Driver" project       RFC 1321
+//
+// -----------------------------------------------------------------------------------------------
+//                   The latest release of md5.pas will always be available from
+//                  the distribution site at: http://www.fichtner.net/delphi/md5/
+// -----------------------------------------------------------------------------------------------
+//                       Please send questions, bug reports and suggestions
+//                      regarding this code to: mfichtner@fichtner-meyer.com
+// -----------------------------------------------------------------------------------------------
+//                        This code is provided "as is" without express or
+//                     implied warranty of any kind. Use it at your own risk.
+// -----------------------------------------------------------------------------------------------
+
+unit md5;
+{$MODE Delphi}
+// -----------------------------------------------------------------------------------------------
+INTERFACE
+// -----------------------------------------------------------------------------------------------
+
+uses
+	Windows;
+
+type
+	MD5Count = array[0..1] of DWORD;
+	MD5State = array[0..3] of DWORD;
+	MD5Block = array[0..15] of DWORD;
+	MD5CBits = array[0..7] of byte;
+	MD5Digest = array[0..15] of byte;
+	MD5Buffer = array[0..63] of byte;
+	MD5Context = record
+		State: MD5State;
+		Count: MD5Count;
+		Buffer: MD5Buffer;
+	end;
+
+procedure MD5Init(var Context: MD5Context);
+procedure MD5Update(var Context: MD5Context; Input: pChar; Length: longword);
+procedure MD5Final(var Context: MD5Context; var Digest: MD5Digest);
+
+function MD5String(M: string): MD5Digest;
+function MD5File(N: string): MD5Digest;
+function MD5Print(D: MD5Digest): string;
+
+function MD5Match(D1, D2: MD5Digest): boolean;
+
+// -----------------------------------------------------------------------------------------------
+IMPLEMENTATION
+// -----------------------------------------------------------------------------------------------
+
+var
+	PADDING: MD5Buffer = (
+		$80, $00, $00, $00, $00, $00, $00, $00,
+		$00, $00, $00, $00, $00, $00, $00, $00,
+		$00, $00, $00, $00, $00, $00, $00, $00,
+		$00, $00, $00, $00, $00, $00, $00, $00,
+		$00, $00, $00, $00, $00, $00, $00, $00,
+		$00, $00, $00, $00, $00, $00, $00, $00,
+		$00, $00, $00, $00, $00, $00, $00, $00,
+		$00, $00, $00, $00, $00, $00, $00, $00
+	);
+
+function F(x, y, z: DWORD): DWORD;
+begin
+	Result := (x and y) or ((not x) and z);
+end;
+
+function G(x, y, z: DWORD): DWORD;
+begin
+	Result := (x and z) or (y and (not z));
+end;
+
+
+function H(x, y, z: DWORD): DWORD;
+begin
+	Result := x xor y xor z;
+end;
+
+function I(x, y, z: DWORD): DWORD;
+begin
+	Result := y xor (x or (not z));
+end;
+
+procedure rot(var x: DWORD; n: BYTE);
+begin
+	x := (x shl n) or (x shr (32 - n));
+end;
+
+procedure FF(var a: DWORD; b, c, d, x: DWORD; s: BYTE; ac: DWORD);
+begin
+	inc(a, F(b, c, d) + x + ac);
+	rot(a, s);
+	inc(a, b);
+end;
+
+procedure GG(var a: DWORD; b, c, d, x: DWORD; s: BYTE; ac: DWORD);
+begin
+	inc(a, G(b, c, d) + x + ac);
+	rot(a, s);
+	inc(a, b);
+end;
+
+procedure HH(var a: DWORD; b, c, d, x: DWORD; s: BYTE; ac: DWORD);
+begin
+	inc(a, H(b, c, d) + x + ac);
+	rot(a, s);
+	inc(a, b);
+end;
+
+procedure II(var a: DWORD; b, c, d, x: DWORD; s: BYTE; ac: DWORD);
+begin
+	inc(a, I(b, c, d) + x + ac);
+	rot(a, s);
+	inc(a, b);
+end;
+
+// -----------------------------------------------------------------------------------------------
+
+// Encode Count bytes at Source into (Count / 4) DWORDs at Target
+procedure Encode(Source, Target: pointer; Count: longword);
+var
+	S: PByte;
+	T: PDWORD;
+	I: longword;
+begin
+	S := Source;
+	T := Target;
+	for I := 1 to Count div 4 do begin
+		T^ := S^;
+		inc(S);
+		T^ := T^ or (S^ shl 8);
+		inc(S);
+		T^ := T^ or (S^ shl 16);
+		inc(S);
+		T^ := T^ or (S^ shl 24);
+		inc(S);
+		inc(T);
+	end;
+end;
+
+// Decode Count DWORDs at Source into (Count * 4) Bytes at Target
+procedure Decode(Source, Target: pointer; Count: longword);
+var
+	S: PDWORD;
+	T: PByte;
+	I: longword;
+begin
+	S := Source;
+	T := Target;
+	for I := 1 to Count do begin
+		T^ := S^ and $ff;
+		inc(T);
+		T^ := (S^ shr 8) and $ff;
+		inc(T);
+		T^ := (S^ shr 16) and $ff;
+		inc(T);
+		T^ := (S^ shr 24) and $ff;
+		inc(T);
+		inc(S);
+	end;
+end;
+
+// Transform State according to first 64 bytes at Buffer
+procedure Transform(Buffer: pointer; var State: MD5State);
+var
+	a, b, c, d: DWORD;
+	Block: MD5Block;
+begin
+	Encode(Buffer, @Block, 64);
+	a := State[0];
+	b := State[1];
+	c := State[2];
+	d := State[3];
+	FF (a, b, c, d, Block[ 0],  7, $d76aa478);
+	FF (d, a, b, c, Block[ 1], 12, $e8c7b756);
+	FF (c, d, a, b, Block[ 2], 17, $242070db);
+	FF (b, c, d, a, Block[ 3], 22, $c1bdceee);
+	FF (a, b, c, d, Block[ 4],  7, $f57c0faf);
+	FF (d, a, b, c, Block[ 5], 12, $4787c62a);
+	FF (c, d, a, b, Block[ 6], 17, $a8304613);
+	FF (b, c, d, a, Block[ 7], 22, $fd469501);
+	FF (a, b, c, d, Block[ 8],  7, $698098d8);
+	FF (d, a, b, c, Block[ 9], 12, $8b44f7af);
+	FF (c, d, a, b, Block[10], 17, $ffff5bb1);
+	FF (b, c, d, a, Block[11], 22, $895cd7be);
+	FF (a, b, c, d, Block[12],  7, $6b901122);
+	FF (d, a, b, c, Block[13], 12, $fd987193);
+	FF (c, d, a, b, Block[14], 17, $a679438e);
+	FF (b, c, d, a, Block[15], 22, $49b40821);
+	GG (a, b, c, d, Block[ 1],  5, $f61e2562);
+	GG (d, a, b, c, Block[ 6],  9, $c040b340);
+	GG (c, d, a, b, Block[11], 14, $265e5a51);
+	GG (b, c, d, a, Block[ 0], 20, $e9b6c7aa);
+	GG (a, b, c, d, Block[ 5],  5, $d62f105d);
+	GG (d, a, b, c, Block[10],  9,  $2441453);
+	GG (c, d, a, b, Block[15], 14, $d8a1e681);
+	GG (b, c, d, a, Block[ 4], 20, $e7d3fbc8);
+	GG (a, b, c, d, Block[ 9],  5, $21e1cde6);
+	GG (d, a, b, c, Block[14],  9, $c33707d6);
+	GG (c, d, a, b, Block[ 3], 14, $f4d50d87);
+	GG (b, c, d, a, Block[ 8], 20, $455a14ed);
+	GG (a, b, c, d, Block[13],  5, $a9e3e905);
+	GG (d, a, b, c, Block[ 2],  9, $fcefa3f8);
+	GG (c, d, a, b, Block[ 7], 14, $676f02d9);
+	GG (b, c, d, a, Block[12], 20, $8d2a4c8a);
+	HH (a, b, c, d, Block[ 5],  4, $fffa3942);
+	HH (d, a, b, c, Block[ 8], 11, $8771f681);
+	HH (c, d, a, b, Block[11], 16, $6d9d6122);
+	HH (b, c, d, a, Block[14], 23, $fde5380c);
+	HH (a, b, c, d, Block[ 1],  4, $a4beea44);
+	HH (d, a, b, c, Block[ 4], 11, $4bdecfa9);
+	HH (c, d, a, b, Block[ 7], 16, $f6bb4b60);
+	HH (b, c, d, a, Block[10], 23, $bebfbc70);
+	HH (a, b, c, d, Block[13],  4, $289b7ec6);
+	HH (d, a, b, c, Block[ 0], 11, $eaa127fa);
+	HH (c, d, a, b, Block[ 3], 16, $d4ef3085);
+	HH (b, c, d, a, Block[ 6], 23,  $4881d05);
+	HH (a, b, c, d, Block[ 9],  4, $d9d4d039);
+	HH (d, a, b, c, Block[12], 11, $e6db99e5);
+	HH (c, d, a, b, Block[15], 16, $1fa27cf8);
+	HH (b, c, d, a, Block[ 2], 23, $c4ac5665);
+	II (a, b, c, d, Block[ 0],  6, $f4292244);
+	II (d, a, b, c, Block[ 7], 10, $432aff97);
+	II (c, d, a, b, Block[14], 15, $ab9423a7);
+	II (b, c, d, a, Block[ 5], 21, $fc93a039);
+	II (a, b, c, d, Block[12],  6, $655b59c3);
+	II (d, a, b, c, Block[ 3], 10, $8f0ccc92);
+	II (c, d, a, b, Block[10], 15, $ffeff47d);
+	II (b, c, d, a, Block[ 1], 21, $85845dd1);
+	II (a, b, c, d, Block[ 8],  6, $6fa87e4f);
+	II (d, a, b, c, Block[15], 10, $fe2ce6e0);
+	II (c, d, a, b, Block[ 6], 15, $a3014314);
+	II (b, c, d, a, Block[13], 21, $4e0811a1);
+	II (a, b, c, d, Block[ 4],  6, $f7537e82);
+	II (d, a, b, c, Block[11], 10, $bd3af235);
+	II (c, d, a, b, Block[ 2], 15, $2ad7d2bb);
+	II (b, c, d, a, Block[ 9], 21, $eb86d391);
+	inc(State[0], a);
+	inc(State[1], b);
+	inc(State[2], c);
+	inc(State[3], d);
+end;
+
+// -----------------------------------------------------------------------------------------------
+
+// Initialize given Context
+procedure MD5Init(var Context: MD5Context);
+begin
+	with Context do begin
+		State[0] := $67452301;
+		State[1] := $efcdab89;
+		State[2] := $98badcfe;
+		State[3] := $10325476;
+		Count[0] := 0;
+		Count[1] := 0;
+		ZeroMemory(@Buffer, SizeOf(MD5Buffer));
+	end;
+end;
+
+// Update given Context to include Length bytes of Input
+procedure MD5Update(var Context: MD5Context; Input: pChar; Length: longword);
+var
+	Index: longword;
+	PartLen: longword;
+	I: longword;
+begin
+	with Context do begin
+		Index := (Count[0] shr 3) and $3f;
+		inc(Count[0], Length shl 3);
+		if Count[0] < (Length shl 3) then inc(Count[1]);
+		inc(Count[1], Length shr 29);
+	end;
+	PartLen := 64 - Index;
+	if Length >= PartLen then begin
+		CopyMemory(@Context.Buffer[Index], Input, PartLen);
+		Transform(@Context.Buffer, Context.State);
+		I := PartLen;
+		while I + 63 < Length do begin
+			Transform(@Input[I], Context.State);
+			inc(I, 64);
+		end;
+		Index := 0;
+	end else I := 0;
+	CopyMemory(@Context.Buffer[Index], @Input[I], Length - I);
+end;
+
+// Finalize given Context, create Digest and zeroize Context
+procedure MD5Final(var Context: MD5Context; var Digest: MD5Digest);
+var
+	Bits: MD5CBits;
+	Index: longword;
+	PadLen: longword;
+begin
+	Decode(@Context.Count, @Bits, 2);
+	Index := (Context.Count[0] shr 3) and $3f;
+	if Index < 56 then PadLen := 56 - Index else PadLen := 120 - Index;
+	MD5Update(Context, @PADDING, PadLen);
+	MD5Update(Context, @Bits, 8);
+	Decode(@Context.State, @Digest, 4);
+	ZeroMemory(@Context, SizeOf(MD5Context));
+end;
+
+// -----------------------------------------------------------------------------------------------
+
+// Create digest of given Message
+function MD5String(M: string): MD5Digest;
+var
+	Context: MD5Context;
+begin
+	MD5Init(Context);
+	MD5Update(Context, pChar(M), length(M));
+	MD5Final(Context, Result);
+end;
+
+// Create digest of file with given Name
+function MD5File(N: string): MD5Digest;
+var
+	FileHandle: THandle;
+	MapHandle: THandle;
+	ViewPointer: pointer;
+	Context: MD5Context;
+begin
+	MD5Init(Context);
+	FileHandle := CreateFile(pChar(N), GENERIC_READ, FILE_SHARE_READ or FILE_SHARE_WRITE,
+		nil, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL or FILE_FLAG_SEQUENTIAL_SCAN, 0);
+	if FileHandle <> INVALID_HANDLE_VALUE then try
+		MapHandle := CreateFileMapping(FileHandle, nil, PAGE_READONLY, 0, 0, nil);
+		if MapHandle <> 0 then try
+			ViewPointer := MapViewOfFile(MapHandle, FILE_MAP_READ, 0, 0, 0);
+			if ViewPointer <> nil then try
+				MD5Update(Context, ViewPointer, GetFileSize(FileHandle, nil));
+			finally
+				UnmapViewOfFile(ViewPointer);
+			end;
+		finally
+			CloseHandle(MapHandle);
+		end;
+	finally
+		CloseHandle(FileHandle);
+	end;
+	MD5Final(Context, Result);
+end;
+
+// Create hex representation of given Digest
+function MD5Print(D: MD5Digest): string;
+var
+	I: byte;
+const
+	Digits: array[0..15] of char =
+		('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f');
+begin
+	Result := '';
+	for I := 0 to 15 do Result := Result + Digits[(D[I] shr 4) and $0f] + Digits[D[I] and $0f];
+end;
+
+// -----------------------------------------------------------------------------------------------
+
+// Compare two Digests
+function MD5Match(D1, D2: MD5Digest): boolean;
+var
+	I: byte;
+begin
+	I := 0;
+	Result := TRUE;
+	while Result and (I < 16) do begin
+		Result := D1[I] = D2[I];
+		inc(I);
+	end;
+end;
+
+end.
+

installer/windows/Setup.dpr

@@ -0,0 +1,182 @@
+{*
+ * This application launches the dmdirc java-based installer.
+ * 
+ * DMDirc - Open Source IRC Client
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *}
+program Setup;
+{$MODE Delphi}
+// Use this instead of {$APPTYPE XXX}
+// APP_XXX is the same as {$APPTYPE XXX}
+// Defaults to console
+// This is a work-around for a bug in FPC Cross Compiling to windows in delphi
+// mode (IsConsole is always true)
+{$DEFINE APP_GUI}
+
+// This block actually does the work for the above work-around
+{$IFDEF APP_GUI}
+	{$APPTYPE GUI}
+{$ELSE}
+	{$IFDEF APP_FS}
+		{$APPTYPE FS}
+	{$ELSE}
+		{$IFDEF APP_TOOL}
+			{$DEFINE APP_CONSOLE}
+			{$APPTYPE TOOL}
+		{$ELSE}
+			{$DEFINE APP_CONSOLE}
+			{$APPTYPE CONSOLE}
+		{$ENDIF}
+	{$ENDIF}
+{$ENDIF}
+
+uses Windows, SysUtils, classes;
+
+// This is also part of the above work-around.
+{$IFDEF APP_CONSOLE}
+const
+	IsConsole: boolean = true;
+{$ELSE}
+const
+	IsConsole: boolean = false;
+{$ENDIF}
+
+// Run an application and wait for it to finish.
+function ExecAndWait(sProgramToRun: String): Longword;
+var
+	StartupInfo: TStartupInfo;
+	ProcessInfo: TProcessInformation;
+begin
+	FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
+	with StartupInfo do begin
+		cb := SizeOf(TStartupInfo);
+		dwFlags := STARTF_USESHOWWINDOW;
+		wShowWindow := SW_SHOWNORMAL;
+	end;
+
+	CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, ProcessInfo);
+	getExitCodeProcess(ProcessInfo.hProcess, Result);
+
+	while Result=STILL_ACTIVE do begin
+		sleep(1000);
+		GetExitCodeProcess(ProcessInfo.hProcess, Result);
+	end;
+end;
+
+procedure dowriteln(line: String);
+begin
+	if IsConsole then writeln(line);
+end;
+
+procedure dowrite(line: String);
+begin
+	if IsConsole then write(line);
+end;
+
+procedure showError(ErrorMessage: String);
+begin
+	if IsConsole then begin
+		writeln('');
+		writeln('-----------------------------------------------------------------------');
+		writeln('Sorry, setup is unable to continue.!');
+		writeln('-----------------------------------------------------------------------');
+		writeln('Reason:');
+		writeln('----------');
+		writeln(ErrorMessage);
+		writeln('-----------------------------------------------------------------------');
+		writeln('If you feel this is incorrect, or you require some further assistance,');
+		writeln('please feel free to contact us.');
+		writeln('-----------------------------------------------------------------------');
+		readln();
+	end
+	else begin
+		ErrorMessage := ErrorMessage+#13#10;
+		ErrorMessage := ErrorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
+		ErrorMessage := ErrorMessage+#13#10+'please feel free to contact us.';
+		
+		MessageBox(0, PChar(ErrorMessage), 'Sorry, setup is unable to continue', MB_OK + MB_ICONSTOP);
+	end;
+end;
+
+var
+	errorMessage: String;
+	javaCommand: String = 'javaw.exe';
+begin
+	// Nice and simple
+		
+	if IsConsole then begin
+		writeln('-----------------------------------------------------------------------');
+		writeln('Welcome to the DMDirc installer.');
+		writeln('-----------------------------------------------------------------------');
+		writeln('This will install DMDirc on your computer.');
+		writeln('');
+		writeln('Please wait whilst the GUI part of the installer loads...');
+		writeln('-----------------------------------------------------------------------');
+//	end
+//	else begin
+//		errorMessage := 'This will install DMDirc on your computer, please click OK to continue, or Cancel to abort.';
+//		if (MessageBox(0, PChar(errorMessage), 'DMDirc Installer', MB_OKCANCEL + MB_ICONINFORMATION) <> IDOK) then begin
+//			exit;
+//		end;
+	end;
+	errorMessage := '';
+	dowrite('Checking for installer.jar.. ');
+	if FileExists('installer.jar') then begin
+		dowriteln('Success!');
+		dowrite('Checking for JVM.. ');
+		if (ExecAndWait(javaCommand+' -version') <> 0) then begin
+			dowriteln('Failed!');
+			errorMessage := errorMessage+'No JVM is currently installed.';
+			errorMessage := errorMessage+#13#10;
+			errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
+			errorMessage := errorMessage+#13#10+'http://jdl.sun.com/webapps/getjava/BrowserRedirect';
+		end
+		else begin
+			if IsConsole then begin
+				writeln('Success!');
+				write('Starting installer.jar.. ');
+				javaCommand := 'java.exe';
+			end;
+			if (ExecAndWait(javaCommand+' -jar installer.jar') <> 0) then begin
+				dowriteln('Failed!');
+				errorMessage := errorMessage+'The currently installed version of java is not compatible with DMDirc.';
+				errorMessage := errorMessage+#13#10;
+				errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
+				errorMessage := errorMessage+#13#10+'http://jdl.sun.com/webapps/getjava/BrowserRedirect';
+				showError(errorMessage);
+			end;
+		end;
+	end
+	else begin
+		dowriteln('Failed!');
+		errorMessage := errorMessage+'installer.jar was not found.';
+		errorMessage := errorMessage+#13#10;
+		errorMessage := errorMessage+#13#10+'This is likely because of a corrupt installer build.';
+		errorMessage := errorMessage+#13#10+'Please check http://www.dmdirc.com/ for an updated build.';
+		showError(errorMessage);
+	end;
+	if IsConsole then begin
+		writeln('');
+		writeln('-----------------------------------------------------------------------');
+		writeln('Installation Completed. Thank you for choosing DMDirc');
+		writeln('-----------------------------------------------------------------------');	
+	end;
+end.

installer/windows/makeInstallerWindows.sh

@@ -0,0 +1,364 @@
+#!/bin/sh
+#
+# This script generates a .exe file that will install DMDirc
+#
+# DMDirc - Open Source IRC Client
+# Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Name of the extractor
+RUNNAME=extractor.exe
+# Name of the installer (without .exe)
+INSTALLNAME=DMDirc-Setup
+# Name of the internal file
+INTNAME=extractor.7z
+# full name of the files to output to
+RUNNAME="${PWD}/${RUNNAME}"
+INTNAME="${PWD}/${INTNAME}"
+# Get 7zip path
+ZIP=`which 7z`
+
+if [ "" = "${ZIP}" ]; then
+	echo "7Zip not found, failing."
+	exit 1;
+fi
+
+# Compress stuff!
+compress() {
+	${ZIP} a -yl ${INTNAME} $@ 2>/dev/null || {
+		echo "Compression failed."
+		kill -15 $$;
+	};
+}
+
+# Get signcode path
+SIGNCODE=`which signcode`
+
+if [ "" = "${SIGNCODE}" ]; then
+	echo "Signcode not found. EXE's will not be digitally signed."
+	exit 1;
+fi
+
+# Sign stuff!
+signexe() {
+return;
+	if [ "" != "${SIGNCODE}" ]; then
+		if [ -e "../signing/DMDirc.spc" -a -e "../signing/DMDirc.pvk" ]; then
+			echo "Digitally Signing EXE (${@})..."
+			${SIGNCODE} -spc "../signing/DMDirc.spc" -v "../signing/DMDirc.pvk" -i "http://www.dmdirc.com/" -n "DMDirc Installer" $@ 2>/dev/null || {
+				kill -15 $$;
+			};
+			rm ${@}.sig
+			rm ${@}.bak
+		fi
+	fi
+}
+
+# Go!
+echo "-----------"
+if [ -e "${RUNNAME}" ]; then
+	echo "Removing existing .exe file"
+	rm -Rf "${RUNNAME}"
+fi
+if [ -e "${INTNAME}" ]; then
+	echo "Removing existing .7z file"
+	rm -Rf "${INTNAME}"
+fi
+echo "Creating .7z file"
+
+# Check for some CLI params
+compileJar="false"
+updateSVN="true"
+compileSetup="false"
+useOldSetup="false"
+isRelease=""
+useUPX="false"
+finalTag=""
+signEXE="true"
+compilerFlags=""
+BRANCH="0"
+location="../../../"
+
+showHelp() {
+	echo "This will generate a DMDirc installer for a windows based system."
+	echo "The following command line arguments are known:"
+	echo "---------------------"
+	echo "-h, --help                Help information"
+	echo "-r, --release [version]   Generate a file based on an svn tag (or branch with -b aswell)"
+	echo "-b, --branch              Release in -r is a branch "
+	echo "-s, --setup               Recompile the .exe file"
+	echo "-e,                       If setup.exe compile fails, use old version"
+	echo "-c, --compile             Recompile the .jar file"
+	echo "-u, --unsigned            Don't sign the exe"
+	echo "-t, --tag [tag]           Tag to add to final exe name to distinguish this build from a standard build"
+	echo "-f, --flags [flags]       Extra flags to pass to the compiler"	
+# This is not in the help cos its crappy really, and makes little/no difference to the
+# exe size unless debugging information is added using --flags, in which case the person
+# probably is Dataforce and knows about this flag anyway
+#	echo "    --upx                 UPX binary if UPX is available on the path,"
+#	echo "                          (Compression Level: 4 for signed exe, 9 for unsigned)"
+	echo "-k, --keep                Keep the existing source tree when compiling"
+	echo "                          (don't svn update beforehand)"
+	echo "---------------------"
+	exit 0;
+}
+
+while test -n "$1"; do
+	case "$1" in
+		--compile|-c)
+			compileJar="true"
+			;;
+		--setup|-s)
+			compileSetup="true"
+			;;
+		-e)
+			useOldSetup="true"
+			;;
+		--release|-r)
+			shift
+			isRelease=${1}
+			;;
+		--tag|-t)
+			shift
+			finalTag="-${1}"
+			;;
+		--flags|-f)
+			shift
+			compilerFlags="${1} "
+			;;
+		--upx)
+			useUPX="true"
+			;;
+		--unsigned|-u)
+			signEXE="false"
+			;;			
+		--keep|-k)
+			updateSVN="false"
+			;;
+		--help|-h)
+			showHelp;
+			;;
+		--branch|-b)
+			BRANCH="1"
+			;;
+	esac
+	shift	
+done
+
+jarPath="${location}trunk"
+if [ "${isRelease}" != "" ]; then
+	if [ "${BRANCH}" != "0" ]; then
+		if [ -e "${location}branches/"${isRelease} ]; then
+			jarPath="${location}branches/"${isRelease}
+		else
+			echo "Branch "${isRelease}" not found."
+			exit 1;
+		fi
+	else
+		if [ -e "${location}tags/"${isRelease} ]; then
+			jarPath="${location}tags/"${isRelease}
+		else
+			echo "Tag "${isRelease}" not found."
+			exit 1;
+		fi
+	fi
+fi
+
+if [ ! -e ${jarPath}"/dist/DMDirc.jar" -o "${compileJar}" = "true" ]; then
+	echo "Creating jar.."
+	OLDPWD=${PWD}
+	cd ${jarPath}
+	if [ "${updateSVN}" = "true" ]; then
+		svn update
+	fi
+	rm -Rf build dist
+	ant jar
+	if [ ! -e "dist/DMDirc.jar" ]; then
+		echo "There was an error creating the .jar file. Aborting."
+		exit 0;
+	fi;
+	cd ${OLDPWD}
+fi;
+
+echo "Linking jar.."
+ln -s ${jarPath}"/dist/DMDirc.jar" "./DMDirc.jar"
+
+FILES="DMDirc.jar Setup.exe";
+if [ ! -e "Setup.exe"  -o "${compileSetup}" = "true" ]; then
+	echo "Setup.exe does not exist. Lets try and compile it."	
+	FPC=`which fpc`
+	if [ "${FPC}" = "" ]; then
+		echo "FPC Compiler not found, Setup.exe can not be built."
+		exit 1;
+	else
+		${FPC} -Sd -Twin32 ${compilerFlags}Setup.dpr
+		if [ $? -ne 0 ]; then
+			if [ -e "Setup.exe" -a "${useOldSetup}" = "true" ]; then
+				echo "Unable to compile Setup.exe, using existing version."
+			else
+				echo "Unable to compile Setup.exe, terminating."
+				exit 1;
+			fi
+		fi;
+	fi
+fi
+
+ls
+if [ ! -e "Setup.exe" ]; then
+	echo "Still can't find Setup.exe, terminating."
+	exit 1;
+fi
+
+echo "Compressing files.."
+
+if [ -e "../common/installer.jar" ]; then
+	ln -s ../common/installer.jar ./installer.jar
+	FILES="${FILES} installer.jar"
+else
+	echo "[WARNING] Creating installer-less archive - relying on Setup.exe"
+fi 
+
+if [ -e ${jarPath}"/src/com/dmdirc/res/icon.ico" ]; then
+	ln -s ${jarPath}"/src/com/dmdirc/res/icon.ico" ./icon.ico
+	FILES="${FILES} icon.ico"
+fi
+
+# Shortcut.exe is from http://www.optimumx.com/download/#Shortcut
+if [ ! -e Shortcut.exe ]; then
+	wget http://www.optimumx.com/download/Shortcut.zip
+	unzip -q Shortcut.zip Shortcut.exe
+	rm Shortcut.zip
+fi
+FILES="${FILES} Shortcut.exe"
+
+if [ "${isRelease}" != "" ]; then
+	DOCSDIR=${jarPath}
+else
+	DOCSDIR="../common"
+fi
+
+if [ -e "${DOCSDIR}/README.TXT" ]; then
+	ln -s "${DOCSDIR}/README.TXT" .
+	FILES="${FILES} README.TXT"
+fi
+
+if [ -e "${DOCSDIR}/CHANGES.TXT" ]; then
+	ln -s "${DOCSDIR}/CHANGES.TXT" .
+	FILES="${FILES} CHANGES.TXT"
+elif [ -e "${DOCSDIR}/CHANGELOG.TXT" ]; then
+	ln -s "${DOCSDIR}/CHANGELOG.TXT" .
+	FILES="${FILES} CHANGELOG.TXT"
+fi
+
+if [ -e "${jarPath}/launcher/windows" ]; then
+	# Try to compile all
+	olddir=${PWD}
+	cd "${jarPath}/launcher/windows/"
+	sh compile.sh
+	cd ${olddir}
+	# Now add to file list.
+	for thisfile in `ls -1 ${jarPath}/launcher/windows/*.exe`; do
+		ln -s "${jarPath}/launcher/windows/"${thisfile} .
+		FILES="${FILES} ${thisfile}"
+	done
+fi
+
+compress $FILES
+
+echo "Creating config.."
+echo ";!@Install@!UTF-8!" > 7zip.conf
+if [ "${isRelease}" != "" ]; then
+	echo "Title=\"DMDirc Installation "${isRelease}"\"" >> 7zip.conf
+#	echo "BeginPrompt=\"Do you want to install DMDirc "${isRelease}"?\"" >> 7zip.conf
+else
+	echo "Title=\"DMDirc Installation\"" > 7zip.conf
+#	echo "BeginPrompt=\"Do you want to install DMDirc?\"" >> 7zip.conf
+fi;
+echo "ExecuteFile=\"Setup.exe\"" >> 7zip.conf
+echo ";!@InstallEnd@!" >> 7zip.conf
+
+if [ ! -e "7zS.sfx" ]; then
+	echo "Obtaining sfx stub.."
+	wget http://kent.dl.sourceforge.net/sourceforge/sevenzip/7z447_extra.tar.bz2
+	tar -jxvf 7z447_extra.tar.bz2 7zS.sfx
+	rm 7z447_extra.tar.bz2
+fi
+
+echo "Creating .exe"
+cat 7zS.sfx 7zip.conf "${INTNAME}" > "${RUNNAME}"
+
+if [ "${isRelease}" != "" ]; then
+	ORIGNAME="DMDirc-${isRelease}-Setup${finalTag}.exe"
+else
+	ORIGNAME="${INSTALLNAME}${finalTag}.exe"
+fi;
+
+echo "Building launcher";
+sh makeLauncher.sh "${isRelease}" "${ORIGNAME}" "${compilerFlags}"
+if [ $? -ne 0 ]; then
+	exit 1;
+fi
+FULLINSTALLER="${PWD}/${INSTALLNAME}${finalTag}.exe"
+mv Launcher.exe ${FULLINSTALLER}
+
+if [ "${useUPX}" = "true" ]; then
+	UPX=`which upx`
+	if [ "${UPX}" != "" ]; then	
+		if [ "${signEXE}" = "true" ]; then
+			${UPX} -4 ${FULLINSTALLER}
+		else
+			${UPX} -9 ${FULLINSTALLER}
+		fi
+	fi
+fi
+
+echo "Chmodding.."
+chmod a+x ${FULLINSTALLER}
+if [ "${signEXE}" = "true" ]; then
+	echo "Signing.."
+	signexe ${FULLINSTALLER}
+else
+	echo "Not Signing.."
+fi;
+
+mv ${FULLINSTALLER} ../output/${ORIGNAME}
+
+# Quick hack to prevent deleting of 2 important files in ${FILES}
+mv Setup.exe Setup.exe.tmp
+mv Shortcut.exe Shortcut.exe.tmp
+
+rm -f ${FILES}
+rm -f ./7zip.conf
+rm -f ./*.o
+rm -f ./*.or
+rm -f ${RUNNAME}
+rm -f ${INTNAME}
+rm -f icon.ico
+
+# And un-hack
+mv Setup.exe.tmp Setup.exe
+mv Shortcut.exe.tmp Shortcut.exe
+
+echo "-----------"
+echo "Done."
+echo "-----------"
+
+# and Done \o
+exit 0;

installer/windows/makeLauncher.sh

@@ -0,0 +1,165 @@
+#!/bin/sh
+#
+# This script generates a .exe file that will just launch a pre-defined exe
+# This exe exists solely to rebrand the installer as DMDirc not 7zip, and to
+# give the correct icon.
+#
+# DMDirc - Open Source IRC Client
+# Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Icon Res file
+echo "icon.ico ICON icon.ico" > icon.rc
+
+# Other resources
+echo "extractor RCDATA extractor.exe" > files.rc
+
+COMPILER_IS_BROKEN="0";
+
+# Version Numbers
+if [ "" = "${1}" ]; then
+	MAJORVER="0"
+	MINORVER="0"
+	RELEASE="0"
+	TEXTVER="Trunk"
+	PRIVATE="1"
+	USER=`whoami`
+	HOST=`hostname`
+	DATE=`date`
+else
+	MAJORVER=${1%%.*}
+	SUBVER=${1#*.}
+	DOT=`expr index "${SUBVER}" .`
+	if [ "${DOT}" = "0" ]; then
+		MINORVER=${SUBVER}
+		RELEASE="0"
+	else
+		MINORVER=${SUBVER%%.*}
+		RELEASE=${SUBVER##*.}
+	fi
+	TEXTVER=$1
+	PRIVATE="0"
+fi;
+
+# Information for the below section:
+#
+# http://support.microsoft.com/kb/139491
+# http://msdn2.microsoft.com/en-us/library/aa381049.aspx
+# http://courses.cs.vt.edu/~cs3304/FreePascal/doc/prog/node14.html#SECTION001440000000000000000
+# http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/src/Resources/TortoiseShell.rc2
+
+echo "1 VERSIONINFO" > version.rc
+echo "FILEVERSION 1, 0, 0, 0" >> version.rc
+echo "PRODUCTVERSION ${MAJORVER}, ${MINORVER}, ${RELEASE}, 0" >> version.rc
+if [ "${PRIVATE}" = "1" ]; then
+	if [ "${COMPILER_IS_BROKEN}" = "0" ]; then
+		echo "FILEFLAGSMASK 0x000A" >> version.rc
+		echo "FILEFLAGS 0x3f" >> version.rc
+	else
+		echo "FILEFLAGS 0x000A" >> version.rc
+	fi;
+else
+	echo "FILEFLAGSMASK 0" >> version.rc
+fi;
+echo "FILEOS 0x40004" >> version.rc
+echo "FILETYPE 1" >> version.rc
+echo "BEGIN" >> version.rc
+echo "	BLOCK \"StringFileInfo\"" >> version.rc
+echo "	BEGIN" >> version.rc
+echo "		BLOCK \"040004E4\"" >> version.rc
+echo "		BEGIN" >> version.rc
+echo "			VALUE \"Comments\", \"http://www.dmdirc.com/\"" >> version.rc
+echo "			VALUE \"CompanyName\", \"DMDirc\"" >> version.rc
+echo "			VALUE \"FileDescription\", \"Installer for DMDirc ${TEXTVER}\"" >> version.rc
+echo "			VALUE \"FileVersion\", \"1.0\"" >> version.rc
+echo "			VALUE \"InternalName\", \"DMDirc.jar\"" >> version.rc
+echo "			VALUE \"LegalCopyright\", \"Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes\"" >> version.rc
+echo "			VALUE \"OriginalFilename\", \"$2\"" >> version.rc
+echo "			VALUE \"ProductName\", \"DMDirc\"" >> version.rc
+echo "			VALUE \"ProductVersion\", \"${TEXTVER}\"" >> version.rc
+if [ "${PRIVATE}" = "1" ]; then
+	echo "			VALUE \"PrivateBuild\", \"Build by ${USER}@${HOST} on ${DATE}\"" >> version.rc
+fi;
+echo "		END" >> version.rc
+echo "	END" >> version.rc
+echo "	BLOCK \"VarFileInfo\"" >> version.rc
+echo "	BEGIN" >> version.rc
+echo "		VALUE \"Translation\", 0x400, 1252" >> version.rc
+echo "	END" >> version.rc
+echo "END" >> version.rc
+
+echo "1 24 \"UAC.manifest\"" > UAC.rc
+
+MD5BIN=`which md5sum`
+AWK=`which awk`
+MD5SUM=""
+if [ "${MD5BIN}" != "" -a "${AWK}" != "" ]; then
+	MD5SUM=`${MD5BIN} extractor.exe | ${AWK} '{print $1}'`
+fi
+echo "const" > consts.inc
+echo "	MD5SUM: String = '${MD5SUM}';" >> consts.inc
+
+# Code to extract and launch resource
+echo "ExtractResource('extractor', 'dmdirc_extractor.exe', TempDir);" > ExtractCode.inc
+if [ "${MD5SUM}" != "" ]; then
+	echo "if FindCmdLineSwitch('-nomd5') or FindCmdLineSwitch('nomd5') or checkMD5(TempDir+'dmdirc_extractor.exe') then begin" >> ExtractCode.inc
+	echo -n "	"; # Oh so important for code formatting!
+fi;
+echo "Launch(TempDir+'dmdirc_extractor.exe');" >> ExtractCode.inc
+if [ "${MD5SUM}" != "" ]; then
+	echo "end" >> ExtractCode.inc
+	echo "else begin" >> ExtractCode.inc
+	echo "	ErrorMessage := 'This copy of the DMDirc installer appears to be damaged and will now exit';" >> ExtractCode.inc
+	echo "	ErrorMessage := ErrorMessage+#13#10+'You may choose to skip this check and run it anyway by passing the /nomd5 parameter';" >> ExtractCode.inc
+	echo "	ErrorMessage := ErrorMessage+#13#10+'';" >> ExtractCode.inc
+	echo "	ErrorMessage := ErrorMessage+#13#10;" >> ExtractCode.inc
+	echo "	ErrorMessage := ErrorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';" >> ExtractCode.inc
+	echo "	ErrorMessage := ErrorMessage+#13#10+'please feel free to contact us.';" >> ExtractCode.inc
+	echo "	" >> ExtractCode.inc
+	echo "	MessageBox(0, PChar(ErrorMessage), 'Sorry, setup is unable to continue', MB_OK + MB_ICONSTOP);" >> ExtractCode.inc
+	echo "end;" >> ExtractCode.inc	
+fi
+
+# Build res files
+#windres -F pe-i386 -i version.rc -o version.res
+#windres -F pe-i386 -i files.rc -o files.res
+#windres -F pe-i386 -i icon.rc -o icon.res
+
+cat UAC.rc > all.rc
+cat version.rc >> all.rc
+cat files.rc >> all.rc
+cat icon.rc >> all.rc
+windres -F pe-i386 -i all.rc -o all.res
+
+FPC=`which fpc`
+${FPC} -Sd -Twin32 ${3}Launcher.dpr
+if [ $? -ne 0 ]; then
+	if [ -e "Launcher.exe" ]; then
+		echo "Unable to compile Launcher.exe, using existing version."
+	else
+		echo "Unable to compile Launcher.exe, terminating."
+		exit 1;
+	fi
+fi
+
+rm -f *.res
+rm -f *.rc
+rm -f *.inc
+rm -f *.ppu

src/com/dmdirc/installer/Installer.java

@@ -36,7 +36,7 @@ import java.nio.channels.FileChannel;
  */
 public abstract class Installer extends Thread {
 	/** Types of shortcut */
-	public static enum ShortcutType { DESKTOP, MENU, QUICKLAUNCH; }
+	public static enum ShortcutType { DESKTOP, MENU, QUICKLAUNCH, UNINSTALLER; }
 	
 	/** Step where things happen. */
 	protected StepInstall step = null;

src/com/dmdirc/installer/StepInstall.java

@@ -117,6 +117,11 @@ public final class StepInstall extends Step implements StepListener {
 			}
 		}
 		
+		if (Main.getInstaller().supportsShortcut(ShortcutType.UNINSTALLER)) {
+			addText("Creating uninstaller");
+			myInstaller.setupShortcut(location, ShortcutType.UNINSTALLER);
+		}
+		
 		addText("");
 		addText("Installation finished\n");
 		Main.getWizardDialog().enableNextStep(true);

src/com/dmdirc/installer/WindowsInstaller.java

@@ -77,7 +77,8 @@ public class WindowsInstaller extends Installer {
 				return !(System.getProperty("os.name").indexOf("95") >= 0);
 			case DESKTOP:
 			case MENU:
-				// All versions of windows have desktop and menu
+			case UNINSTALLER:
+				// All versions of windows have desktop, menu and uninstaller
 				return true;
 			default:
 				// Anything else that gets added should be false until the relevent
@@ -130,6 +131,55 @@ public class WindowsInstaller extends Installer {
 					}
 					break;
 					
+				case UNINSTALLER:
+					// Registry hax!
+					
+					final String[] addKey = new String[] {
+					                      "reg.exe",
+					                      "add",
+					                      "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DMDirc"
+					                      };
+					final String[] displayName = new String[] {
+					                      "reg.exe",
+					                      "add",
+					                      "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DMDirc",
+					                      "/v",
+					                      "DisplayName",
+					                      "/t",
+					                      "REG_SZ",
+					                      "/d",
+					                      "DMDirc IRC Client"
+					                      };
+					final String[] uninstaller = new String[] {
+					                      "reg.exe",
+					                      "add",
+					                      "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DMDirc",
+					                      "/v",
+					                      "UninstallString",
+					                      "/t",
+					                      "REG_SZ",
+					                      "/d",
+					                      location+"\\Uninstall.exe"
+					                      };
+					try {
+						final Process keyProcess = Runtime.getRuntime().exec(addKey);
+						new StreamReader(keyProcess.getInputStream()).start();
+						new StreamReader(keyProcess.getErrorStream()).start();
+						keyProcess.waitFor();
+						
+						final Process displayNameProcess = Runtime.getRuntime().exec(displayName);
+						new StreamReader(displayNameProcess.getInputStream()).start();
+						new StreamReader(displayNameProcess.getErrorStream()).start();
+						displayNameProcess.waitFor();
+						
+						final Process uninstallerProcess = Runtime.getRuntime().exec(uninstaller);
+						new StreamReader(uninstallerProcess.getInputStream()).start();
+						new StreamReader(uninstallerProcess.getErrorStream()).start();
+						uninstallerProcess.waitFor();
+					} catch (Exception e) {
+						step.addText(" - Error adding registry entries: "+e.getMessage());
+					}
+					break;
 				default:
 					step.addText(" - Error creating shortcut. Not applicable to this Operating System");
 					return;

src/com/dmdirc/ui/swing/JWrappingLabel.java

@@ -52,6 +52,11 @@ public class JWrappingLabel extends JLabel {
 	/** My prefered width. */
 	private int myPreferredWidth = 0;
 
+	/** Is this label in debugging mode? */
+	private boolean debug = false;
+	/** Enable debugging mode */
+	public void setDebug() { debug = true; }
+
 	/** {@inheritDoc} */
 	public JWrappingLabel() {
 		super();
@@ -83,7 +88,7 @@ public class JWrappingLabel extends JLabel {
 			return new Dimension(myPreferredWidth, myPreferredHeight);
 		}
 	}
-	
+
 	/** {@inheritDoc} */
 	@Override
 	public void paint(final Graphics g) {

src/com/dmdirc/updater/components/ClientComponent.java

@@ -25,6 +25,8 @@ package com.dmdirc.updater.components;
 import com.dmdirc.Main;
 import com.dmdirc.updater.UpdateComponent;
 
+import java.io.File;
+
 /**
  * Represents the client component, which covers the core client resources.
  * 
@@ -39,15 +41,20 @@ public class ClientComponent implements UpdateComponent {
     }
 
     /** {@inheritDoc} */
-    @Override    
+    @Override
     public int getVersion() {
         return Main.RELEASE_DATE;
     }
 
     /** {@inheritDoc} */
-    @Override    
+    @Override
     public void doInstall(final String path) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        final File tmpFile = new File(path);
+        final File targetFile = new File(tmpFile.getParent()+File.pathSeparator+".DMDirc.jar");
+        if (targetFile.exists()) {
+            targetFile.delete();
+        }
+        tmpFile.renameTo(targetFile);
     }
 
 }