X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fdefine_versions.sh;h=37eca614f326044c60e0a2cdebdbea3327168a08;hb=d3e23c1a6e1cc72aebdb5f40fe5c4a57f5941a97;hp=a0642cec0293109c093455c91f9c6d7e14eee1a3;hpb=46c83693284ece4a732d26e62113ea4ac584d539;p=ardour.git diff --git a/tools/define_versions.sh b/tools/define_versions.sh index a0642cec02..37eca614f3 100644 --- a/tools/define_versions.sh +++ b/tools/define_versions.sh @@ -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]*)\-?([pr][rc]e?[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/"`