Remove references to git from build scripts and the like.

Would appreviate a full review of this to make sure I didn't miss anything or delete the wrong stuff!

Change-Id: Iff32442f0fe317955f5122ced3d6cf95c4436982
Reviewed-on: http://gerrit.dmdirc.com/238
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

BuildAll.sh

@@ -18,9 +18,6 @@ SCRIPTDIR="/home/dmdirc/scripts"
 # Path to ant binary
 ANT="/usr/bin/ant"
 
-# Path to svn binary
-SVN="/usr/bin/svn"
-
 # Path to git binary
 GIT="/usr/bin/git"
 
@@ -33,13 +30,12 @@ if [ -d .git ]; then
 	$GIT reset --hard
 	$GIT checkout master
 	$GIT pull
-	SVNREV=`$GIT describe`
+	GITREV=`$GIT describe`
 else
-	$SVN update
-	SVNREV=`$SVN info | grep Revision`
-	SVNREV=${SVNREV##*: }
+	echo "GIT Directory not found."
+	exit 1;
 fi;
-export DMDIRC_SVN=${SVNREV}
+export DMDIRC_GIT=${GITREV}
 
 # Archive old nightlies
 if [ `date +%d` = "01" ]; then
@@ -51,8 +47,8 @@ if [ `date +%d` = "01" ]; then
 	rm -Rf ${WWWDIR}/nightly/*_latest*
 fi
 
-# The date/svn prefix to add to the end of the file names of stuff
-FILEDATA=`date +%Y%m%d`_${SVNREV}
+# The date/git rev to add to the end of the file names of stuff
+FILEDATA=`date +%Y%m%d`_${GITREV}
 
 # Copy default settings from www to trunk for compile (if they exist)
 REVERTLIST=""
@@ -70,13 +66,7 @@ fi;
 $ANT -Dchannel=NIGHTLY -k clean jar
 
 # Now revert the trunk so as not to break updates.
-if [ -d .git ]; then
-	${GIT} checkout src/com/dmdirc/config/defaults/;
-else
-	for updatedir in ${REVERTLIST}; do
-		${SVN} revert ${updatedir}/*
-	done;
-fi;
+${GIT} checkout src/com/dmdirc/config/defaults/;
 
 PHP=`which php`
 
@@ -143,8 +133,4 @@ else
 	fi;
 fi
 
-if [ -d .git ]; then
-	$GIT checkout src/com/dmdirc/Main.java
-else
-	$SVN revert src/com/dmdirc/Main.java
-fi;
+$GIT checkout src/com/dmdirc/Main.java

DoReports.sh

@@ -13,8 +13,8 @@ MYDIR="/home/dmdirc/google"
 # Path to scripts
 SCRIPTDIR="/home/dmdirc/scripts"
 
-# Path to svn binary
-SVN="/usr/bin/svn"
+# Path to git binary
+GIT="/usr/bin/git"
 
 # Path to ant binary
 ANT="/usr/bin/ant"
@@ -35,7 +35,7 @@ fi;
 
 cd $MYDIR
 
-$SVN update
+${GIT} pull
 
 # Anti-Clover stupidness!
 rm -Rf ${MYDIR}/.clover

UpdateCopyright.sh

@@ -5,6 +5,6 @@ THISYEAR=`date +%Y`
 OLD="2006-"$((${THISYEAR} - 1))
 NEW="2006-"${THISYEAR}
 
-grep -iRI "${OLD}" ./* | grep -v /.svn/ | grep -v /.git/ | grep -v UpdateCopyright.sh | grep -v update.sh | awk -F: '{print "echo \"Updating \\\""$1"\\\"\"\nsed -i \"s/'${OLD}'/'${NEW}'/g\" \""$1"\""}' > update.sh
+grep -iRI "${OLD}" ./* | grep -v /.git/ | grep -v UpdateCopyright.sh | grep -v update.sh | awk -F: '{print "echo \"Updating \\\""$1"\\\"\"\nsed -i \"s/'${OLD}'/'${NEW}'/g\" \""$1"\""}' > update.sh
 sh update.sh
 rm update.sh

installer/jar/makeJar.sh

@@ -28,13 +28,6 @@ FILENAME=DMDirc
 # full name of the file to output to
 RUNNAME="${PWD}/${FILENAME}.jar"
 
-# Are we a git working copy, or SVN?
-if [ -e ".svn" ]; then
-	isSVN=1
-else
-	isSVN=0
-fi;
-
 # Go!
 echo "-----------"
 if [ -e "${RUNNAME}" ]; then
@@ -47,15 +40,11 @@ showHelp() {
 	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 as well)"
-	echo "-b, --branch              Release in -r is a branch "
 	echo "-p, --plugins <plugins>   What plugins to add to the jar file"
 	echo "-c, --compile             Recompile the .jar file (otherwise use the existing file from dist/)"
 	echo "    --jar <file>          use <file> as DMDirc.jar (ie just add the plugins to it and rename)"
 	echo "    --current             Use the current folder as the base for the build"
 	echo "-e, --extra <tag>         Tag to add to final 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 "    --channel [channel]  Channel to pass to ant (if not passed, 'NONE', if passed without a value, 'STABLE')"
 	echo "---------------------"
 	exit 0;
@@ -63,18 +52,12 @@ showHelp() {
 
 # Check for some CLI params
 compileJar="false"
-updateSVN="true"
 isRelease=""
 finalTag=""
 BRANCH="0"
 plugins=""
-if [ $isSVN -eq 1 ]; then
-	location="../../../"
-	current=""
-else
-	location="../../"
-	current="1"
-fi;
+location="../../"
+current="1"
 jarfile=""
 jre=""
 jrename="jre" # Filename for JRE without the .bin
@@ -106,9 +89,6 @@ while test -n "$1"; do
 			finalTag=${1}
 			RUNNAME="${PWD}/${FILENAME}-${1}.jar"
 			;;
-		--keep|-k)
-			updateSVN="false"
-			;;
 		--help|-h)
 			showHelp;
 			;;
@@ -116,19 +96,8 @@ while test -n "$1"; do
 			BRANCH="1"
 			;;
 		--tag|-t)
-			if [ ${isSVN} -eq 1 ]; then
-				shift
-				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-				if [ "" = "${CHECKTAG}" ]; then
-					echo "Specified tag ("${1}") is invalid."
-					exit 1;
-				fi;
-				TAGGED="${1}"
-			else
-				TAGGED=`git describe --tags`
-				TAGGED=${TAGGED%%-*}
-			fi;
+			TAGGED=`git describe --tags`
+			TAGGED=${TAGGED%%-*}
 			;;
 		--channel)
 			PASSEDPARAM=`echo "${2}" | grep -v ^-`
@@ -147,25 +116,6 @@ if [ "" = "${current}" ]; then
 else
 	jarPath="${location}"
 fi
-if [ "${isRelease}" != "" ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" != "0" ]; then
-			if [ -e "${location}/${isRelease}" ]; then
-				jarPath="${location}/${isRelease}"
-			else
-				echo "Branch "${isRelease}" not found."
-				exit 1;
-			fi
-		else
-			if [ -e "${location}/${isRelease}" ]; then
-				jarPath="${location}/${isRelease}"
-			else
-				echo "Tag "${isRelease}" not found."
-				exit 1;
-			fi
-		fi;
-	fi	
-fi
 
 if [ "" = "${jarfile}" ]; then
 	jarfile=${jarPath}"/dist/DMDirc.jar"
@@ -173,11 +123,7 @@ if [ "" = "${jarfile}" ]; then
 		echo "Creating jar.."
 		OLDPWD=${PWD}
 		cd ${jarPath}
-		if [ "${updateSVN}" = "true" ]; then
-			if [ $isSVN -eq 1 ]; then
-				svn update
-			fi;
-		fi
+
 		ant -Dchannel=${CHANNEL} clean jar
 		if [ ! -e "dist/DMDirc.jar" ]; then
 			echo "There was an error creating the .jar file. Aborting."
@@ -207,24 +153,17 @@ if [ "${plugins}" != "" ]; then
 	rm -Rf plugins;
 fi;
 doRename=0
-if [ "${isRelease}" != "" ]; then
-	doRename=1
-elif [ $isSVN -eq 0 -a "${TAGGED}" != "" ]; then
+if [ "${TAGGED}" != "" ]; then
 	doRename=1	
 fi;
 
 if [ ${doRename} -eq 1 ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" = "1" ]; then
-			isRelease=branch-${isRelease}
-		fi;
+	if [ "${TAGGED}" = "" ]; then
+		isRelease=branch-${isRelease}
 	else
-		if [ "${TAGGED}" = "" ]; then
-			isRelease=branch-${isRelease}
-		else
-			isRelease=${TAGGED}
-		fi;
-	fi
+		isRelease=${TAGGED}
+	fi;
+
 	if [ "" != "${finalTag}" ]; then
 		finalTag="-${finalTag}"
 	fi;

installer/linux/makeInstallerLinux.sh

@@ -28,13 +28,6 @@ INSTALLERNAME=DMDirc-Setup
 # full name of the file to output to
 RUNNAME="${PWD}/${INSTALLERNAME}.run"
 
-# Are we a git working copy, or SVN?
-if [ -e ".svn" ]; then
-	isSVN=1
-else
-	isSVN=0
-fi;
-
 # Find out what params we should pass to things.
 # Solaris has a nice and ancient version of grep in /usr/bin
 grep -na "" /dev/null >/dev/null 2>&1
@@ -109,7 +102,6 @@ showHelp() {
 	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 as well)"
 	echo "-b, --branch              Release in -r is a branch "
 	echo "-p, --plugins <plugins>   What plugins to add to the jar file"
 	echo "-c, --compile             Recompile the .jar file"
@@ -118,26 +110,18 @@ showHelp() {
 	echo "    --jar <file>          use <file> as DMDirc.jar"
 	echo "    --current             Use the current folder as the base for the build"
 	echo "-e, --extra <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"
 plugins=""
-if [ $isSVN -eq 1 ]; then
-	location="../../../"
-	current=""
-else
-	location="../../"
-	current="1"
-fi;
+location="../../"
+current="1"
 jarfile=""
 jre=""
 jrename="jre" # Filename for JRE without the .bin
@@ -175,9 +159,6 @@ while test -n "$1"; do
 			finalTag=${1}
 			RUNNAME="${PWD}/${INSTALLERNAME}-${1}.run"
 			;;
-		--keep|-k)
-			updateSVN="false"
-			;;
 		--help|-h)
 			showHelp;
 			;;
@@ -185,19 +166,8 @@ while test -n "$1"; do
 			BRANCH="1"
 			;;
 		--tag|-t)
-			shift
-			if [ ${isSVN} -eq 1 ]; then
-				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-				if [ "" = "${CHECKTAG}" ]; then
-					echo "Specified tag ("${1}") is invalid."
-					exit 1;
-				fi;
-				TAGGED="${1}"
-			else
-				TAGGED=`git describe --tags`
-				TAGGED=${TAGGED%%-*}
-			fi;
+			TAGGED=`git describe --tags`
+			TAGGED=${TAGGED%%-*}
 			;;
 	esac
 	shift
@@ -207,25 +177,6 @@ if [ "" = "${current}" ]; then
 else
 	jarPath="${location}"
 fi
-if [ "${isRelease}" != "" ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" != "0" ]; then
-			if [ -e "${location}/${isRelease}" ]; then
-				jarPath="${location}/${isRelease}"
-			else
-				echo "Branch "${isRelease}" not found."
-				exit 1;
-			fi
-		else
-			if [ -e "${location}/${isRelease}" ]; then
-				jarPath="${location}/${isRelease}"
-			else
-				echo "Tag "${isRelease}" not found."
-				exit 1;
-			fi
-		fi
-	fi;
-fi
 
 if [ "" = "${jarfile}" ]; then
 	jarfile=${jarPath}"/dist/DMDirc.jar"
@@ -233,9 +184,7 @@ if [ "" = "${jarfile}" ]; 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
@@ -292,13 +241,8 @@ echo "" >> ${RUNNAME}
 tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) installerstub.sh >> ${RUNNAME}
 
 # Add release info.
-if [ $isSVN -eq 1 ]; then
-	awk '{gsub(/###ADDITIONAL_STUFF###/,"isRelease=\"'${isRelease}'\"");print}' ${RUNNAME} > ${RUNNAME}.tmp
-	mv ${RUNNAME}.tmp ${RUNNAME}
-elif [ "${TAGGED}" != "" ]; then
-	awk '{gsub(/###ADDITIONAL_STUFF###/,"isRelease=\"'${TAGGED}'\"");print}' ${RUNNAME} > ${RUNNAME}.tmp
-	mv ${RUNNAME}.tmp ${RUNNAME}
-fi;
+awk '{gsub(/###ADDITIONAL_STUFF###/,"isRelease=\"'${TAGGED}'\"");print}' ${RUNNAME} > ${RUNNAME}.tmp
+mv ${RUNNAME}.tmp ${RUNNAME}
 
 FILES="DMDirc.jar";
 echo "Compressing files.."
@@ -424,24 +368,16 @@ echo "Chmodding"
 chmod a+x ${RUNNAME}
 
 doRename=0
-if [ "${isRelease}" != "" ]; then
-	doRename=1
-elif [ $isSVN -eq 0 -a "${TAGGED}" != "" ]; then
+if [ "${TAGGED}" != "" ]; then
 	doRename=1	
 fi;
 
 if [ ${doRename} -eq 1 ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" = "1" ]; then
-			isRelease=branch-${isRelease}
-		fi;
+	if [ "${TAGGED}" = "" ]; then
+		isRelease=branch-${isRelease}
 	else
-		if [ "${TAGGED}" = "" ]; then
-			isRelease=branch-${isRelease}
-		else
-			isRelease=${TAGGED}
-		fi;
-	fi
+		isRelease=${TAGGED}
+	fi;
 	if [ "" != "${finalTag}" ]; then
 		finalTag="-${finalTag}"
 	fi;

installer/osx/makeInstallerOSX.sh

@@ -28,13 +28,6 @@ INSTALLERNAME=DMDirc
 # full name of the file to output to
 RUNNAME="${PWD}/${INSTALLERNAME}.dmg"
 
-# Are we a git working copy, or SVN?
-if [ -e ".svn" ]; then
-	isSVN=1
-else
-	isSVN=0
-fi;
-
 # Linux needs an entry in fstab to allow normal users to mount things (like a
 # dmg image).
 # These 2 config vars choose what dir and file we mount so that fstab can be
@@ -106,33 +99,24 @@ showHelp() {
 	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 as well)"
 	echo "-b, --branch              Release in -r is a branch "
 	echo "-p, --plugins <plugins>   What plugins to add to the jar file"
 	echo "-c, --compile             Recompile the .jar file"
 	echo "    --jar <file>          use <file> as DMDirc.jar"
 	echo "    --current             Use the current folder as the base for the build"
 	echo "-e, --extra <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"
 plugins=""
-if [ $isSVN -eq 1 ]; then
-	location="../../../"
-	current=""
-else
-	location="../../"
-	current="1"
-fi;
+location="../../"
+current="1"
 jarfile=""
 TAGGED=""
 while test -n "$1"; do
@@ -161,9 +145,6 @@ while test -n "$1"; do
 			finalTag=${1}
 			RUNNAME="${PWD}/${INSTALLERNAME}-${1}.dmg"
 			;;
-		--keep|-k)
-			updateSVN="false"
-			;;
 		--help|-h)
 			showHelp;
 			;;
@@ -171,19 +152,8 @@ while test -n "$1"; do
 			BRANCH="1"
 			;;
 		--tag|-t)
-			shift
-			if [ ${isSVN} -eq 1 ]; then
-				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-				if [ "" = "${CHECKTAG}" ]; then
-					echo "Specified tag ("${1}") is invalid."
-					exit 1;
-				fi;
-				TAGGED="${1}"
-			else
-				TAGGED=`git describe --tags`
-				TAGGED=${TAGGED%%-*}
-			fi;
+			TAGGED=`git describe --tags`
+			TAGGED=${TAGGED%%-*}
 			;;
 	esac
 	shift
@@ -193,25 +163,6 @@ if [ "" = "${current}" ]; then
 else
 	jarPath="${location}"
 fi
-if [ "${isRelease}" != "" ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" != "0" ]; then
-			if [ -e "${location}/${isRelease}" ]; then
-				jarPath="${location}/${isRelease}"
-			else
-				echo "Branch "${isRelease}" not found."
-				exit 1;
-			fi
-		else
-			if [ -e "${location}/${isRelease}" ]; then
-				jarPath="${location}/${isRelease}"
-			else
-				echo "Tag "${isRelease}" not found."
-				exit 1;
-			fi
-		fi
-	fi
-fi
 
 if [ "" = "${jarfile}" ]; then
 	jarfile=${jarPath}"/dist/DMDirc.jar"
@@ -219,9 +170,7 @@ if [ "" = "${jarfile}" ]; 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
@@ -269,25 +218,15 @@ echo "Creating meta files"
 echo "APPLDMDI" > ${CONTENTSDIR}/PkgInfo
 
 doRename=0
-if [ "${isRelease}" != "" ]; then
-	doRename=1
-elif [ $isSVN -eq 0 -a "${TAGGED}" != "" ]; then
+if [ "${TAGGED}" != "" ]; then
 	doRename=1	
 fi;
 
 if [ ${doRename} -eq 1 ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" = "1" ]; then
-			bundleVersion=branch-${isRelease}
-		else
-			bundleVersion=${isRelease}
-		fi;
+	if [ "${TAGGED}" = "" ]; then
+		bundleVersion=branch-${isRelease}
 	else
-		if [ "${TAGGED}" = "" ]; then
-			bundleVersion=branch-${isRelease}
-		else
-			bundleVersion=${TAGGED}
-		fi;
+		bundleVersion=${TAGGED}
 	fi
 else
 	bundleVersion="trunk-"`date +%Y%m%d_%H%M%S`
@@ -489,17 +428,11 @@ fi;
 echo "DMG Creation complete!"
 
 if [ ${doRename} -eq 1 ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" = "1" ]; then
-			isRelease=branch-${isRelease}
-		fi;
+	if [ "${TAGGED}" = "" ]; then
+		isRelease=branch-${isRelease}
 	else
-		if [ "${TAGGED}" = "" ]; then
-			isRelease=branch-${isRelease}
-		else
-			isRelease=${TAGGED}
-		fi;
-	fi
+		isRelease=${TAGGED}
+	fi;
 	if [ "" != "${finalTag}" ]; then
 		finalTag="-${finalTag}"
 	fi;

installer/release.sh

@@ -12,29 +12,12 @@ plugins_linux=""
 # Additional Jar names of plugins to add to only osx installers. (* means all)
 plugins_osx=""
 
-# Are we a git working copy, or SVN?
-if [ -e ".svn" ]; then
-	isSVN=1
-else
-	isSVN=0
-fi;
-
-
 showHelp() {
 	echo "This will generate the different DMDirc installers."
-	if [ ${isSVN} -eq 1 ]; then
-		echo "Usage: ${0} [params] <release>"
-		echo "Release can be either 'trunk', 'this', a valid tag, or a branch (if -b is passed)"
-	else
-		echo "Usage: ${0} [params]"
-	fi;
+	echo "Usage: ${0} [params]"
 	echo "The following params are known:"
 	echo "---------------------"
-	if [ ${isSVN} -eq 1 ]; then
-		echo "-b,  --branch                       <release> is a branch"
-	else
-		echo "-t,  --tag                          This is a tagged release"
-	fi;
+	echo "-t,  --tag                          This is a tagged release"
 	echo "     --jar <file>                   Use <file> instead of compiling a jar."
 	echo "     --fulljar <file>               Use <file> instead of compiling a jar, and don't run makeJar on it."
 	echo "     --jre                          Include a jre in the installers."
@@ -118,18 +101,8 @@ while test -n "$1"; do
 			compileJar="--compile "
 			;;
 		--tag|-t)
-			if [ ${isSVN} -eq 1 ]; then
-				shift
-				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-				if [ "" = "${CHECKTAG}" ]; then
-					echo "Specified tag ("${1}") is invalid."
-					exit 1;
-				fi;
-				TAGGED="-t ${1} "
-			else
-				TAGGED="-t "
-			fi;
+			TAGGED="-t "
+
 			# Always recompile if tagging
 			compileJar="--compile "
 			;;
@@ -164,61 +137,11 @@ if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*
 	if [ "${plugins_osx}" = "*" ]; then plugins_osx=${allPlugins}; fi
 fi;
 
-if [ ${isSVN} -eq 1 ]; then
-	VERSION=""
-	if [ "${LAST}" != "" ]; then
-		if [ "${LAST}" = "trunk" ]; then
-			VERSION="Trunk"
-			RELEASE=""
-		elif [ "${LAST}" = "this" ]; then
-			# Work out what type of build this is!
-			thisDIR=${PWD}
-			cd ..
-			tempDIR=${PWD##*/}
-			if [ "${tempDIR}" = "trunk" ]; then
-				VERSION="Trunk"
-				echo "This is a trunk release.";
-			else
-				echo "This is not a trunk release.";
-				VERSION=${tempDIR}
-				cd ..
-				tempDIR=${PWD##*/}
-				if [ "${tempDIR}" = "tags" ]; then
-					echo "Release of tag "${version}
-					RELEASE="-r "${VERSION}
-					TAG="1"
-				elif [ "${tempDIR}" = "branches" ]; then
-					echo "Release of branch "${version}
-					BRANCH="-b "
-					RELEASE="-r "${VERSION}
-				else
-					VERSION="Unknown"
-					echo "Unknown release target - Building as trunk build"
-					OPT="--current ${OPT}"
-				fi
-			fi;
-			cd ${thisDIR}
-		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 'this', 'trunk' or a valid tag. (see ${0} --help for further information)"
-		exit 1;
-	fi
+VERSION=`git branch | grep ^* | sed "s/^* //g"`
+if [ "${VERSION}" = "master" ]; then
+	RELEASE=""
 else
-	VERSION=`git branch | grep ^* | sed "s/^* //g"`
-	if [ "${VERSION}" = "master" ]; then
-		RELEASE=""
-	else
-		RELEASE="-r ${VERSION}"
-	fi;
+	RELEASE="-r ${VERSION}"
 fi;
 
 JAR=`which jar`
@@ -306,13 +229,8 @@ echo "Clean Up"
 echo "================================================================"
 # Now revert the trunk so as not to break updates.
 for updatedir in ${REVERTLIST}; do
-	if [ ${isSVN} -eq 1 ]; then
-		SVN=`which svn`
-		${SVN} revert ${updatedir}/*
-	else
-		GIT=`which git`
-		${GIT} checkout ${updatedir}
-	fi;
+	GIT=`which git`
+	${GIT} checkout ${updatedir}
 done;
 
 if [ "1" = "${UPLOAD}" -a "" != "${TAGGED}" ]; then

installer/windows/makeInstallerWindows.sh

@@ -35,13 +35,6 @@ INTNAME="${PWD}/${INTNAME}"
 # Get 7zip path
 ZIP=`which 7z`
 
-# Are we a git working copy, or SVN?
-if [ -e ".svn" ]; then
-	isSVN=1
-else
-	isSVN=0
-fi;
-
 if [ "" = "${ZIP}" ]; then
 	echo "7Zip not found, failing."
 	exit 1;
@@ -95,7 +88,6 @@ getFile() {
 
 # Check for some CLI params
 compileJar="false"
-updateSVN="true"
 compileSetup="false"
 useOldSetup="false"
 isRelease=""
@@ -105,13 +97,8 @@ signEXE="true"
 compilerFlags="-Xs -XX -O2 -Or -Op1"
 BRANCH="0"
 plugins=""
-if [ $isSVN -eq 1 ]; then
-	location="../../../"
-	current=""
-else
-	location="../../"
-	current="1"
-fi;
+location="../../"
+current="1"
 jarfile=""
 jre=""
 jrename="jre" # Filename for JRE without the .exe
@@ -122,7 +109,6 @@ showHelp() {
 	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 as well)"
 	echo "-b, --branch              Release in -r is a branch "
 	echo "-s, --setup               Recompile the .exe file"
 	echo "-o,                       If setup.exe compile fails, use old version"
@@ -139,8 +125,6 @@ showHelp() {
 # 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;
 }
@@ -194,9 +178,6 @@ while test -n "$1"; do
 		--unsigned|-u)
 			signEXE="false"
 			;;
-		--keep|-k)
-			updateSVN="false"
-			;;
 		--help|-h)
 			showHelp;
 			;;
@@ -204,19 +185,8 @@ while test -n "$1"; do
 			BRANCH="1"
 			;;
 		--tag|-t)
-			shift
-			if [ ${isSVN} -eq 1 ]; then
-				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-				if [ "" = "${CHECKTAG}" ]; then
-					echo "Specified tag ("${1}") is invalid."
-					exit 1;
-				fi;
-				TAGGED="${1}"
-			else
-				TAGGED=`git describe --tags`
-				TAGGED=${TAGGED%%-*}
-			fi;
+			TAGGED=`git describe --tags`
+			TAGGED=${TAGGED%%-*}
 			;;
 	esac
 	shift
@@ -239,25 +209,6 @@ if [ "" = "${current}" ]; then
 else
 	jarPath="${location}"
 fi
-if [ "${isRelease}" != "" ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" != "0" ]; then
-			if [ -e "${location}/${isRelease}" ]; then
-				jarPath="${location}/${isRelease}"
-			else
-				echo "Branch "${isRelease}" not found."
-				exit 1;
-			fi
-		else
-			if [ -e "${location}/${isRelease}" ]; then
-				jarPath="${location}/${isRelease}"
-			else
-				echo "Tag "${isRelease}" not found."
-				exit 1;
-			fi
-		fi
-	fi
-fi
 
 if [ "" = "${jarfile}" ]; then
 	jarfile=${jarPath}"/dist/DMDirc.jar"
@@ -265,9 +216,7 @@ if [ "" = "${jarfile}" ]; 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
@@ -298,11 +247,7 @@ else
 	rm -Rf plugins;
 fi
 
-if [ $isSVN -eq 1 -o "${TAGGED}" = "" ]; then
-	echo "	ReleaseNumber: String = '${isRelease}';" > SetupConsts.inc
-else
-	echo "	ReleaseNumber: String = '${TAGGED}';" > SetupConsts.inc
-fi;
+echo "	ReleaseNumber: String = '${TAGGED}';" > SetupConsts.inc
 
 FILES=""
 # Icon Res file
@@ -317,11 +262,7 @@ echo "extractor RCDATA extractor.exe" > files.rc
 
 COMPILER_IS_BROKEN="0";
 
-if [ $isSVN -eq 1 -o "${TAGGED}" = "" ]; then
-	NUM="${1}"
-else
-	NUM="${TAGGED}"
-fi;
+NUM="${TAGGED}"
 
 
 
@@ -585,26 +526,16 @@ echo "Creating .exe"
 cat 7zS.sfx 7zip.conf "${INTNAME}" > "${RUNNAME}"
 
 doRename=0
-if [ "${isRelease}" != "" ]; then
-	doRename=1
-elif [ $isSVN -eq 0 -a "${TAGGED}" != "" ]; then
+if [ "${TAGGED}" != "" ]; then
 	doRename=1
 fi;
 
 if [ ${doRename} -eq 1 ]; then
-	if [ $isSVN -eq 1 ]; then
-		if [ "${BRANCH}" = "1" ]; then
-			releaseTag=branch-${isRelease}
-		else
-			releaseTag=${isRelease}
-		fi;
+	if [ "${TAGGED}" = "" ]; then
+		releaseTag=branch-${isRelease}
 	else
-		if [ "${TAGGED}" = "" ]; then
-			releaseTag=branch-${isRelease}
-		else
-			releaseTag=${TAGGED}
-		fi;
-	fi
+		releaseTag=${TAGGED}
+	fi;
 	ORIGNAME="DMDirc-${releaseTag}-Setup${finalTag}.exe"
 else
 	ORIGNAME="${INSTALLNAME}${finalTag}.exe"

src/com/dmdirc/plugins/PluginInfo.java

@@ -738,20 +738,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             return true;
         }
 
-        /*		final String uiPackage;
-        if (Main.getUI().getClass().getPackage() != null) {
-        uiPackage = Main.getUI().getClass().getPackage().getName();
-        } else {
-        final String uiController = Main.getUI().getClass().getName();
-        if (uiController.lastIndexOf('.') >= 0) {
-        uiPackage = uiController.substring(0,uiController.lastIndexOf('.'));
-        } else {
-        uiPackage = uiController;
-        }
-        } */
-
-        if (/*!checkMinimumVersion(getMinVersion(), Main.SVN_REVISION) ||
-                !checkMaximumVersion(getMaxVersion(), Main.SVN_REVISION) ||*/!checkOS(getKeyValue("requires", "os", ""), System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch")) ||
+        if (!checkOS(getKeyValue("requires", "os", ""), System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch")) ||
                 !checkFiles(getKeyValue("requires", "files", "")) ||
                 (!preliminary && !checkPlugins(getKeyValue("requires", "plugins", ""))) ||
                 (!preliminary && !checkServices(metaData.getFlatDomain("required-services")))) {

src/com/dmdirc/updater/UpdateChannel.java

@@ -35,7 +35,7 @@ public enum UpdateChannel {
     UNSTABLE,
     /** Nightly update chanel. */
     NIGHTLY, 
-    /** Not an official release (e.g. SVN). */
+    /** Not an official release (e.g. GIT). */
     NONE;
 
 }