From 0b8712268e4935e69fa5604407ee0f7753027fdd Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 30 Apr 2013 17:45:22 +0200 Subject: [PATCH] fix version detection in OSX build script --- tools/osx_packaging/osx_build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index d750674d36..af582ff3bf 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -62,9 +62,13 @@ while [ $# -gt 0 ] ; do esac done -#release_version=`grep -m 1 '[^A-Za-z_]OSX_VERSION = ' ../../wscript | cut -d' ' -f 3 | sed "s/'//g"` -release_version=3.0 -revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d' ' -f 8 | sed 's/[^0-9]//g'` +if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then + echo "application or product-name was not specified" + exit 1 +fi + +release_version=`grep -m 1 '[^A-Za-z_]OSX_VERSION = ' ../../wscript | cut -d"'" -f2` +revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed 's/^.*-//g'` echo "Version is $release_version / $revision" info_string="$release_version/$revision built on `hostname` by `whoami` on `date`" echo "Info string is $info_string"