more tweaks to get package names right
This commit is contained in:
parent
0348f9543e
commit
d05f3b0a7c
@ -88,7 +88,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{ print $3 }' | sed "s/'//g"`
|
release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{ print $3 }' | sed "s/'//g"`
|
||||||
revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version//"`
|
revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version-//"`
|
||||||
echo "Version is $release_version / $revision"
|
echo "Version is $release_version / $revision"
|
||||||
info_string="$release_version/$revision built on `hostname` by `whoami` on `date`"
|
info_string="$release_version/$revision built on `hostname` by `whoami` on `date`"
|
||||||
echo "Info string is $info_string"
|
echo "Info string is $info_string"
|
||||||
@ -131,11 +131,11 @@ fi
|
|||||||
# setup directory structure
|
# setup directory structure
|
||||||
|
|
||||||
if [ -z "${BUILDTYPE}" ]; then
|
if [ -z "${BUILDTYPE}" ]; then
|
||||||
APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}
|
APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision}
|
||||||
APP_VER_NAME=${APPNAME}-${release_version}_${revision}
|
APP_VER_NAME=${APPNAME}-${release_version}-${revision}
|
||||||
else
|
else
|
||||||
APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}-${BUILDTYPE}
|
APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision}-${BUILDTYPE}
|
||||||
APP_VER_NAME=${APPNAME}-${release_version}_${revision}-${BUILDTYPE}
|
APP_VER_NAME=${APPNAME}-${release_version}-${revision}-${BUILDTYPE}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
APPBIN=$APPDIR/bin
|
APPBIN=$APPDIR/bin
|
||||||
|
@ -63,7 +63,7 @@ if [ x$DEBUG = xT ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
|
release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
|
||||||
revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version//"`
|
revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version-//"`
|
||||||
|
|
||||||
X86_BUNDLE="${APPNAME}_x86-${release_version}-${revision}"
|
X86_BUNDLE="${APPNAME}_x86-${release_version}-${revision}"
|
||||||
X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}-${revision}"
|
X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}-${revision}"
|
||||||
|
Loading…
Reference in New Issue
Block a user