Installer can now add plugins into the jar file (can be set to include different plugins per release as needed).

Plugins get added to plugins/ in the jar file. Currently set to add no additional plugins to the jar file.


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

installer/linux/makeInstallerLinux.sh

@@ -51,10 +51,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 aswell)"
+	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 "-p, --plugins <plugins>   What plugins to add to the jar file"
 	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 "-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 "---------------------"
@@ -67,9 +68,14 @@ updateSVN="true"
 isRelease=""
 finalTag=""
 BRANCH="0"
+plugins=""
 location="../../../"
 while test -n "$1"; do
 	case "$1" in
+		--plugins|-p)
+			shift
+			plugins=${1}
+			;;
 		--compile|-c)
 			compileJar="true"
 			;;
@@ -129,8 +135,22 @@ if [ ! -e ${jarPath}"/dist/DMDirc.jar" -o "${compileJar}" = "true" ]; then
 	cd ${OLDPWD}
 fi;
 
-echo "Linking jar.."
-ln -s ${jarPath}"/dist/DMDirc.jar" "./DMDirc.jar"
+if [ "" = "${plugins}" ]; then
+	echo "Linking jar.."
+	ln -s ${jarPath}"/dist/DMDirc.jar" "./DMDirc.jar"
+else
+	echo "Copying jar.."
+	cp ${jarPath}"/dist/DMDirc.jar" "./DMDirc.jar"
+	
+	echo "Adding plugins to jar"
+	ln -s ${jarPath}"/plugins"
+	pluginList=""
+	for plugin in ${plugins}; do
+		pluginList=${pluginList}" plugins/${plugin}"
+	done
+	jar -uvf "DMDirc.jar" ${pluginList}
+	rm -Rf plugins;
+fi
 
 echo "Creating .run file"
 echo "Adding stub.."

installer/release.sh

@@ -1,14 +1,26 @@
 #!/bin/sh
 
+# Jar names of plugins to add to ALL installers. (* means all)
+plugins=""
+
+# Additional Jar names of plugins to add to only Windows installers. (* means all)
+plugins_windows=""
+
+# Additional Jar names of plugins to add to only linux installers. (* means all)
+plugins_linux=""
+
 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 "-b, --branch                       <release> is a branch"
+	echo "-p, --plugins <plugins>            Plugins to add to all the jars."
+	echo "-pl, --plugins-linux <plugins>     Plugins to linux installer."
+	echo "-pw, --plugins-windows <plugins>   Plugins to linux installer."
+	echo "-h, --help                         Help information"
+	echo "-o, --opt <options>                Additional options to pass to the make*Installer.sh files"
 	echo "---------------------"
 	exit 0;
 }
@@ -20,6 +32,18 @@ BRANCH=""
 while test -n "$1"; do
 	LAST=${1}
 	case "$1" in
+		--plugins|-p)
+			shift
+			plugins="${1}"
+			;;
+		--plugins-linux|-pl)
+			shift
+			plugins_linux="${1}"
+			;;
+		--plugins-windows|-pw)
+			shift
+			plugins_windows="${1}"
+			;;
 		--opt|-o)
 			shift
 			OPT="${1} "
@@ -34,6 +58,17 @@ while test -n "$1"; do
 	shift
 done
 
+if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*" ]; then
+	echo "Something is all.";
+	allPlugins=""
+	for thisfile in `ls -1 ../plugins/*.jar`; do
+		allPlugins=${allPlugins}" ${thisfile##*/}"
+	done
+	if [ "${plugins}" = "*" ]; then plugins=${allPlugins}; fi
+	if [ "${plugins_linux}" = "*" ]; then plugins_linux=${allPlugins}; fi
+	if [ "${plugins_windows}" = "*" ]; then plugins_windows=${allPlugins}; fi
+fi;
+
 if [ "${LAST}" != "" ]; then
 	if [ "${LAST}" = "trunk" ]; then
 		RELEASE=""
@@ -112,18 +147,19 @@ fi
 
 cd ${THISDIR}
 rm -Rf installer_temp
+
 echo "================================================================"
 echo "Building linux installer"
 echo "================================================================"
 cd linux
-./makeInstallerLinux.sh ${OPT}-c -k ${BRANCH}${RELEASE}
+./makeInstallerLinux.sh ${OPT}-c -k ${BRANCH}${RELEASE} -p "${plugins} ${plugins_linux}"
 cd ${THISDIR}
 
 echo "================================================================"
 echo "Building Windows installer"
 echo "================================================================"
 cd windows
-./makeInstallerWindows.sh ${OPT}-k -s ${BRANCH}${RELEASE}
+./makeInstallerWindows.sh ${OPT}-k -s ${BRANCH}${RELEASE} -p "${plugins} ${plugins_windows}"
 cd ${THISDIR}
 
 MD5BIN=`which md5sum`

installer/windows/makeInstallerWindows.sh

@@ -94,6 +94,7 @@ finalTag=""
 signEXE="true"
 compilerFlags=""
 BRANCH="0"
+plugins=""
 location="../../../"
 
 showHelp() {
@@ -101,14 +102,15 @@ 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 aswell)"
+	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 "-p, --plugins <plugins>   What plugins to add to the jar file"
 	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"	
+	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
@@ -122,6 +124,10 @@ showHelp() {
 
 while test -n "$1"; do
 	case "$1" in
+		--plugins|-p)
+			shift
+			plugins=${1}
+			;;
 		--compile|-c)
 			compileJar="true"
 			;;
@@ -197,8 +203,22 @@ if [ ! -e ${jarPath}"/dist/DMDirc.jar" -o "${compileJar}" = "true" ]; then
 	cd ${OLDPWD}
 fi;
 
-echo "Linking jar.."
-ln -s ${jarPath}"/dist/DMDirc.jar" "./DMDirc.jar"
+if [ "" = "${plugins}" ]; then
+	echo "Linking jar.."
+	ln -s ${jarPath}"/dist/DMDirc.jar" "./DMDirc.jar"
+else
+	echo "Copying jar.."
+	cp ${jarPath}"/dist/DMDirc.jar" "./DMDirc.jar"
+	
+	echo "Adding plugins to jar"
+	ln -s ${jarPath}"/plugins"
+	pluginList=""
+	for plugin in ${plugins}; do
+		pluginList=${pluginList}" plugins/${plugin}"
+	done
+	jar -uvf "DMDirc.jar" ${pluginList}
+	rm -Rf plugins;
+fi
 
 FILES="DMDirc.jar Setup.exe";
 if [ ! -e "Setup.exe"  -o "${compileSetup}" = "true" ]; then