diff options
author | Todd Naugle <toddn@glw.com> | 2011-04-01 21:25:29 +0000 |
---|---|---|
committer | Todd Naugle <toddn@glw.com> | 2011-04-01 21:25:29 +0000 |
commit | acf4197cb40c76d643987fa98225607129c8bde1 (patch) | |
tree | 9148bf651d2e0c7a718c171b93a4e161f224b47c /tools | |
parent | 7b4fb6367a3aaa74e81e7d513fac5fb12df9ae85 (diff) |
Include the bundle size files in the package
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@9257 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/linux_packaging/package | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package index 0b6231c8cf..b4cead84d2 100755 --- a/tools/linux_packaging/package +++ b/tools/linux_packaging/package @@ -1,4 +1,4 @@ -\#!/bin/bash +#!/bin/bash # package @@ -71,26 +71,34 @@ fi release_version=`grep -m 1 '^ardour_version' ../../SConstruct | cut -d' ' -f 3 | sed "s/'//g"` svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d' ' -f 6 | sed 's/[";]//g'` -if [ -z ${BUILDTYPE} ]; then - X86_BUILD="${APPNAME}_x86-${release_version}_${svn_version}.tar.bz2" - X86_64_BUILD="${APPNAME}_x86_64-${release_version}_${svn_version}.tar.bz2" -else - X86_BUILD="${APPNAME}_x86-${release_version}_${svn_version}-${BUILDTYPE}.tar.bz2" - X86_64_BUILD="${APPNAME}_x86_64-${release_version}_${svn_version}-${BUILDTYPE}.tar.bz2" +X86_BUNDLE="${APPNAME}_x86-${release_version}_${svn_version}" +X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}_${svn_version}" + +if [ ! -z ${BUILDTYPE} ]; then + X86_BUNDLE="${X86_BUNDLE}-${BUILDTYPE}" + X86_64_BUNDLE="${X86_64_BUNDLE}-${BUILDTYPE}" fi -if [ ! -e ${X86_BUILD} ]; then +if [ ! -e ${X86_BUNDLE}.tar.bz2 ] ; then + echo "" + echo "Can't locate x86 bundle file ${X86_BUNDLE}.tar.bz2" echo "" - echo "Can't locate x86 bundle file ${X86_BUILD}" +elif [ ! -e ${X86_BUNDLE}.size ] ; then + echo "" + echo "Can't locate x86 bundle size file ${X86_BUNDLE}.size" echo "" else X86_BUNDLE_OK="T" fi -if [ ! -e ${X86_64_BUILD} ]; then +if [ ! -e ${X86_64_BUNDLE}.tar.bz2 ]; then + echo "" + echo "Can't locate x86_64 bundle file ${X86_64_BUNDLE}.tar.bz2" + echo "" +elif [ ! -e ${X86_64_BUNDLE}.size ]; then echo "" - echo "Can't locate x86_64 bundle file ${X86_64_BUILD}" + echo "Can't locate x86 bundle size file ${X86_BUNDLE}.size" echo "" else X86_64_BUNDLE_OK="T" @@ -100,7 +108,7 @@ fi if [ "${X86_BUNDLE_OK}" = "F" ] || [ "${X86_64_BUNDLE_OK}" = "F" ]; then if [ "${X86_BUNDLE_OK}" = "${X86_64_BUNDLE_OK}" ]; then echo "" - echo "!!! ERROR !!! - Can't locate bundle files ${X86_BUILD} or ${X86_64_BUILD}" + echo "!!! ERROR !!! - Can't locate bundle files ${X86_BUNDLE} or ${X86_64_BUNDLE}" echo "" exit 1 elif [ "${SINGLE_ARCH}" = "T" ]; then @@ -150,11 +158,13 @@ echo "Creating new package dir..." mkdir ${PACKAGE} if [ "${X86_BUNDLE_OK}" = "T" ]; then - mv ${X86_BUILD} ${PACKAGE} + mv ${X86_BUNDLE}.tar.bz2 ${PACKAGE} + mv ${X86_BUNDLE}.size ${PACKAGE}/.${X86_BUNDLE}.size fi if [ "${X86_64_BUNDLE_OK}" = "T" ]; then - mv ${X86_64_BUILD} ${PACKAGE} + mv ${X86_64_BUNDLE}.tar.bz2 ${PACKAGE} + mv ${X86_64_BUNDLE}.size ${PACKAGE}/.${X86_64_BUNDLE}.size fi cp install.sh ${PACKAGE} |