diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-22 16:54:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-22 16:54:06 -0400 |
| commit | e155338aa06ab9d449f9c4fe5f4f654066784e6f (patch) | |
| tree | 4a46389f321a5697e92fd02b234c694919212945 /tools | |
| parent | d99b5dfa37c7248e24a0266188752dfa6c9bb3f6 (diff) | |
change extraction of revision and build from revision.cc, and use in the build, package and uninstall scripts
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/build | 2 | ||||
| -rwxr-xr-x | tools/linux_packaging/package | 6 | ||||
| -rw-r--r-- | tools/linux_packaging/uninstall.sh.in | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 8b692de74e..c1d770bfe6 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -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` +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" diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package index 85cac2ed98..4862f285ab 100755 --- a/tools/linux_packaging/package +++ b/tools/linux_packaging/package @@ -63,10 +63,10 @@ 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` +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}" +X86_BUNDLE="${APPNAME}_x86-${release_version}-${revision}" +X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}-${revision}" if [ ! -z ${BUILDTYPE} ]; then X86_BUNDLE="${X86_BUNDLE}-${BUILDTYPE}" diff --git a/tools/linux_packaging/uninstall.sh.in b/tools/linux_packaging/uninstall.sh.in index b1e4f3cec3..74793d4197 100644 --- a/tools/linux_packaging/uninstall.sh.in +++ b/tools/linux_packaging/uninstall.sh.in @@ -24,12 +24,12 @@ USER_NAME=$(logname) #### Derived Variables #### if [ -z "${PGM_BUILDTYPE}" ]; then - PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD} + PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}-${PGM_BUILD} ICON_NAME="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}" #no dash between name and version since dash seperates vendor from program MENU_FILE="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}.desktop" #no dash between name and version since dash seperates vendor from program DESKTOP_LINK_FILE="${PGM_NAME}_${PGM_VERSION}.desktop" else - PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD}-${PGM_BUILDTYPE} + PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}-${PGM_BUILD}-${PGM_BUILDTYPE} ICON_NAME="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}" #no dash between name and version since dash seperates vendor from program MENU_FILE="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}.desktop" #no dash between name and version since dash seperates vendor from program DESKTOP_LINK_FILE="${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}.desktop" |