diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 12:20:15 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:46 -0400 |
| commit | db7d401435e8e8f79b2cdbe497137c9ca425c2f1 (patch) | |
| tree | e103b9fc977506d874081d9a48a278baabe26da4 /tools | |
| parent | 5308293597162ef1febee61f3b1be22f56b514da (diff) | |
more useful regexp to allow 5.x-preN version tags
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/define_versions.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/define_versions.sh b/tools/define_versions.sh index a0642cec02..770378765f 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]*)\-?([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/"` |