Convert utils to standalone project

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

.gitignore

@@ -1,3 +1,10 @@
-/build
+# DMDirc-utils .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,46 @@
+<?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>
+        <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,20 @@
+<?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="git.version" />
+        <manifest file="${manifest.file}">
+            <attribute name="Version" value="${git.version}" />
+        </manifest>
+    </target>
+
+</project>

build.xml

@@ -1,91 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="DMDirc Util" default="default" basedir=".">
-    <description>Builds, packages and tests DMDirc utility classes.</description>
+<project name="DMDirc-Utils" default="default" basedir=".">
+    <description>Builds, tests, and runs the project.</description>
 
-    <property name="util.src" location="src"/>
-    <property name="util.test" location="test"/>
-    <property name="util.build" location="build"/>
-    <property name="util.build.main" location="${util.build}/classes"/>
-    <property name="util.build.test" location="${util.build}/test"/>
-    <property name="util.reports" location="reports"/>
-    <property name="util.lib" location="lib"/>
-    <property name="util.dist" location="dist"/>
+    <import file="nbproject/build-impl.xml"/>
+    <import file="build-ivy.xml"/>
+    <import file="build-versioning.xml"/>
 
-    <path id="util.classpath.test">
-        <pathelement path="${util.build.main}"/>
-        <fileset dir="${util.lib}" includes="*.jar"/>
-    </path>
-
-    <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="util.classpath.test"/>
-
-    <target name="-init-compile">
-       <mkdir dir="${util.build.main}"/>
-    </target>
-
-    <target name="-init-compile-tests">
-       <mkdir dir="${util.build.test}"/>
-    </target>
-
-    <target name="-init-jar">
-       <mkdir dir="${util.dist}"/>
-    </target>
-
-    <target name="-init-test">
-       <mkdir dir="${util.reports}"/>
-    </target>
-
-    <target name="-retrieve-versions">
-       <git-describe dir=".git" property="util.version.main" subdir="${util.src}" />
+    <target name="-pre-init" depends="-init-dependencies"/>
+    <target name="-post-compile" depends="-add-version"/>
+    <target name="-post-jar">
+        <delete file="${manifest.file}"/>
     </target>
-
-    <target name="compile" depends="-init-compile">
-       <javac srcdir="${util.src}" destdir="${util.build.main}"
-              includeantruntime="false"/>
-    </target>
-
-    <target name="compile-tests" depends="compile,-init-compile-tests">
-       <javac srcdir="${util.test}" destdir="${util.build.test}"
-              includeantruntime="false" classpathref="util.classpath.test">
-       </javac>
-
-       <copy todir="${util.build.test}">
-          <fileset dir="${util.test}">
-             <exclude name="**/*.java"/>
-          </fileset>
-       </copy>
-    </target>
-
-    <target name="test" depends="compile-tests,-init-test">
-       <junit printsummary="true">
-          <classpath>
-             <path refid="util.classpath.test"/>
-             <pathelement location="${util.build.test}"/>
-          </classpath>
-          <batchtest todir="${util.reports}">
-             <fileset dir="${util.build.test}" includes="**/*Test.class"/>
-             <formatter type="xml"/>
-          </batchtest>
-       </junit>
-
-       <junitreport todir="${util.reports}">
-          <fileset dir="${util.reports}" includes="TEST-*.xml"/>
-       </junitreport>
+    <target name="-post-test-run">
+        <delete file="${manifest.file}"/>
     </target>
 
-    <target name="jar" depends="compile,-init-jar,-retrieve-versions">
-       <jar destfile="${util.dist}/util.jar" basedir="${util.build.main}">
-          <manifest>
-             <section name="com.dmdirc.util">
-                <attribute name="Implementation-Title" value="Utility classes"/>
-                <attribute name="Implementation-Version" value="${util.version.main}"/>
-             </section>
-          </manifest>
-       </jar>
-    </target>
-
-    <target name="clean">
-       <delete dir="${util.build}"/>
-       <delete dir="${util.dist}"/>
-       <delete dir="${util.reports}"/>
-    </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,74 @@
+#Sat, 19 May 2012 23:51:24 +0100
+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
+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
+application.title=DMDirc-Utils
+application.vendor=DMDirc
+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-Utils.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+includes=**
+jar.compress=false
+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=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=true
+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-Utils</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>