|
@@ -16,6 +16,8 @@
|
16
|
16
|
<fileset dir="${util.lib}" includes="*.jar"/>
|
17
|
17
|
</path>
|
18
|
18
|
|
|
19
|
+ <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="util.classpath.test"/>
|
|
20
|
+
|
19
|
21
|
<target name="-init-compile">
|
20
|
22
|
<mkdir dir="${util.build.main}"/>
|
21
|
23
|
</target>
|
|
@@ -33,25 +35,12 @@
|
33
|
35
|
</target>
|
34
|
36
|
|
35
|
37
|
<target name="-retrieve-versions">
|
36
|
|
- <exec executable="git" outputproperty="util.lastcommit.main">
|
37
|
|
- <arg value="rev-list"/>
|
38
|
|
- <arg value="--max-count=1"/>
|
39
|
|
- <arg value="HEAD"/>
|
40
|
|
- <arg value="--"/>
|
41
|
|
- <arg value="${util.src}/"/>
|
42
|
|
- </exec>
|
43
|
|
-
|
44
|
|
- <exec executable="git" outputproperty="util.version.main">
|
45
|
|
- <arg value="describe"/>
|
46
|
|
- <arg value="--tags"/>
|
47
|
|
- <arg value="--always"/>
|
48
|
|
- <arg value="${util.lastcommit.main}"/>
|
49
|
|
- </exec>
|
|
38
|
+ <git-describe dir=".git" property="util.version.main" subdir="${util.src}" />
|
50
|
39
|
</target>
|
51
|
40
|
|
52
|
41
|
<target name="compile" depends="-init-compile">
|
53
|
42
|
<javac srcdir="${util.src}" destdir="${util.build.main}"
|
54
|
|
- includeantruntime="false"/>
|
|
43
|
+ includeantruntime="false"/>
|
55
|
44
|
</target>
|
56
|
45
|
|
57
|
46
|
<target name="compile-tests" depends="compile,-init-compile-tests">
|
|
@@ -71,7 +60,7 @@
|
71
|
60
|
<classpath>
|
72
|
61
|
<path refid="util.classpath.test"/>
|
73
|
62
|
<pathelement location="${util.build.test}"/>
|
74
|
|
- </classpath>
|
|
63
|
+ </classpath>
|
75
|
64
|
<batchtest todir="${util.reports}">
|
76
|
65
|
<fileset dir="${util.build.test}" includes="**/*Test.class"/>
|
77
|
66
|
<formatter type="xml"/>
|