Merge pull request #60 from csmith/master

Delete all the ant stuff.

build-ivy.xml

@@ -1,50 +0,0 @@
-<?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:resolve file="ivy.common.xml" />
-        <ivy:retrieve symlink="true" pattern="lib/[artifact]-[revision].[ext]" />
-        <ivy:resolve file="ivy.irc.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-publish.xml

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="DMDirc-Publish" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>Publish artifacts for DMDirc</description>
-
-    <target name="-init-version">
-        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="lib.classpath"/>
-    </target>
-
-    <target name="-get-git-version" depends="-init-version">
-        <git-describe dir="${git.dir}" property="parsers.version.main" subdir="${basedir}/${src.dir}/com/dmdirc/parser/common/;${basedir}/${src.dir}/com/dmdirc/parser/interfaces/" />
-        <git-describe dir="${git.dir}" property="parsers.version.irc" subdir="${basedir}/${src.dir}/com/dmdirc/parser/irc/" />
-    </target>
-
-    <target name="publish-release" depends="-get-git-version, -init-ivy">
-        <tstamp>
-            <format property="timestamp" pattern="yyyyddMM" />
-        </tstamp>
-        <ivy:resolve file="ivy.common.xml"/>
-        <ivy:deliver deliverpattern="${build.dir}/ivy.common.xml" pubrevision="${parsers.version.main}" />
-        <ivy:makepom ivyfile="${build.dir}/ivy.common.xml" pomfile="dist/parser.common.pom">
-            <mapping conf="default" scope="compile"/>
-        </ivy:makepom>
-        <ivy:retrieve/>
-        <ivy:publish
-            pubrevision="${parsers.version.main}"
-            status="release"
-            overwrite="true"
-            publishivy="false"
-            artifactspattern="dist/parser.common.[ext]"
-            resolver="upload-release"/>
-
-        <ivy:resolve file="ivy.irc.xml"/>
-        <ivy:deliver deliverpattern="${build.dir}/ivy.irc.xml" pubrevision="${parsers.version.irc}" />
-        <ivy:makepom ivyfile="${build.dir}/ivy.irc.xml" pomfile="dist/parser.irc.pom">
-            <mapping conf="default" scope="compile"/>
-            <dependency group="com.dmdirc.parser" artifact="common" version="${parsers.version.main}"/>
-        </ivy:makepom>
-        <ivy:retrieve/>
-        <ivy:publish
-            pubrevision="${parsers.version.irc}"
-            status="release"
-            overwrite="true"
-            publishivy="false"
-            artifactspattern="dist/parser.irc.[ext]"
-            resolver="upload-release"/>
-    </target>
-
-    <target name="publish-nightlies" depends="-get-git-version, -init-ivy">
-        <tstamp>
-            <format property="timestamp" pattern="yyyyddMM" />
-        </tstamp>
-        <ivy:resolve file="ivy.common.xml"/>
-        <ivy:deliver deliverpattern="${build.dir}/ivy.common.xml" pubrevision="Nightly-${timestamp}_${parsers.version.main}" />
-        <ivy:makepom ivyfile="${build.dir}/ivy.common.xml" pomfile="dist/parser.common.pom">
-            <mapping conf="default" scope="compile"/>
-        </ivy:makepom>
-        <ivy:retrieve/>
-        <ivy:publish
-            pubrevision="Nightly-${timestamp}_${parsers.version.main}"
-            status="release"
-            overwrite="true"
-            publishivy="false"
-            artifactspattern="dist/parser.common.[ext]"
-            resolver="upload-nightlies"/>
-
-        <ivy:resolve file="ivy.irc.xml"/>
-        <ivy:deliver deliverpattern="${build.dir}/ivy.irc.xml" pubrevision="Nightly-${timestamp}_${parsers.version.irc}" />
-        <ivy:makepom ivyfile="${build.dir}/ivy.irc.xml" pomfile="dist/parser.irc.pom">
-            <mapping conf="default" scope="compile"/>
-            <dependency group="com.dmdirc.parser" artifact="common" version="Nightly-${timestamp}_${parsers.version.main}"/>
-        </ivy:makepom>
-        <ivy:retrieve/>
-        <ivy:publish
-            pubrevision="Nightly-${timestamp}_${parsers.version.irc}"
-            status="release"
-            overwrite="true"
-            publishivy="false"
-            artifactspattern="dist/parser.irc.[ext]"
-            resolver="upload-nightlies"/>
-    </target>
-
-
-    <target name="publish-snapshot" depends="-get-git-version, -init-ivy">
-        <tstamp>
-            <format property="timestamp" pattern="yyyyddMM" />
-        </tstamp>
-        <ivy:resolve file="ivy.common.xml"/>
-        <ivy:deliver deliverpattern="${build.dir}/ivy.common.xml" pubrevision="${parsers.version.main}-SNAPSHOT" />
-        <ivy:makepom ivyfile="${build.dir}/ivy.common.xml" pomfile="dist/parser.common.pom">
-            <mapping conf="default" scope="compile"/>
-        </ivy:makepom>
-        <ivy:retrieve/>
-        <ivy:publish
-            pubrevision="${parsers.version.main}-SNAPSHOT"
-            status="release"
-            overwrite="true"
-            publishivy="false"
-            artifactspattern="dist/parser.common.[ext]"
-            resolver="upload-snapshot"/>
-
-        <ivy:resolve file="ivy.irc.xml"/>
-        <ivy:deliver deliverpattern="${build.dir}/ivy.irc.xml" pubrevision="${parsers.version.irc}-SNAPSHOT" />
-        <ivy:makepom ivyfile="${build.dir}/ivy.irc.xml" pomfile="dist/parser.irc.pom">
-            <mapping conf="default" scope="compile"/>
-            <dependency group="com.dmdirc.parser" artifact="common" version="${parsers.version.main}-SNAPSHOT"/>
-        </ivy:makepom>
-        <ivy:retrieve/>
-        <ivy:publish
-            pubrevision="${parsers.version.irc}-SNAPSHOT"
-            status="release"
-            overwrite="true"
-            publishivy="false"
-            artifactspattern="dist/parser.irc.[ext]"
-            resolver="upload-snapshot"/>
-    </target>
-
-    <target name="init-teamcity" depends="-init-ivy">
-        <echo>Downloading private files, if this fails please pass username and</echo>
-        <echo>password to ant using -Dusername=... -Dpassword=...</echo>
-
-        <get src="http://www.dmdirc.com/private/nexus-teamcity.properties" dest="etc/nexus-teamcity.properties" username="${username}" password="${password}"/>
-        <loadproperties srcFile="etc/nexus-teamcity.properties"/>
-
-        <ivy:settings>
-          <credentials host="nexus.dmdirc.com" realm="Sonatype Nexus Repository Manager" username="${nexus.user}" passwd="${nexus.pass}"/>
-        </ivy:settings>
-    </target>
-</project>

build-versioning.xml

@@ -1,18 +0,0 @@
-<?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.dir}" 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.dir}" property="parsers.version.main" subdir="${basedir}/${src.dir}/com/dmdirc/parser/common/;${basedir}/${src.dir}/com/dmdirc/parser/interfaces/" />
-       <git-describe dir="${git.dir}" property="parsers.version.irc" subdir="${basedir}/${src.dir}/com/dmdirc/parser/irc/" />
-    </target>
-
-</project>

build.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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"/>
-    <import file="build-publish.xml"/>
-
-    <property name="git.dir" value=".git"/>
-
-    <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"/>
-                <attribute name="Implementation-Version" value="${parsers.version.main}"/>
-             </section>
-          </manifest>
-       </jar>
-       <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"/>
-                <attribute name="Implementation-Version" value="${parsers.version.irc}"/>
-             </section>
-          </manifest>
-       </jar>
-    </target>
-    <target name="-post-jar">
-        <delete file="${manifest.file}"/>
-    </target>
-    <target name="-post-test-run">
-        <delete file="${manifest.file}"/>
-    </target>
-</project>

etc/ivy/ivysettings.xml

@@ -1,12 +0,0 @@
-<ivysettings>
-    <settings defaultResolver="default"/>
-    <property name="${nexus.user}" value="invalid"  override="false"/>
-    <property name="${nexus.pass}" value="invalid"  override="false"/>
-    <credentials host="nexus.dmdirc.com" realm="Sonatype Nexus Repository Manager" username="${nexus.user}" passwd="${nexus.pass}"/>
-    <resolvers>
-        <ibiblio name="default" root="http://nexus.dmdirc.com/nexus/content/groups/public" m2compatible="true"/>
-        <ibiblio name="upload-snapshot" root="http://nexus.dmdirc.com/nexus/content/repositories/snapshots" m2compatible="true" />
-        <ibiblio name="upload-nightlies" root="http://nexus.dmdirc.com/nexus/content/repositories/nightlies" m2compatible="true" />
-        <ibiblio name="upload-release" root="http://nexus.dmdirc.com/nexus/content/repositories/releases" m2compatible="true" />
-    </resolvers>
-</ivysettings>

ivy.common.xml

@@ -1,23 +0,0 @@
-<ivy-module version="2.0">
-    <info organisation="com.dmdirc.parser" module="common"/>
-
-    <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>
-
-    <publications>
-        <artifact type="jar" ext="jar" conf="default"/>
-        <artifact type="pom" ext="pom" conf="default"/>
-    </publications>
-
-    <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>

ivy.irc.xml

@@ -1,23 +0,0 @@
-<ivy-module version="2.0">
-    <info organisation="com.dmdirc.parser" module="irc"/>
-
-    <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>
-
-    <publications>
-        <artifact type="jar" ext="jar" conf="default"/>
-        <artifact type="pom" ext="pom" conf="default"/>
-    </publications>
-
-    <dependencies defaultconfmapping="*->default">
-        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.3" 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>