ardour/livetrax
13
0
Fork 0
Code

more useful regexp to allow 5.x-preN version tags

Browse Source
This commit is contained in:
Paul Davis 2016-05-31 12:20:15 -04:00
parent 5308293597
commit db7d401435
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/define_versions.sh
View File

@ -8,7 +8,7 @@ else
EXTENDED_RE=-r
fi
GIT_REV_REGEXP='([0-9][0-9]*)\.([0-9][0-9]*)\-?(rc[0-9]*)?-?([0-9][0-9]*)?(-g([a-f0-9]+))?'
GIT_REV_REGEXP='([0-9][0-9]*)\.([0-9][0-9]*)\-?([prec][0-9]*)?-?([0-9][0-9]*)?(-g([a-f0-9]+))?'
major_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\1/"`
minor_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\2/"`
@ -20,6 +20,9 @@ micro_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE
#
# RC e.g. 8.1-rc3 (optional)
# OR
# PRE e.g. 9.3-pre0 (optional)
#
# Tracks does not use -rcN based tagging
#
rc=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\3/"`