Gradle-ify the plugins.

* Move all plugins to their own top-level directories.
* Move resources out of source trees
* Add Gradle build scripts.
* Remove ivy and ant build scripts.

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

.gitignore

@@ -1,4 +1,6 @@
 /build
+*/build
 /dist
 /lib
 *.iml
+/.gradle

activewindow/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+  compile project(':ui_swing')
+}

build-ivy.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="DMDirc-plugins-ivy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>Ivy utilities for DMDirc plugins</description>
-
-    <property name="ivy.cache.ttl.default" value="7d"/>
-
-    <target name="-init-plugins-lib-directory">
-        <mkdir dir="${plugins.lib}"/>
-    </target>
-
-    <target name="-init-ivy" depends="-init-plugins-lib-directory">
-        <path id="ivy.classpath">
-           <fileset dir="etc/ivy" includes="ivy*.jar"/>
-        </path>
-
-        <available classname="org.apache.ivy.ant.IvyConfigure"
-              property="ivy.available" classpathref="ivy.classpath" />
-    </target>
-
-    <target name="init-dependencies" depends="-init-ivy" unless="ivy.done">
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.classpath"/>
-        <ivy:settings file="etc/ivy/ivysettings.xml"/>
-        <ivy:retrieve symlink="true" pattern="lib/[conf]/[artifact].[ext]" sync="true" />
-        <property name="ivy.done" value="true"/>
-    </target>
-</project>

build-tests.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir=".">
-
-    <target name="-init-clover-initstring" unless="clover.init.string">
-        <property name="clover.init.string" location=".clover/clover.db"/>
-    </target>
-
-    <target name="-init-clover" depends="-init-clover-initstring">
-        <path id="clover.classpath">
-            <fileset dir="lib/test" includes="*clover*.jar"/>
-            <fileset dir="${clover.search.path}" includes="*clover*.jar"/>
-        </path>
-
-        <taskdef resource="cloverlib.xml" classpathref="clover.classpath"/>
-        <taskdef resource="cloverjunitlib.xml" classpathref="clover.classpath"/>
-
-        <condition property="clover.installed">
-            <and>
-                <available classname="com.atlassian.clover.CloverInstr"/>
-                <or>
-                    <available file="lib/clover.license"/>
-                    <available file="${clover.search.path}/clover.license"/>
-                    <available file="${clover.license.path}"/>
-                </or>
-            </and>
-        </condition>
-    </target>
-
-    <target name="with.clover" depends="-init-clover" if="clover.installed"
-            description="Set up Clover to instrument tests.">
-        <clover-env/>
-        <clover-setup initstring="${clover.init.string}"/>
-    </target>
-
-    <target name="compile-for-tests" depends="clean,with.clover,compile"/>
-
-</project>

build.gradle

@@ -0,0 +1,93 @@
+// DMDirc plugins build script
+//
+// Run with -PdmdircOutput=/path/to/DMDirc/classes/
+
+import org.mdonoughe.JGitDescribeTask
+
+subprojects {
+    apply plugin: 'java'
+
+    configurations {
+        bundle
+
+        compile {
+            extendsFrom bundle
+        }
+    }
+
+    sourceSets {
+        main {
+            java {
+                srcDir 'src'
+            }
+            resources {
+                srcDir 'res'
+            }
+        }
+        test {
+            java {
+                srcDir 'test'
+            }
+        }
+    }
+
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
+
+    repositories {
+        mavenCentral()
+        maven {
+            url 'http://nexus.dmdirc.com/nexus/content/repositories/thirdparty/'
+        }
+    }
+
+    dependencies {
+        compile files("$dmdircOutput")
+        compile fileTree(dir: '../../../lib/bundled/', include: '*.jar')
+
+        compile group: 'com.google.code.findbugs', name: 'jsr305', version: '2.+'
+        compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1'
+    }
+
+    task copyPluginConfig(type: Copy) {
+        from 'plugin.config'
+        into "$buildDir"
+    }
+
+    task updatePluginConfig(dependsOn: copyPluginConfig) << {
+        def jgit = new org.mdonoughe.JGitDescribeTask()
+        jgit.setDir(new File("$rootDir", '.git'))
+        jgit.setSubDir("$projectDir")
+
+        ext.version = jgit.getDescription()
+        def targetFile = new File("$buildDir", 'plugin.config')
+        targetFile << "\n\nversion:\n  number=${version}\n"
+    }
+
+    jar {
+        from("$buildDir/plugin.config") {
+            into 'META-INF'
+        }
+
+        from { configurations.bundle.collect { it.isDirectory() ? it : zipTree(it) } } {
+            exclude 'META-INF/**'
+        }
+    }
+
+    jar.dependsOn updatePluginConfig
+}
+
+
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            url 'http://nexus.dmdirc.com/nexus/content/repositories/thirdparty/'
+        }
+    }
+
+    dependencies {
+        classpath group: 'com.github.shanemcc', name: 'jgit-describe', version: '0.5'
+        classpath group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '2.3.1.+'
+    }
+}

build.xml

@@ -2,164 +2,44 @@
 <project name="DMDirc Plugins" default="default" basedir=".">
     <description>Builds, packages and tests DMDirc plugins.</description>
 
-    <property name="plugins.src" location="src"/>
-    <property name="plugins.build" location="build"/>
-    <property name="plugins.build.classes" location="${plugins.build}/classes"/>
-    <property name="plugins.build.metadata" location="${plugins.build}/metadata"/>
-    <property name="plugins.dist" location="dist"/>
-    <property name="plugins.lib" location="lib"/>
-    <property name="plugins.source.level" value="1.7"/>
-    <property name="plugins.target.level" value="1.7"/>
-
-    <import file="build-ivy.xml" />
-    <import file="build-tests.xml"/>
-
-    <condition property="plugins.need.antlib">
-       <not>
-           <typefound name="foreach"/>
-       </not>
-    </condition>
-
-    <target name="-init-taskdefs" depends="init-dependencies,-init-paths,-init-antlib,-init-git-describe">
-    </target>
-
-    <target name="-init-antlib" if="plugins.need.antlib">
-        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="plugins.classpath"/>
-    </target>
-
-    <target name="-init-git-describe">
-        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="plugins.classpath"/>
-    </target>
-
-    <target name="-init-paths">
-      <path id="plugins.classpath">
-         <pathelement path="${plugins.dmdirc.build.dir}"/>
-         <fileset dir="${plugins.lib}" includes="**/*.jar"/>
-      </path>
-
-      <condition property="plugins.dmdirc.exists">
-         <available classname="com.dmdirc.Main" classpathref="plugins.classpath"/>
-      </condition>
-    </target>
-
-    <target name="-check-dmdirc-jar" unless="plugins.dmdirc.exists">
-       <fail>DMDirc class files not found. Please put DMDirc on the classpath or specify the 'plugins.dmdirc.build.dir' property.</fail>
-    </target>
-
-    <target name="-init-compile" depends="init-dependencies,-init-paths,-check-dmdirc-jar">
-       <mkdir dir="${plugins.build}"/>
-       <mkdir dir="${plugins.build.classes}"/>
-       <mkdir dir="${plugins.build.metadata}"/>
-    </target>
-
-    <target name="compile" depends="-init-compile">
-       <javac srcdir="${plugins.src}" destdir="${plugins.build.classes}"
-              classpathref="plugins.classpath" includeantruntime="false"
-              debug="true" deprecation="true"
-              source="${plugins.source.level}"
-              target="${plugins.target.level}">
-           <compilerarg value="-Xlint:all"/>
-           <compilerarg value="-Xmaxwarns"/>
-           <compilerarg value="1000"/>
-           <compilerarg value="-Xmaxerrs"/>
-           <compilerarg value="1000"/>
-       </javac>
-
-       <copy todir="${plugins.build.classes}">
-          <fileset dir="${plugins.src}">
-             <exclude name="**/*.java"/>
-             <exclude name="**/plugin.config"/>
-          </fileset>
-       </copy>
+    <!-- Resolve the relative directory -->
+    <property name="dmdircOutput" location="${plugins.dmdirc.build.dir}"/>
+
+    <target name="init-dependencies"/>
+
+    <target name="compile">
+        <exec executable="gradle" dir=".">
+            <arg value="-PdmdircOutput=${dmdircOutput}"/>
+            <arg value="--parallel"/>
+            <arg value="compile"/>
+        </exec>
+    </target>
+
+    <target name="jar">
+        <exec executable="gradle" dir=".">
+            <arg value="-PdmdircOutput=${dmdircOutput}"/>
+            <arg value="--parallel"/>
+            <arg value="jar"/>
+        </exec>
+
+        <mkdir dir="dist"/>
+        <copy todir="dist" flatten="true">
+            <fileset dir=".">
+                <include name="*/build/libs/*.jar"/>
+            </fileset>
+        </copy>
     </target>
 
-    <target name="jar" depends="-package,-add-libs"/>
-
-    <target name="-package" depends="-init-taskdefs,compile">
-        <for param="configfile">
-            <fileset dir="${plugins.src}" includes="**/plugin.config"/>
-            <sequential>
-                <local name="plugin.src.dir"/>
-                <local name="plugin.build.dir"/>
-                <local name="plugin.name"/>
-                <local name="plugin.jar"/>
-                <local name="plugin.version"/>
-
-                <dirname file="@{configfile}" property="plugin.src.dir"/>
-                <basename file="${plugin.src.dir}" property="plugin.name"/>
-                <property name="plugin.jar" value="${plugins.dist}/${plugin.name}.jar"/>
-
-                <if>
-                    <not>
-                        <uptodate targetfile="${plugin.jar}">
-                            <srcfiles dir="${plugin.src.dir}" includes="*"/>
-                        </uptodate>
-                    </not>
-                    <then>
-                        <propertyregex property="plugin.build.dir" input="${plugin.src.dir}" regexp="\Q${plugins.src}\E/?(.*)" replace="\1"/>
-
-                        <copy todir="${plugins.build.metadata}/${plugin.name}/META-INF">
-                            <fileset file="@{configfile}"/>
-                            <fileset dir="${plugin.src.dir}" includes="identities/** licences/**"/>
-                        </copy>
-
-                        <git-describe dir=".git" property="plugin.version" subdir="${plugin.src.dir}" />
-
-                        <echo file="${plugins.build.metadata}/${plugin.name}/META-INF/plugin.config" append="true">
-version:
-  number=${plugin.version}
-</echo>
-
-                        <jar destfile="${plugin.jar}">
-                            <fileset dir="${plugins.build.classes}" includes="${plugin.build.dir}/**"/>
-                            <fileset dir="${plugins.build.metadata}/${plugin.name}" includes="META-INF/**"/>
-                        </jar>
-
-                        <echo>Built ${plugin.name} plugin version ${plugin.version}</echo>
-                    </then>
-                </if>
-            </sequential>
-        </for>
+    <target name="clean">
+        <exec executable="gradle" dir=".">
+            <arg value="-PdmdircOutput=${dmdircOutput}"/>
+            <arg value="--parallel"/>
+            <arg value="clean"/>
+        </exec>
     </target>
 
-    <target name="-add-libs">
-        <jar destfile="${plugins.dist}/ui_swing.jar" update="true">
-            <zipfileset src="${plugins.lib}/main/miglayout-swing.jar" includes="net/miginfocom/swing/**"/>
-            <zipfileset src="${plugins.lib}/main/miglayout-core.jar" includes="net/miginfocom/layout/**"/>
-            <zipfileset src="${plugins.lib}/main/menuscroller.jar" includes="darrylbu/util/**"/>
-            <zipfileset src="${plugins.lib}/main/jxlayer.jar" includes="org/jdesktop/jxlayer/**"/>
-        </jar>
-
-        <jar destfile="${plugins.dist}/parser_irc.jar" update="true">
-            <!-- TODO: this could also be a jar in the lib dir -->
-            <fileset dir="${plugins.dmdirc.build.dir}">
-                <include name="com/dmdirc/parser/irc/**/*.class"/>
-            </fileset>
-        </jar>
-
-        <jar destfile="${plugins.dist}/parser_xmpp.jar" update="true">
-            <zipfileset src="${plugins.lib}/main/smack.jar" includes="org/**"/>
-            <zipfileset src="${plugins.lib}/main/smackx.jar" includes="org/** com/**"/>
-        </jar>
+    <target name="with.clover"/>
 
-        <jar destfile="${plugins.dist}/windowflashing.jar" update="true">
-            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/**"/>
-            <zipfileset src="${plugins.lib}/main/platform.jar" includes="com/**"/>
-        </jar>
+    <target name="compile-for-tests" depends="compile"/>
 
-        <jar destfile="${plugins.dist}/sessionlock.jar" update="true">
-            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/*"/>
-            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/ptr/*"/>
-            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/win32/**"/>
-            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/win32-amd64/**"/>
-            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/win32-x86/**"/>
-            <zipfileset src="${plugins.lib}/main/platform.jar" includes="com/sun/jna/platform/win32/**"/>
-            <zipfileset src="${plugins.lib}/main/locksupport.jar" includes="com/greboid/**"/>
-        </jar>
-    </target>
-
-    <target name="clean">
-       <delete dir="${plugins.build}"/>
-       <delete dir="${plugins.dist}"/>
-    </target>
 </project>

contactlist/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+  compile project(':ui_swing')
+}

dcc/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+  compile project(':ui_swing')
+}