diff options
-rwxr-xr-x | bin/git-get-rev | 5 | ||||
-rw-r--r-- | build.xml | 22 |
2 files changed, 25 insertions, 2 deletions
diff --git a/bin/git-get-rev b/bin/git-get-rev new file mode 100755 index 0000000000..abbdf61ebd --- /dev/null +++ b/bin/git-get-rev @@ -0,0 +1,5 @@ +#!/bin/sh +# + +GIT_PAGER=cat +git log -10 | grep git-svn-id | head -1 | cut -c 68-73 @@ -213,16 +213,34 @@ INITIALISATION <condition property="os.win"> <os family="windows"/> </condition> - <!-- Finding out SVN revision --> + <!-- Finding out SVN revision, svn style --> <exec executable="svn" outputproperty="svn.out" failifexecutionfails="false"> <arg line=" info ${basedir}"/> </exec> <propertyregex - property="svn.number" input="${svn.out}" select="\1" + property="svn.number.svn" input="${svn.out}" select="\1" regexp="Revision: ([0-9]+)" defaultValue="0"/> + + <if> + <equals arg1="${svn.number.svn}" arg2="0" /> + <then> + <!-- Finding SVN revision, git style --> + <exec executable="bin/git-get-rev" outputproperty="svn.number.git" failifexecutionfails="false" /> + <condition property="svn.number" value="${svn.number.git}" > + <isset property="svn.number.git" /> + </condition> + </then> + </if> + <!-- if svn failed and git succeeded, this will be ignored. --> + <property name="svn.number" value="${svn.number.svn}" /> + <echo message="SVN says ${svn.number.svn}" /> + <echo message="GIT says ${svn.number.git}" /> + <echo message="FINAL says ${svn.number}" /> + <property name="init.avail" value="yes"/> + <!-- Generating version number --> <property file="${basedir}/build.number"/> <property |