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 | |
| 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')
| -rwxr-xr-x | tools/linux_packaging/build | 18 | ||||
| -rwxr-xr-x | tools/linux_packaging/package | 16 |
2 files changed, 19 insertions, 15 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index e7f7d8b6dd..e8cc4d53b2 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -97,8 +97,12 @@ fi . ../define_versions.sh -echo "Version is $version / $commit" -info_string="$version ($commit) built on `hostname` by `whoami` on `date`" +echo "Version is $release_version" +if [ "x$commit" != "x" ] ; then + info_string="$release_version ($commit) built on `hostname` by `whoami` on `date`" +else + info_string="$release_version built on `hostname` by `whoami` on `date`" +fi echo "Info string is $info_string" # Figure out our CPU type @@ -134,11 +138,11 @@ fi # setup directory structure if [ -z "${BUILDTYPE}" ]; then - APPDIR=${APPNAME}_${ARCH}-${version} - APP_VER_NAME=${APPNAME}-${version} + APPDIR=${APPNAME}_${ARCH}-${release_version} + APP_VER_NAME=${APPNAME}-${release_version} else - APPDIR=${APPNAME}_${ARCH}-${version}-${BUILDTYPE} - APP_VER_NAME=${APPNAME}-${version}-${BUILDTYPE} + APPDIR=${APPNAME}_${ARCH}-${release_version}-${BUILDTYPE} + APP_VER_NAME=${APPNAME}-${release_version}-${BUILDTYPE} fi APPBIN=$APPDIR/bin @@ -569,7 +573,7 @@ fi # # Add the uninstaller # -sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${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_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh #Sanity Check file 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 |