From 8faf313ed21888972d3dbe96f3aaa57de469e4eb Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 31 May 2016 12:32:10 -0400 Subject: improved, functioning regexp for revisions --- tools/define_versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/define_versions.sh b/tools/define_versions.sh index 770378765f..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]*)\-?([prec][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/"` -- cgit v1.2.3