summaryrefslogtreecommitdiff
path: root/tools/linux_packaging/build
diff options
context:
space:
mode:
Diffstat (limited to 'tools/linux_packaging/build')
-rwxr-xr-xtools/linux_packaging/build16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index f992b6604a..8b692de74e 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -88,9 +88,9 @@ 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"`
-svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d'"' -f 2`
-echo "Version is $release_version / $svn_version"
-info_string="$release_version/$svn_version built on `hostname` by `whoami` on `date`"
+revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2`
+echo "Version is $release_version / $revision"
+info_string="$release_version/$revision built on `hostname` by `whoami` on `date`"
echo "Info string is $info_string"
# Figure out our CPU type
@@ -131,11 +131,11 @@ fi
# setup directory structure
if [ -z "${BUILDTYPE}" ]; then
- APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}
- APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}
+ APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}
+ APP_VER_NAME=${APPNAME}-${release_version}_${revision}
else
- APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}-${BUILDTYPE}
- APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE}
+ APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}-${BUILDTYPE}
+ APP_VER_NAME=${APPNAME}-${release_version}_${revision}-${BUILDTYPE}
fi
APPBIN=$APPDIR/bin
@@ -535,7 +535,7 @@ done
#
# Add the uninstaller
#
-sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${release_version}/" -e "s/%REPLACE_BUILD%/${svn_version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh
+sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${release_version}/" -e "s/%REPLACE_BUILD%/${revision}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh
chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh
#Sanity Check file