be more tolerant of svnversion's output

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5863 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
spoon 2006-02-27 16:38:50 +00:00
parent da871faab8
commit f263205894
1 changed files with 3 additions and 2 deletions

View File

@ -232,9 +232,10 @@ INITIALISATION
<echo level="verbose">svn.version=${svn.version}</echo> <echo level="verbose">svn.version=${svn.version}</echo>
<propertyregex property="version" <propertyregex property="version"
input="${svn.version}" input="${svn.version}"
regexp="\.*([0-9]*)\.*" regexp="([0-9]*:)?([0-9]*)\.*"
select="\1"/> select="\2"/>
<property name="version.number" value="2.0.${version}"/> <property name="version.number" value="2.0.${version}"/>
<echo level="verbose">version.number=${version.number}</echo>
<property name="dist.current.dir" <property name="dist.current.dir"
value="${dist.dir}/${dist.name}-${version.number}"/> value="${dist.dir}/${dist.name}-${version.number}"/>
<property name="init.avail" value="yes"/> <property name="init.avail" value="yes"/>