Browse Source

Speed up git version retrieval by using jgit-describe.jar (Built from https://github.com/ShaneMcC/jgit-describe) to describe the git tag rather than shelling out.

Change-Id: I9953e39c0ee190123df09b5ca5afd8b0ef654f55
Reviewed-on: http://gerrit.dmdirc.com/2268
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.7rc1
Shane Mc Cormack 12 years ago
parent
commit
038e2e5a77
4 changed files with 3 additions and 37 deletions
  1. 0
    33
      build-gitversion.xml
  2. 3
    4
      build-versioning.xml
  3. BIN
      lib/jgit-describe.jar
  4. BIN
      lib/org.eclipse.jgit-1.3.0-SNAPSHOT.jar

+ 0
- 33
build-gitversion.xml View File

@@ -1,33 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project basedir=".">
3
-
4
-    <macrodef name="gitversion">
5
-        <attribute name="target"/>
6
-        <attribute name="outputproperty"/>
7
-        <attribute name="gitdir" default=".git"/>
8
-
9
-        <sequential>
10
-            <local name="lastcommit"/>
11
-
12
-            <exec executable="git" outputproperty="lastcommit">
13
-                <arg value="--git-dir"/>
14
-                <arg value="@{gitdir}"/>
15
-                <arg value="rev-list"/>
16
-                <arg value="--max-count=1"/>
17
-                <arg value="HEAD"/>
18
-                <arg value="--"/>
19
-                <arg value="@{target}"/>
20
-            </exec>
21
-
22
-            <exec executable="git" outputproperty="@{outputproperty}">
23
-                <arg value="--git-dir"/>
24
-                <arg value="@{gitdir}"/>
25
-                <arg value="describe"/>
26
-                <arg value="--tags"/>
27
-                <arg value="--always"/>
28
-                <arg value="${lastcommit}"/>
29
-            </exec>
30
-        </sequential>
31
-    </macrodef>
32
-
33
-</project>

+ 3
- 4
build-versioning.xml View File

@@ -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>

BIN
lib/jgit-describe.jar View File


BIN
lib/org.eclipse.jgit-1.3.0-SNAPSHOT.jar View File


Loading…
Cancel
Save