Installer no longer requires whole project to be checked out.

If it cant guess the build type (ie the checkout is not in a folder called trunk/, branches/<foo>/  or tags/<foo>/) it will assume its a trunk build and build as normal (no special release flags etc)


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

installer/linux/makeInstallerLinux.sh

@@ -56,6 +56,7 @@ showHelp() {
 	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 "-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)"
@@ -72,6 +73,7 @@ BRANCH="0"
 plugins=""
 location="../../../"
 jarfile=""
+current=""
 while test -n "$1"; do
 	case "$1" in
 		--plugins|-p)
@@ -82,6 +84,10 @@ while test -n "$1"; do
 			shift
 			jarfile=${1}
 			;;
+		--current)
+			location="../../"
+			current="1"
+			;;
 		--compile|-c)
 			compileJar="true"
 			;;
@@ -105,8 +111,11 @@ while test -n "$1"; do
 	esac
 	shift
 done
-
-jarPath="${location}trunk"
+if [ "" = "${current}" ]; then
+	jarPath="${location}trunk"
+else
+	jarPath="${location}"
+fi
 if [ "${isRelease}" != "" ]; then
 	if [ "${BRANCH}" != "0" ]; then
 		if [ -e "${location}/${isRelease}" ]; then

installer/release.sh

@@ -92,14 +92,15 @@ if [ "${LAST}" != "" ]; then
 			tempDIR=${PWD##*/}
 			if [ "${tempDIR}" = "tags" ]; then
 				echo "Release of tag "${version}
+				RELEASE="-r "${version}
 			elif [ "${tempDIR}" = "branches" ]; then
 				echo "Release of branch "${version}
 				BRANCH="-b "
+				RELEASE="-r "${version}
 			else
-				echo "Unknown release target."
-				exit 0;
+				echo "Unknown release target - Building as trunk build"
+				OPT="--current ${OPT}"
 			fi
-			RELEASE="-r "${version}
 		fi;
 		cd ${thisDIR}
 	elif [ "${BRANCH}" != "" -a ! -e "../../branches/"${LAST} ]; then

installer/windows/makeInstallerWindows.sh

@@ -96,6 +96,7 @@ BRANCH="0"
 plugins=""
 location="../../../"
 jarfile=""
+current=""
 
 showHelp() {
 	echo "This will generate a DMDirc installer for a windows based system."
@@ -112,6 +113,7 @@ showHelp() {
 	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"	
 	echo "    --jar <file>          use <file> as DMDirc.jar"
+	echo "    --current             Use the current folder as the base for the build"
 # 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
@@ -133,6 +135,10 @@ while test -n "$1"; do
 			shift
 			jarfile=${1}
 			;;
+		--current)
+			location="../../"
+			current="1"
+			;;
 		--compile|-c)
 			compileJar="true"
 			;;
@@ -173,7 +179,11 @@ while test -n "$1"; do
 	shift	
 done
 
-jarPath="${location}trunk"
+if [ "" = "${current}" ]; then
+	jarPath="${location}trunk"
+else
+	jarPath="${location}"
+fi
 if [ "${isRelease}" != "" ]; then
 	if [ "${BRANCH}" != "0" ]; then
 		if [ -e "${location}/${isRelease}" ]; then