ardour/livetrax
13
0
Fork 0
Code

more tweaks to get package names right

Browse Source
This commit is contained in:
Paul Davis 2013-03-22 20:30:14 -04:00
parent 0348f9543e
commit d05f3b0a7c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/linux_packaging/build
View File

@ -88,7 +88,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
fi
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"
info_string="$release_version/$revision built on `hostname` by `whoami` on `date`"
echo "Info string is $info_string"
@ -131,11 +131,11 @@ fi
# setup directory structure
if [ -z "${BUILDTYPE}" ]; then
APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}
APP_VER_NAME=${APPNAME}-${release_version}_${revision}
APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision}
APP_VER_NAME=${APPNAME}-${release_version}-${revision}
else
APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}-${BUILDTYPE}
APP_VER_NAME=${APPNAME}-${release_version}_${revision}-${BUILDTYPE}
APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision}-${BUILDTYPE}
APP_VER_NAME=${APPNAME}-${release_version}-${revision}-${BUILDTYPE}
fi
APPBIN=$APPDIR/bin

2
tools/linux_packaging/package
View File

@ -63,7 +63,7 @@ if [ x$DEBUG = xT ]; then
fi
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_64_BUNDLE="${APPNAME}_x86_64-${release_version}-${revision}"