|
@@ -2,8 +2,6 @@
|
2
|
2
|
<project name="DMDirc-versioning" default="default" basedir=".">
|
3
|
3
|
<description>Adds automatic versioning information to DMDirc</description>
|
4
|
4
|
|
5
|
|
- <include file="build-gitversion.xml"/>
|
6
|
|
-
|
7
|
5
|
<property name="version.config" value="build/classes/com/dmdirc/version.config"/>
|
8
|
6
|
<property name="defaults.path" value="modules/defaults/.git/"/>
|
9
|
7
|
<property name="defaults.output" value="build/classes/com/dmdirc/config/defaults/"/>
|
|
@@ -11,6 +9,7 @@
|
11
|
9
|
<property name="modealiases.target" value="${defaults.output}modealiases/generic"/>
|
12
|
10
|
|
13
|
11
|
<available file=".git" property="is.git"/>
|
|
12
|
+ <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="libclasspath"/>
|
14
|
13
|
|
15
|
14
|
<target name="-write-version" depends="-write-version-header, -add-version, -write-updater, -write-identities, -write-disable-updates"/>
|
16
|
15
|
|
|
@@ -86,8 +85,8 @@ identity:
|
86
|
85
|
<target name="-read-identities" depends="-read-identities-git"/>
|
87
|
86
|
|
88
|
87
|
<target name="-read-identities-git" if="is.git">
|
89
|
|
- <gitversion target="default" gitdir="${defaults.path}" outputproperty="defaults.version"/>
|
90
|
|
- <gitversion target="modealiases" gitdir="${defaults.path}" outputproperty="modealiases.version"/>
|
|
88
|
+ <git-describe dir="${defaults.path}" property="defaults.version" subdir="default" />
|
|
89
|
+ <git-describe dir="${defaults.path}" property="modealiases.version" subdir="modealiases" />
|
91
|
90
|
</target>
|
92
|
91
|
|
93
|
92
|
</project>
|