Przeglądaj źródła

Remove all ant stuff.

Change-Id: Ic4afa11b8eaf3d9d1717c4b326db7a05caeddf27
Reviewed-on: http://gerrit.dmdirc.com/3912
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
changes/12/3912/2
Chris Smith 9 lat temu
rodzic
commit
4c937524ef
6 zmienionych plików z 0 dodań i 188 usunięć
  1. 0
    47
      build-ivy.xml
  2. 0
    65
      build-publish.xml
  3. 0
    20
      build-versioning.xml
  4. 0
    23
      build.xml
  5. 0
    10
      etc/ivy/ivysettings.xml
  6. 0
    23
      ivy.xml

+ 0
- 47
build-ivy.xml Wyświetl plik

@@ -1,47 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project name="DMDirc-ivy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
3
-    <description>Ivy utilities for DMDirc</description>
4
-
5
-    <property name="ivy.install.version" value="2.2.0"/>
6
-    <property name="ivy.cache.ttl.default" value="7d"/>
7
-
8
-    <target name="-init-lib-directory">
9
-        <mkdir dir="lib"/>
10
-    </target>
11
-
12
-    <target name="-init-ivy" depends="-init-lib-directory">
13
-        <path id="lib.classpath">
14
-           <fileset dir="lib" includes="*.jar"/>
15
-        </path>
16
-
17
-        <available classname="org.apache.ivy.ant.IvyConfigure"
18
-              property="ivy.available" classpathref="lib.classpath" />
19
-    </target>
20
-
21
-    <target name="-download-ivy" depends="-init-ivy" unless="ivy.available">
22
-        <echo message="Retrieving Ivy"/>
23
-        <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
24
-             dest="lib/ivy-${ivy.install.version}.jar"/>
25
-    </target>
26
-
27
-    <target name="-init-dependencies" depends="-download-ivy" unless="ivy.done">
28
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="lib.classpath"/>
29
-        <ivy:settings file="etc/ivy/ivysettings.xml"/>
30
-        <ivy:retrieve symlink="true" pattern="lib/[artifact]-[revision].[ext]" />
31
-        <pathconvert property="lib.classpath.computed" dirsep="/" pathsep=":">
32
-            <path>
33
-                <fileset dir="lib" includes="*.jar"/>
34
-            </path>
35
-            <map from="${basedir}${file.separator}" to=""/>
36
-        </pathconvert>
37
-        <touch mkdirs="true" file="nbproject/private/private.properties"/>
38
-        <propertyfile file="nbproject/private/private.properties">
39
-            <entry operation="=" key="lib.classpath" value="${lib.classpath.computed}"/>
40
-        </propertyfile>
41
-        <property name="ivy.done" value="true"/>
42
-    </target>
43
-
44
-    <target name="-post-clean">
45
-        <delete dir="lib"/>
46
-    </target>
47
-</project>

+ 0
- 65
build-publish.xml Wyświetl plik

@@ -1,65 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project name="DMDirc-Publish" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
3
-    <description>Publish artifacts for DMDirc</description>
4
-
5
-    <available file="${git.dir}" property="is.git" />
6
-
7
-    <target name="-init-version">
8
-        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="lib.classpath"/>
9
-    </target>
10
-
11
-    <target name="-get-git-version" depends="-init-version" if="is.git">
12
-        <property name="resolved.src.dir" location="${src.dir}"/>
13
-        <git-describe dir="${git.dir}" property="git.version" subdir="${basedir}/${src.dir}" />
14
-    </target>
15
-
16
-    <target name="-publish-snapshot" depends="-get-git-version">
17
-        <git-describe dir="${git.dir}" property="git.version" subdir="${main.src.dir}" />
18
-        <ivy:resolve file="ivy.xml"/>
19
-        <ivy:deliver deliverpattern="${build.dir}/ivy.xml" pubrevision="${git.version}-SNAPSHOT" />
20
-        <ivy:makepom ivyfile="${build.dir}/ivy.xml" pomfile="dist/utils.pom">
21
-            <mapping conf="default" scope="compile"/>
22
-        </ivy:makepom>
23
-        <ivy:retrieve/>
24
-        <ivy:publish
25
-            pubrevision="${git.version}-SNAPSHOT"
26
-            status="integration"
27
-            overwrite="true"
28
-            publishivy="false"
29
-            artifactspattern="dist/[artifact].[ext]"
30
-            resolver="upload-snapshot"/>
31
-    </target>
32
-    <target name="-publish-release" depends="-get-git-version">
33
-        <ivy:resolve file="ivy.xml"/>
34
-        <ivy:deliver deliverpattern="${build.dir}/ivy.xml" pubrevision="${git.version}" />
35
-        <ivy:makepom ivyfile="${build.dir}/ivy.xml" pomfile="dist/utils.pom">
36
-            <mapping conf="default" scope="compile"/>
37
-        </ivy:makepom>
38
-        <ivy:retrieve/>
39
-        <ivy:publish
40
-            pubrevision="${git.version}"
41
-            status="release"
42
-            overwrite="true"
43
-            publishivy="false"
44
-            artifactspattern="dist/[artifact].[ext]"
45
-            resolver="upload-release"/>
46
-    </target>
47
-    <target name="-publish-nightlies" depends="-get-git-version">
48
-        <tstamp>
49
-            <format property="timestamp" pattern="yyyyddMM" />
50
-        </tstamp>
51
-        <ivy:resolve file="ivy.xml"/>
52
-        <ivy:deliver deliverpattern="${build.dir}/ivy.xml" pubrevision="Nightly-${timestamp}_${git.version}" />
53
-        <ivy:makepom ivyfile="${build.dir}/ivy.xml" pomfile="dist/utils.pom">
54
-            <mapping conf="default" scope="compile"/>
55
-        </ivy:makepom>
56
-        <ivy:retrieve/>
57
-        <ivy:publish
58
-            pubrevision="Nightly-${timestamp}_${git.version}"
59
-            status="release"
60
-            overwrite="true"
61
-            publishivy="false"
62
-            artifactspattern="dist/[artifact].[ext]"
63
-            resolver="upload-nightlies"/>
64
-    </target>
65
-</project>

+ 0
- 20
build-versioning.xml Wyświetl plik

@@ -1,20 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project name="DMDirc-versioning" default="default" basedir=".">
3
-    <description>Adds automatic versioning information to DMDirc</description>
4
-
5
-    <available file="${git.dir}" property="is.git"/>
6
-
7
-    <target name="-init-version">
8
-        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="lib.classpath"/>
9
-    </target>
10
-
11
-    <target name="-add-version" depends="-init-version, -add-git-version" />
12
-
13
-    <target name="-add-git-version" if="is.git">
14
-        <git-describe dir="${git.dir}" property="git.version" />
15
-        <manifest file="${manifest.file}">
16
-            <attribute name="Version" value="${git.version}" />
17
-        </manifest>
18
-    </target>
19
-
20
-</project>

+ 0
- 23
build.xml Wyświetl plik

@@ -1,23 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project name="DMDirc-Utils" default="default" basedir=".">
3
-    <description>Builds, tests, and runs the project.</description>
4
-
5
-    <import file="nbproject/build-impl.xml"/>
6
-    <import file="build-ivy.xml"/>
7
-    <import file="build-versioning.xml"/>
8
-    <import file="build-publish.xml"/>
9
-    
10
-    <property name="git.dir" value=".git"/>
11
-
12
-    <target name="-pre-init" depends="-init-dependencies"/>
13
-    <target name="-post-compile" depends="-add-version"/>
14
-    <target name="-post-jar">
15
-        <delete file="${manifest.file}"/>
16
-    </target>
17
-    <target name="-post-test-run">
18
-        <delete file="${manifest.file}"/>
19
-    </target>
20
-    <target name="publish-nightlies" depends="clean, jar, -publish-nightlies" />
21
-    <target name="publish-release" depends="clean, jar, -publish-release" />
22
-
23
-</project>

+ 0
- 10
etc/ivy/ivysettings.xml Wyświetl plik

@@ -1,10 +0,0 @@
1
-<ivysettings>
2
-    <settings defaultResolver="default"/>
3
-    <credentials host="nexus.dmdirc.com" realm="Sonatype Nexus Repository Manager" username="${username}" passwd="${password}"/>
4
-    <resolvers>
5
-        <ibiblio name="default" root="http://nexus.dmdirc.com/nexus/content/groups/public" m2compatible="true"/>
6
-        <ibiblio name="upload-snapshot" root="http://nexus.dmdirc.com/nexus/content/repositories/snapshots" m2compatible="true" />
7
-        <ibiblio name="upload-nightlies" root="http://nexus.dmdirc.com/nexus/content/repositories/nightlies" m2compatible="true" />
8
-        <ibiblio name="upload-release" root="http://nexus.dmdirc.com/nexus/content/repositories/releases" m2compatible="true" />
9
-    </resolvers>
10
-</ivysettings>

+ 0
- 23
ivy.xml Wyświetl plik

@@ -1,23 +0,0 @@
1
-<ivy-module version="2.0">
2
-    <info organisation="com.dmdirc" module="utils"/>
3
-
4
-    <configurations>
5
-        <conf name="build" description="Everything needed to build"/>
6
-        <conf name="compile" description="Everything needed to compile"/>
7
-        <conf name="test" description="Everything needed to test"/>
8
-        <conf name="default" extends="build,compile,test"/>
9
-    </configurations>
10
-
11
-    <publications>
12
-        <artifact type="jar" ext="jar" conf="default"/>
13
-        <artifact type="pom" ext="pom" conf="default"/>
14
-    </publications>
15
-
16
-    <dependencies defaultconfmapping="*->default">
17
-        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.3" conf="build" />
18
-        <dependency org="junit" name="junit" rev="4.+" conf="test" />
19
-        <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test" />
20
-
21
-        <exclude org="ant" module="ant"/>
22
-    </dependencies>
23
-</ivy-module>

Ładowanie…
Anuluj
Zapisz