From ef6ba837b6ce509b1e8e4d0435e9c2eee1206eff Mon Sep 17 00:00:00 2001 From: Toni Gundogdu Date: Tue, 14 Aug 2012 17:05:42 +0300 Subject: [PATCH] gen-ver.sh: Update parsing from m4/version.m4 --- gen-ver.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gen-ver.sh b/gen-ver.sh index 414a01b..21abe22 100755 --- a/gen-ver.sh +++ b/gen-ver.sh @@ -39,7 +39,10 @@ gen_version() # $1=path to top source dir # If that file is not found, or fails (e.g. empty), parse from m4/version.m4 m4="$path/m4/version.m4" - VN=`perl -ne'/(\d+)\.(\d+)\.(\d+)/ && print "$1.$2.$3"' < "$m4"` + rmaj=`perl -ne'/.*_rmaj.*\[(\d+)\]/ && print "$1"' < "$m4"` + rmin=`perl -ne'/.*_rmin.*\[(\d+)\]/ && print "$1"' < "$m4"` + rmic=`perl -ne'/.*_rmic.*\[(\d+)\]/ && print "$1"' < "$m4"` + VN="$rmaj.$rmin.$rmic" [ -z $VN ] && exit $? # Use the "git describe" instead, if .git is present -- 2.11.4.GIT