Update build for new plugins layout

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

.idea/plugins.iml

@@ -3,12 +3,115 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/modules/plugins">
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/activewindow/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/audio/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/calc/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/calc/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/conditional_execute/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/conditional_execute/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/contactlist/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/contactlist/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcc/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcc/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcop/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcop/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/debug/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/debug/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dns/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dns/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/exec/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/identd/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/identd/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/lagdisplay/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/lagdisplay/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/logging/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/logging/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dbus/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dcop/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_linux_title/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_mplayer/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_vlc/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_vlc/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_windows/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/nickcolours/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/nma/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/notifications/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/nowplaying/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/osd/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/osd/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/osx_integration/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/parser_irc/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/parser_xmpp/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/parserdebug/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/redirect/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/redirect/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/scriptplugin/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/serverlistdialog/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/serverlists/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/sessionlock/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/systray/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/tabcompletion_bash/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/tabcompletion_mirc/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/time/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/ui_swing/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/ui_swing/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/windowflashing/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/windowstatus/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/contactlist/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/dcc/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_vlc/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_windows/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/nowplaying/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/osd/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/ui_swing/res" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/activewindow/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/audio/build" />
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/calc/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/conditional_execute/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dcc/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dcop/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/debug/build" />
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/dns/build" />
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/etc" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/exec/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/freedesktop_notifications/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/identd/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/lagdisplay/build" />
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/lib" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/logging/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dbus/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_dcop/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_linux_title/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_mplayer/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_vlc/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/mediasource_windows/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/nickcolours/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/nma/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/notifications/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/nowplaying/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/osd/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/osx_integration/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/parser_irc/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/parser_xmpp/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/parserdebug/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/redirect/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/scriptplugin/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/serverlistdialog/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/serverlists/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/sessionlock/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/systray/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/tabcompletion_bash/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/tabcompletion_mirc/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/time/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/ui_swing/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/windowflashing/build" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/plugins/windowstatus/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

build-reports.xml

@@ -31,7 +31,6 @@
     <target name="checkstyle-all" depends="-init-checkstyle">
         <checkstyle config="etc/checkstyle/dmdirc.xml" failureProperty="checkstyle.failure" failOnViolation="false">
             <fileset dir="src/" includes="**/*.java" excludes="net/miginfocom/**"/>
-            <fileset dir="modules/plugins/src/" includes="**/*.java"/>
             <fileset dir="modules/parser/src/" includes="**/*.java"/>
             <fileset dir="modules/util/src/" includes="**/*.java"/>
             <formatter type="xml" tofile="reports/checkstyle.xml"/>
@@ -48,7 +47,6 @@
             <ruleset>etc/pmd/full.xml</ruleset>
             <formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
             <fileset dir="src/" includes="com/dmdirc/**/*.java" />
-            <fileset dir="modules/plugins/src/" includes="com/dmdirc/**/*.java"/>
             <fileset dir="modules/util/src/" includes="com/dmdirc/**/*.java"/>
             <fileset dir="modules/parser/src/" includes="com/dmdirc/**/*.java"/>
         </pmd>
@@ -60,7 +58,6 @@
             <ruleset>etc/pmd/minimal.xml</ruleset>
             <formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
             <fileset dir="src/" includes="com/dmdirc/**/*.java" />
-            <fileset dir="modules/plugins/src/" includes="com/dmdirc/**/*.java"/>
             <fileset dir="modules/util/src/" includes="com/dmdirc/**/*.java"/>
             <fileset dir="modules/parser/src/" includes="com/dmdirc/**/*.java"/>
         </pmd>

nbproject/build-impl.xml

@@ -27,7 +27,6 @@ is divided into following sections:
                 ======================
             -->
     <path id="all.libs">
-        <fileset dir="modules/plugins/lib/main" includes="*.jar"/>
         <fileset dir="lib" includes="*.jar"/>
     </path>
 
@@ -68,7 +67,6 @@ is divided into following sections:
             <and>
                 <available file="${main.test.dir}"/>
                 <available file="${parser.test.dir}"/>
-                <available file="${plugins.test.dir}"/>
                 <available file="${util.test.dir}"/>
             </and>
         </condition>
@@ -76,7 +74,6 @@ is divided into following sections:
             <and>
                 <available file="${main.src.dir}"/>
                 <available file="${parser.src.dir}"/>
-                <available file="${plugins.src.dir}"/>
                 <available file="${util.src.dir}"/>
             </and>
         </condition>
@@ -130,8 +127,6 @@ is divided into following sections:
         <fail unless="main.test.dir">Must set main.test.dir</fail>
         <fail unless="parser.src.dir">Must set parser.src.dir</fail>
         <fail unless="parser.test.dir">Must set parser.test.dir</fail>
-        <fail unless="plugins.src.dir">Must set plugins.src.dir</fail>
-        <fail unless="plugins.test.dir">Must set plugins.test.dir</fail>
         <fail unless="util.src.dir">Must set util.src.dir</fail>
         <fail unless="util.test.dir">Must set util.test.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -221,9 +216,6 @@ is divided into following sections:
                         <fileset dir="${parser.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
-                        <fileset dir="${plugins.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
                         <fileset dir="${util.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -367,7 +359,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${main.src.dir}:${parser.src.dir}:${plugins.src.dir}:${util.src.dir}"/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${main.src.dir}:${parser.src.dir}:${util.src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -497,9 +489,6 @@ is divided into following sections:
             <fileset dir="${parser.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${plugins.src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
             <fileset dir="${util.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -518,7 +507,7 @@ is divided into following sections:
 
     <target depends="init,-doccheck-check" name="-doccheck-build" if="doccheck.run">
         <mkdir dir="${doccheck.dir}"/>
-        <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${main.src.dir}:${parser.src.dir}:${plugins.src.dir}:${util.src.dir}" useexternalfile="true" version="${javadoc.version}">
+        <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${main.src.dir}:${parser.src.dir}:${util.src.dir}" useexternalfile="true" version="${javadoc.version}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
@@ -554,14 +543,13 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}:${util.test.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${util.test.dir}"/>
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}:${util.test.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${util.test.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${plugins.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${util.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
@@ -577,11 +565,10 @@ is divided into following sections:
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}:${util.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}:${util.test.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${util.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${util.test.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${plugins.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${util.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>