aboutsummaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2010-09-17 19:24:57 -0500
committerKenny Root <kenny@the-b.org>2010-09-17 19:25:39 -0500
commit5457d8c9104563ac3062962a8b94be357198fd7f (patch)
treed238a8d77b964cfe4e2c102726aeff38d46fe02e /build.xml
parent64c1d8e6125828031023203dc7fce5a1f9e41a5a (diff)
downloadconnectbot-5457d8c9104563ac3062962a8b94be357198fd7f.tar.gz
connectbot-5457d8c9104563ac3062962a8b94be357198fd7f.tar.bz2
connectbot-5457d8c9104563ac3062962a8b94be357198fd7f.zip
Update build.xml to use dirty git descriptions
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml10
1 files changed, 4 insertions, 6 deletions
diff --git a/build.xml b/build.xml
index cf6e295..2b7c7f6 100644
--- a/build.xml
+++ b/build.xml
@@ -538,8 +538,6 @@
<target name="update-version" description="Updates the Version.java file with current Git revision">
<echo>Updating resources with Git revision and build date...</echo>
- <property name="revision" value="HEAD"/>
-
<tstamp>
<format property="build.date" pattern="yyyy.MM.dd" />
</tstamp>
@@ -548,15 +546,15 @@
<xpath input="AndroidManifest.xml" expression="/manifest/@android:versionName"
output="manifest.version.name" />
- <!-- find out svn.revision of HEAD, need svn.exe installed on local machine will en up in property ${Revision} -->
+ <!-- find out the description of the current Git commit -->
<exec executable="git" outputproperty="git.revision">
- <arg line="rev-parse --short ${revision}"/>
+ <arg line="describe --dirty"/>
</exec>
<replaceregexp file="${resource.absolute.dir}/values/notrans.xml" encoding="utf8" match='(\x3Cstring name="msg_version">)[^\x3C]*(\x3C/string>)'
- replace='\1${ant.project.name} ${manifest.version.name} (r${git.revision} ${build.date})\2' />
+ replace='\1${ant.project.name} ${manifest.version.name} (${git.revision} ${build.date})\2' />
- <echo>Updated "msg_version" to: ${ant.project.name} ${manifest.version.name} (r${git.revision} ${build.date})</echo>
+ <echo>Updated "msg_version" to: ${ant.project.name} ${manifest.version.name} (${git.revision} ${build.date})</echo>
</target>
<target name="clean"