Build process improvements

Use new plugin build.xml to build plugins
Use new gitversion macro instead of shelling to bash
Remove bash scripts for plugin generation

Change-Id: I368dbe4d3efa31381bf22a12fa8510918c4feb99
Depends-On: I6d650d700aa0bf6324fc877fe16970674dd07c0c
Reviewed-on: http://gerrit.dmdirc.com/2020
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

build-gitversion.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir=".">
+
+    <macrodef name="gitversion">
+        <attribute name="target"/>
+        <attribute name="outputproperty"/>
+        <attribute name="gitdir" default=".git"/>
+
+        <sequential>
+            <local name="lastcommit"/>
+
+            <exec executable="git" outputproperty="lastcommit">
+                <arg value="--git-dir"/>
+                <arg value="@{gitdir}"/>
+                <arg value="rev-list"/>
+                <arg value="--max-count=1"/>
+                <arg value="HEAD"/>
+                <arg value="--"/>
+                <arg value="@{target}"/>
+            </exec>
+
+            <exec executable="git" outputproperty="@{outputproperty}">
+                <arg value="--git-dir"/>
+                <arg value="@{gitdir}"/>
+                <arg value="describe"/>
+                <arg value="--tags"/>
+                <arg value="--always"/>
+                <arg value="${lastcommit}"/>
+            </exec>
+        </sequential>
+    </macrodef>
+
+</project>

build-jar.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="DMDirc-jar" default="default" basedir=".">
-
-    <!-- Netbeans property files -->
-    <property file="nbproject/project.properties"/>
-    <property file="nbproject/private/private.properties"/>
-    <property file="${user.properties.file}"/>
-
-    <target name="-addjarlibs" />
-    <target name="-addpluginlibs">
-        <jar destfile="plugins/ui_swing.jar" compress="${jar.compress}" keepcompression="true" update="true">
-            <zipfileset src="modules/plugins/lib/miglayout-3.7.4-swing.jar" includes="net/miginfocom/layout/**,net/miginfocom/swing/**"/>
-            <zipfileset src="modules/plugins/lib/menuscroller.jar" includes="darrylbu/util/**"/>
-            <zipfileset src="modules/plugins/lib/jxlayer.jar" includes="org/jdesktop/jxlayer/**"/>
-        </jar>
-
-	<jar destfile="plugins/parser_twitter.jar" compress="${jar.compress}" keepcompression="true" update="true">
-            <zipfileset src="modules/plugins/lib/commons-codec-1.3.jar" includes="org/apache/**"/>
-            <zipfileset src="modules/plugins/lib/signpost-core-1.1-SNAPSHOT.jar" includes="com/google/** oauth/signpost/**"/>
-            <zipfileset src="modules/plugins/lib/commons-lang-2.4.jar" includes="org/apache/**"/>
-        </jar>
-
-        <jar destfile="plugins/ui_web.jar" compress="${jar.compress}" keepcompression="true" update="true">
-            <zipfileset src="modules/plugins/lib/commons-lang-2.4.jar" includes="org/apache/**"/>
-            <zipfileset src="modules/plugins/lib/jetty-6.1.22.jar" includes="org/mortbay/**"/>
-            <zipfileset src="modules/plugins/lib/jetty-util-6.1.22.jar" includes="org/mortbay/**"/>
-            <zipfileset src="modules/plugins/lib/servlet-api-2.5-20081211.jar" includes="javax/servlet/**"/>
-        </jar>
-
-        <jar destfile="plugins/parser_irc.jar" compress="${jar.compress}" keepcompression="true" update="true">
-            <fileset dir="${build.classes.dir}">
-                <include name="com/dmdirc/parser/irc/**/*.class"/>
-            </fileset>
-        </jar>
-
-        <jar destfile="plugins/parser_xmpp.jar" compress="${jar.compress}" keepcompression="true" update="true">
-            <zipfileset src="modules/plugins/lib/smack.jar" includes="org/**"/>
-            <zipfileset src="modules/plugins/lib/smackx.jar" includes="org/** com/**"/>
-        </jar>
-
-       <jar destfile="plugins/parser_msn.jar" compress="${jar.compress}" keepcompression="true" update="true">
-            <zipfileset src="modules/plugins/lib/jml-1.0b4-full.jar" includes="net/** org/**"/>
-            <zipfileset src="modules/plugins/lib/httpcore.jar" includes="org/**"/>
-        </jar>
-
-        <jar destfile="plugins/windowflashing.jar" compress="${jar.compress}" keepcompression="true" update="true">
-            <zipfileset src="modules/plugins/lib/jna.jar" includes="com/**"/>
-            <zipfileset src="modules/plugins/lib/platform.jar" includes="com/**"/>
-        </jar>
-
-        <jar destfile="plugins/freedesktop_notifications.jar" compress="${jar.compress}" keepcompression="true" update="true">
-            <zipfileset src="modules/plugins/lib/commons-lang-2.4.jar" includes="org/apache/**"/>
-        </jar>
-    </target>
-
-</project>

build-plugins.xml

@@ -14,10 +14,9 @@
     <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="libclasspath"/>
 
     <target name="build-plugins" description="Build all plugins">
-        <exec executable="bash">
-            <arg value="createAllPluginJar.sh"/>
-            <arg value="${src.dir}/com/dmdirc/addons/"/>
-        </exec>
+        <subant buildpath="modules/plugins" target="jar">
+            <property name="plugins.dmdirc.build.dir" value="../../${build.classes.dir}"/>
+        </subant>
     </target>
 
     <target name="-update-bundled-plugins">

build-versioning.xml

@@ -2,6 +2,8 @@
 <project name="DMDirc-versioning" default="default" basedir=".">
     <description>Adds automatic versioning information to DMDirc</description>
 
+    <include file="build-gitversion.xml"/>
+
     <property name="version.config" value="build/classes/com/dmdirc/version.config"/>
     <property name="defaults.path" value="modules/defaults/.git/"/>
     <property name="defaults.output" value="build/classes/com/dmdirc/config/defaults/"/>
@@ -84,14 +86,8 @@ identity:
     <target name="-read-identities" depends="-read-identities-git"/>
 
     <target name="-read-identities-git" if="is.git">
-        <exec dir="." executable="bash" outputproperty="defaults.version">
-            <arg value="-c"/>
-            <arg value="git --git-dir ${defaults.path} rev-list --all -n 1 -- default | xargs git --git-dir ${defaults.path} describe --tags"/>
-        </exec>
-        <exec dir="." executable="bash" outputproperty="modealiases.version">
-            <arg value="-c"/>
-            <arg value="git --git-dir ${defaults.path} rev-list --all -n 1 -- modealiases | xargs git --git-dir ${defaults.path} describe --tags"/>
-        </exec>
+        <gitversion target="default" gitdir="${defaults.path}" outputproperty="defaults.version"/>
+        <gitversion target="modealiases" gitdir="${defaults.path}" outputproperty="modealiases.version"/>
     </target>
 
 </project>

build.xml

@@ -4,7 +4,6 @@
 
     <import file="nbproject/build-impl.xml"/>
     <import file="build-installer.xml"/>
-    <import file="build-jar.xml"/>
     <import file="build-plugins.xml"/>
     <import file="build-reports.xml"/>
     <import file="build-tests.xml"/>
@@ -21,8 +20,8 @@
         </get>
     </target>
 
-    <target name="-post-compile" depends="-write-version, build-plugins, -addpluginlibs"/>
+    <target name="-post-compile" depends="-write-version, build-plugins"/>
     <target name="-post-test-run" depends="-do-test-reports"/>
-    <target name="-post-jar" depends="-addjarlibs,-update-bundled-plugins"/>
+    <target name="-post-jar" depends="-update-bundled-plugins"/>
 
 </project>

createAllPluginJar.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-# This attempts to create a clean build of dmdirc, then if the build was a success
-# it will create plugin jars for all the plugins in the addons directory.
-
-if [ ${?} = "0" ]; then
-	for dir in `ls -1 modules/plugins/src/com/dmdirc/addons`; do
-		if [ -e "modules/plugins/src/com/dmdirc/addons/${dir}/.ignore" ]; then
-			echo "------"
-			echo "Not building: ${dir}"
-			echo "------"
-		else
-			./createPluginJar.sh com.dmdirc.addons.${dir} ${dir}
-		fi
-	done
-fi
-
-# Plugins to bundle into development jars.
-plugins="ui_swing.jar tabcompletion_bash.jar tabcompletion_mirc.jar parser_irc.jar"
-mkdir -p ${PWD}/build/classes/plugins
-for PLUGIN in ${plugins}; do
-	ln -sf ${PWD}/plugins/${PLUGIN} ${PWD}/build/classes/plugins/${PLUGIN};
-done;
-
-#if [ -d ${PWD}/build/classes -a ! -e ${PWD}/build/classes/plugins ]; then
-#	ln -s ${PWD}/plugins ${PWD}/build/classes/plugins;
-#fi

createPluginJar.sh

@@ -1,109 +0,0 @@
-#!/bin/bash
-# This script will create a plugin jar file for a given plugin.
-
-. build-functions.sh
-
-VALID_EXTS="class,png,exe,dll,html,css,js,gif,py"
-
-if [ "${1}" = "" -o "${2}" = "" ]; then
-	echo "Usage Example: ${0} com.dmdirc.addons.windowstatus WindowStatusPlugin"
-	echo "The above would create WindowStatusPlugin.jar in the plugins/ folder of the current dir"
-	exit;
-fi
-
-destdir=${PWD}
-srcdir=${PWD}/modules/plugins/
-pluginname=${1}
-foldername=${pluginname//.//}
-
-if [ "${REBUILDPLUGINS}" != "true" ]; then
-	newer=`find ${srcdir}/src/${foldername} -type f -newer ${destdir}/plugins/${2}.jar 2>&1 | wc -l`
-	
-	if [ $newer -eq 0 ]; then
-		echo "${2}.jar appears to be up-to-date";
-		exit 0;
-	fi
-fi;
-
-echo "Creating ${2}.jar for ${pluginname} (${foldername})"
-
-if [ ! -e modules/plugins/src/${foldername}/plugin.config ]; then
-	echo "no plugin.config found";
-	exit 0;
-fi
-
-#echo "looking for classes"
-TMPDIR=`safe_mktemp $foldername`
-#echo "Using temp dir: ${TMPDIR}"
-cd $TMPDIR
-
-mkdir META-INF
-if [ -e "${srcdir}/src/${foldername}/plugin.config" ]; then
-	cp "${srcdir}/src/${foldername}/plugin.config" META-INF/
-fi;
-
-if [ -d "${srcdir}/src/${foldername}/licences/" ]; then
-	cp -r "${srcdir}/src/${foldername}/licences/" META-INF/licences/
-fi;
-
-if [ -d "${srcdir}/src/${foldername}/identities/" ]; then
-        cp -r "${srcdir}/src/${foldername}/identities/" META-INF/identities/
-fi;
-
-
-# Do the same for plugin.config
-# This is rudimentary, it a version: section already exists (eg to specify
-# friendlyversion) then it won't add the number= key.
-if [ -e META-INF/plugin.config ]; then
-	VERSIONLINE=`grep -n "version:$" META-INF/plugin.config | cut -f 1 -d ':'`
-
-	if [ -z "$VERSIONLINE" ]; then
-		sed 's/keysections:/keysections:\n  version/g' META-INF/plugin.config > META-INF/plugin.config.temp
-		rm -Rf META-INF/plugin.config
-		mv META-INF/plugin.config.temp META-INF/plugin.config		
-	fi;
-
-	GIT=`which git`
-	REV=$(${GIT} --git-dir "${srcdir}/.git" describe --tags `${GIT} --git-dir "${srcdir}/.git" rev-list --max-count=1 HEAD -- "src/${foldername}"`);
-
-	echo "" >> META-INF/plugin.config
-	echo "" >> META-INF/plugin.config
-	echo "version:" >> META-INF/plugin.config;
-	echo "  number=$REV" >> META-INF/plugin.config;
-fi;
-
-foo=`echo $foldername | sed -e 's/\/[^\/]*$//g'`
-mkdir -p "$foo"
-cd "${foo}"
-ln -s "${destdir}/build/classes/${foldername}" .
-cd "$TMPDIR"
-mkdir -p "${destdir}/plugins/"
-
-rm -Rf "${destdir}/plugins/${2}.jar"
-jar -cvf "${srcdir}/src/${foldername}/${2}.jar" META-INF >/dev/null
-bit=""
-while [ 1 -eq 1 ]; do
-	bit=${bit}/*
-	ls ${foo}${bit}/* >/dev/null 2>&1
-	if [ ${?} -ne 0 ]; then
-		break;
-	else
-		DIR="${PWD}"
-		for prepackage in `ls "${srcdir}/src/${foldername}${bit}/prePackage.sh" 2>/dev/null`; do
-			cd `dirname "${prepackage}"`
-			/bin/sh "${prepackage}"
-			cd ${DIR}
-		done;
-
-		FILES="ls -1 "${foo}${bit}/"*.{${VALID_EXTS}}"
-                FILES=`eval ${FILES} 2>/dev/null`
-
-		jar -uvf "${srcdir}/src/${foldername}/${2}.jar" ${FILES} >/dev/null
-	fi
-done
-
-mv "${srcdir}/src/${foldername}/${2}.jar" "${destdir}/plugins/"
-
-cd "${srcdir}"
-rm -Rf ${TMPDIR}
-#echo "done";