X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fdefine_versions.sh;h=37eca614f326044c60e0a2cdebdbea3327168a08;hb=1be3301342c74fdbb92febcbc85e8d60fb09de0e;hp=c2f912d16da89c0b444af73a4aaee71c732a1936;hpb=c1ccf8e28ec6d11508c0ae6c9d1265dbe71f15be;p=ardour.git

diff --git a/tools/define_versions.sh b/tools/define_versions.sh
index c2f912d16d..37eca614f3 100644
--- a/tools/define_versions.sh
+++ b/tools/define_versions.sh
@@ -8,18 +8,41 @@ 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/"`
+
+# Tracks tags with "MAJOR.MINOR.MICRO"
+# Ardour doesn't use this
+
+micro_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\3/"`
+
+#
+# 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/"`
+
+#
+# revision count since tag
+#
 r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\4/"`
+
+#
+# git short sha1 commit ID
+#
 commit=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\6/"`
 
 if [ "x$rc" != "x" ] ; then
     revcount=$rc${r:+.$r}
 elif [ "x$r" != "x" ] ; then
     revcount=$r
+else
+    revcount=0
 fi
 
 release_version=${major_version}.${minor_version}${revcount:+.$revcount}