diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
commit | 8648a8a13b04549362f14a0738947d997ef1abc7 (patch) | |
tree | 702652b49789b13d647c4c93df985f65361a4118 /tools/define_versions.sh | |
parent | c428ec14b923928690492cab0428f8fad45f7658 (diff) | |
parent | ae6b0b9f1ab02ab949eaf741b98e69bdab487e92 (diff) |
fix up wscript/build issues in exportvis after merge with master
Diffstat (limited to 'tools/define_versions.sh')
-rw-r--r-- | tools/define_versions.sh | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/tools/define_versions.sh b/tools/define_versions.sh index 6f5c17773c..654617a253 100644 --- a/tools/define_versions.sh +++ b/tools/define_versions.sh @@ -2,15 +2,24 @@ # this is sourced by build and package, and executed from within build/{osx,linux}_packaging # -major_version=`grep -m 1 '^MAJOR = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` -minor_version=`grep -m 1 '^MINOR = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` -release_version=${major_version}.${minor_version} -r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/[0-9][0-9]*\.[0-9][0-9]*-//"` -if echo $r | grep -q -e - ; then - revcount=`echo $r | cut -d- -f1` +if uname -a | grep arwin >/dev/null 2>&1 ; then + EXTENDED_RE=-E +else + EXTENDED_RE=-r +fi + +GIT_REV_REGEXP='([0-9][0-9]*)\.([0-9][0-9]*)-?([0-9][0-9]*)?-?([a-z0-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/"` +r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\3/"` +commit=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\4/"` + +if [ "x$r" != "x" ] ; then + revcount=$r fi -commit=`echo $r | cut -d- -f2` -version=${release_version}${revcount:+.$revcount} + +release_version=${major_version}.${minor_version}${revcount:+.$revcount} # # Figure out the Build Type |