diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-05 09:35:03 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-05 09:35:03 -0500 |
| commit | 3e661d97b57047144336253f79d679a7300aead8 (patch) | |
| tree | 886849e292a7f9da77006621d1ac474a4273b85d /tools/linux_packaging/package | |
| parent | 6992153ae974e52fe2ed6152cad346c8eb6beea0 (diff) | |
update packaging tools to always use revision.cc to determine version number, not text in top level wscript
Diffstat (limited to 'tools/linux_packaging/package')
| -rwxr-xr-x | tools/linux_packaging/package | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package index 259a2a22da..5fc6aee1f7 100755 --- a/tools/linux_packaging/package +++ b/tools/linux_packaging/package @@ -56,8 +56,8 @@ if [ x$DEBUG = xT ]; then BUILDTYPE="dbg" fi -X86_BUNDLE="${APPNAME}_x86-${version}" -X86_64_BUNDLE="${APPNAME}_x86_64-${version}" +X86_BUNDLE="${APPNAME}_x86-${release_version}" +X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}" if [ ! -z ${BUILDTYPE} ]; then X86_BUNDLE="${X86_BUNDLE}-${BUILDTYPE}" @@ -112,22 +112,22 @@ fi if [ -z ${BUILDTYPE} ]; then if [ "${SINGLE_ARCH}" = "T" ]; then if [ "${X86_BUNDLE_OK}" = "T" ]; then - PACKAGE="${APPNAME}_32bit-${version}" + PACKAGE="${APPNAME}_32bit-${release_version}" else - PACKAGE="${APPNAME}_64bit-${version}" + PACKAGE="${APPNAME}_64bit-${release_version}" fi else - PACKAGE="${APPNAME}-${version}" + PACKAGE="${APPNAME}-${release_version}" fi else if [ "${SINGLE_ARCH}" = "T" ]; then if [ "${X86_BUNDLE_OK}" = "T" ]; then - PACKAGE="${APPNAME}_32bit-${version}-${BUILDTYPE}" + PACKAGE="${APPNAME}_32bit-${release_version}-${BUILDTYPE}" else - PACKAGE="${APPNAME}_64bit-${version}-${BUILDTYPE}" + PACKAGE="${APPNAME}_64bit-${release_version}-${BUILDTYPE}" fi else - PACKAGE="${APPNAME}-${version}-${BUILDTYPE}" + PACKAGE="${APPNAME}-${release_version}-${BUILDTYPE}" fi fi |