Convert parser to standalone project

Change-Id: Id91f50347ce9a63ebbfa0be1792c0feba7348d87
Reviewed-on: http://gerrit.dmdirc.com/2503
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

.gitignore

@@ -1,3 +1,10 @@
-/build
+#.gitignore file
+
+/*.key
+/build/
 /dist
-/reports
+/lib/*.jar
+build-before-profiler.xml
+/nbproject/profiler-build-impl.xml
+/nbproject/genfiles.properties
+/nbproject/private

build-ivy.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-ivy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+    <description>Ivy utilities for DMDirc</description>
+
+    <property name="ivy.install.version" value="2.2.0"/>
+    <property name="ivy.cache.ttl.default" value="7d"/>
+
+    <target name="-init-lib-directory">
+        <mkdir dir="lib"/>
+    </target>
+
+    <target name="-init-ivy" depends="-init-lib-directory">
+        <path id="lib.classpath">
+           <fileset dir="lib" includes="*.jar"/>
+        </path>
+
+        <available classname="org.apache.ivy.ant.IvyConfigure"
+              property="ivy.available" classpathref="lib.classpath" />
+    </target>
+
+    <target name="-download-ivy" depends="-init-ivy" unless="ivy.available">
+        <echo message="Retrieving Ivy"/>
+        <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+             dest="lib/ivy-${ivy.install.version}.jar"/>
+    </target>
+
+    <target name="-init-dependencies" depends="-download-ivy" unless="ivy.done">
+        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="lib.classpath"/>
+        <ivy:settings file="etc/ivy/ivysettings.xml"/>
+        <ivy:retrieve symlink="true" pattern="lib/[artifact]-[revision].[ext]" />
+        <pathconvert property="lib.classpath.computed" dirsep="/" pathsep=":">
+            <path>
+                <fileset dir="lib" includes="*.jar"/>
+            </path>
+            <map from="${basedir}${file.separator}" to=""/>
+        </pathconvert>
+        <touch mkdirs="true" file="nbproject/private/private.properties"/>
+        <propertyfile file="nbproject/private/private.properties">
+            <entry operation="=" key="lib.classpath" value="${lib.classpath.computed}"/>
+        </propertyfile>
+        <property name="ivy.done" value="true"/>
+    </target>
+
+    <target name="-post-clean">
+        <delete dir="lib"/>
+    </target>
+</project>

build-versioning.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-versioning" default="default" basedir=".">
+    <description>Adds automatic versioning information to DMDirc</description>
+
+    <available file=".git" property="is.git"/>
+
+    <target name="-init-version">
+        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="lib.classpath"/>
+    </target>
+
+    <target name="-add-version" depends="-init-version, -add-git-version" />
+
+    <target name="-add-git-version" if="is.git">
+       <git-describe dir=".git" property="parsers.version.main" subdir="${src.dir}/com/dmdirc/parser/common/;${src.dir}/com/dmdirc/parser/interfaces/" />
+       <git-describe dir=".git" property="parsers.version.irc" subdir="${src.dir}/com/dmdirc/parser/irc/" />
+    </target>
+
+</project>

build.xml

@@ -1,80 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="DMDirc Parsers" default="default" basedir=".">
-    <description>Builds, packages and tests DMDirc parsers.</description>
-
-    <property name="parsers.src" location="src"/>
-    <property name="parsers.test" location="test"/>
-    <property name="parsers.build" location="build"/>
-    <property name="parsers.build.main" location="${parsers.build}/main"/>
-    <property name="parsers.build.irc" location="${parsers.build}/irc"/>
-    <property name="parsers.build.test" location="${parsers.build}/test"/>
-    <property name="parsers.reports" location="reports"/>
-    <property name="parsers.lib" location="lib"/>
-    <property name="parsers.dist" location="dist"/>
-
-    <path id="parsers.classpath.test">
-        <pathelement path="${parsers.build.main}"/>
-        <pathelement path="${parsers.build.irc}"/>
-        <fileset dir="${parsers.lib}" includes="*.jar"/>
-    </path>
-
-    <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="parsers.classpath.test"/>
-
-    <target name="-init-compile">
-       <mkdir dir="${parsers.build.main}"/>
-       <mkdir dir="${parsers.build.irc}"/>
-    </target>
-
-    <target name="-init-compile-tests">
-       <mkdir dir="${parsers.build.test}"/>
-    </target>
-
-    <target name="-init-jar">
-       <mkdir dir="${parsers.dist}"/>
-    </target>
-
-    <target name="-init-test">
-       <mkdir dir="${parsers.reports}"/>
-    </target>
-
-    <target name="-retrieve-versions">
-       <git-describe dir=".git" property="parsers.version.main" subdir="${parsers.src}/com/dmdirc/parser/common/;${parsers.src}/com/dmdirc/parser/interfaces/" />
-       <git-describe dir=".git" property="parsers.version.irc" subdir="${parsers.src}/com/dmdirc/parser/irc/" />
-    </target>
-
-    <target name="compile" depends="-init-compile">
-       <javac srcdir="${parsers.src}" destdir="${parsers.build.main}"
-              includeantruntime="false" excludes="com/dmdirc/parser/irc/**"/>
-       <javac srcdir="${parsers.src}" destdir="${parsers.build.irc}"
-              includeantruntime="false" includes="com/dmdirc/parser/irc/**"
-              classpath="${parsers.build.main}"/>
-    </target>
-
-    <target name="compile-tests" depends="compile,-init-compile-tests">
-       <javac srcdir="${parsers.test}" destdir="${parsers.build.test}"
-              includeantruntime="false" classpathref="parsers.classpath.test">
-       </javac>
-    </target>
-
-    <target name="test" depends="compile-tests,-init-test">
-       <junit printsummary="true">
-          <classpath>
-             <path refid="parsers.classpath.test"/>
-             <pathelement location="${parsers.build.test}"/>
-          </classpath>
-          <batchtest todir="${parsers.reports}">
-             <fileset dir="${parsers.build.test}" includes="**/*Test.class"/>
-             <formatter type="xml"/>
-          </batchtest>
-       </junit>
-
-       <junitreport todir="${parsers.reports}">
-          <fileset dir="${parsers.reports}" includes="TEST-*.xml"/>
-       </junitreport>
-    </target>
-
-    <target name="jar" depends="compile,-init-jar,-retrieve-versions">
-       <jar destfile="${parsers.dist}/parser.common.jar" basedir="${parsers.build.main}">
+<project name="DMDirc-Parser" default="default" basedir=".">
+    <description>Builds, tests, and runs the project DMDirc-Parser.</description>
+
+    <import file="nbproject/build-impl.xml"/>
+    <import file="build-ivy.xml"/>
+    <import file="build-versioning.xml"/>
+
+    <target name="-pre-init" depends="-init-dependencies"/>
+    <target name="-post-compile" depends="-add-version"/>
+    <target depends="init,compile,-pre-jar,-do-jar, -post-jar" description="Build JAR." name="jar"/>
+    <target name="-do-jar">
+        <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.dir}/parser.common.jar"
+                basedir="${build.classes.dir}" excludes="com/dmdirc/parser/irc/**">
           <manifest>
              <section name="com.dmdirc.parser">
                 <attribute name="Implementation-Title" value="Common parser files"/>
@@ -82,7 +19,8 @@
              </section>
           </manifest>
        </jar>
-       <jar destfile="${parsers.dist}/parser.irc.jar" basedir="${parsers.build.irc}">
+       <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.dir}/parser.irc.jar"
+            basedir="${build.classes.dir}" includes="com/dmdirc/parser/irc/**">
           <manifest>
              <section name="com.dmdirc.parser.irc">
                 <attribute name="Implementation-Title" value="IRC Parser"/>
@@ -91,10 +29,10 @@
           </manifest>
        </jar>
     </target>
-
-    <target name="clean">
-       <delete dir="${parsers.build}"/>
-       <delete dir="${parsers.dist}"/>
-       <delete dir="${parsers.reports}"/>
+    <target name="-post-jar">
+        <delete file="${manifest.file}"/>
+    </target>
+    <target name="-post-test-run">
+        <delete file="${manifest.file}"/>
     </target>
 </project>

etc/ivy/ivysettings.xml

@@ -0,0 +1,17 @@
+<ivysettings>
+    <settings defaultResolver="default"/>
+    <resolvers>
+        <ibiblio name="default" m2compatible="true"/>
+
+        <ibiblio name="jgit" root="http://download.eclipse.org/jgit/maven" m2compatible="true"/>
+
+        <url name="jgit-describe">
+            <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
+            <artifact pattern="http://shanemcc.github.com/jgit-describe/releases/jgit-describe-[revision].jar"/>
+        </url>
+    </resolvers>
+    <modules>
+        <module organisation="com.github.shanemcc" name="jgit-describe" resolver="jgit-describe"/>
+        <module organisation="org.eclipse.jgit" name="*" resolver="jgit"/>
+    </modules>
+</ivysettings>

etc/ivy/jgit-describe/ivy.xml

@@ -0,0 +1,6 @@
+<ivy-module version="2.0">
+    <info organisation="com.github.shanemcc" module="jgit-describe"/>
+    <dependencies>
+        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="latest.integration" conf="default" />
+    </dependencies>
+</ivy-module>

ivy.xml

@@ -0,0 +1,18 @@
+<ivy-module version="2.0">
+    <info organisation="com.dmdirc" module="utils"/>
+
+    <configurations>
+        <conf name="build" description="Everything needed to build"/>
+        <conf name="compile" description="Everything needed to compile"/>
+        <conf name="test" description="Everything needed to test"/>
+        <conf name="default" extends="build,compile,test"/>
+    </configurations>
+
+    <dependencies defaultconfmapping="*->default">
+        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.2" conf="build" />
+        <dependency org="junit" name="junit" rev="4.+" conf="test" />
+        <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test" />
+
+        <exclude org="ant" module="ant"/>
+    </dependencies>
+</ivy-module>

nbproject/project.properties

@@ -0,0 +1,96 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=DMDirc-Parser
+application.vendor=DMDirc
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.allowConvertToStarImport=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.countForUsingStaticStarImport=1
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=com.dmdirc;com.google;com.palantir;java;javax;lombok;net.miginfocom;org;*;static *
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateStaticImports=true
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/DMDirc-Parser.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+includes=**
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=false
+jar.index=${jnlp.enabled}
+javac.classpath=\
+    ${lib.classpath}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=true
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.6
+javac.target=1.6
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

nbproject/project.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>DMDirc-Parser</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>./lib/nblibraries.properties</definitions>
+        </libraries>
+    </configuration>
+</project>