diff options
| author | Kenny Root <kenny@the-b.org> | 2010-09-18 21:20:34 -0500 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2010-09-18 21:20:34 -0500 |
| commit | 0c8ce5d611026656da57959a33a57367fbe08341 (patch) | |
| tree | 5a8cc4faacf2164345256af120e7cb9576b66b1c | |
| parent | 5457d8c9104563ac3062962a8b94be357198fd7f (diff) | |
| download | connectbot-0c8ce5d611026656da57959a33a57367fbe08341.tar.gz connectbot-0c8ce5d611026656da57959a33a57367fbe08341.tar.bz2 connectbot-0c8ce5d611026656da57959a33a57367fbe08341.zip | |
Only match tags that start with v[0-9]*
Also ignore notrans.xml because it only contains our version
information.
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | build.xml | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bcc54c1..9c8fdb7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" android:versionName="1.7.0" - android:versionCode="316" + android:versionCode="317" android:installLocation="auto"> <application @@ -345,7 +345,7 @@ <apply executable="${dx}" failonerror="true" parallel="true"> <arg value="--dex" /> <arg value="--output=${intermediate.dex.file}" /> - <arg path="${out.classes.absolute.dir}" /> + <arg path="${out.classes.absolute.dir}" /> <fileset dir="${external.libs.absolute.dir}" includes="*.jar"/> </apply> </target> @@ -546,9 +546,14 @@ <xpath input="AndroidManifest.xml" expression="/manifest/@android:versionName" output="manifest.version.name" /> + <!-- checkout notrans.xml so we can ignore it in our index --> + <exec executable="git"> + <arg line="checkout res/values/notrans.xml"/> + </exec> + <!-- find out the description of the current Git commit --> <exec executable="git" outputproperty="git.revision"> - <arg line="describe --dirty"/> + <arg line="describe --match 'v[0-9]*' --dirty"/> </exec> <replaceregexp file="${resource.absolute.dir}/values/notrans.xml" encoding="utf8" match='(\x3Cstring name="msg_version">)[^\x3C]*(\x3C/string>)' |