diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-25 09:49:07 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-25 09:49:07 -0400 |
| commit | 7aca3a92217ff02be905dc387bf432e7a2f103c1 (patch) | |
| tree | 12fb3ddf8956bf0885e580ce0e4f59b64ca5bb13 /tools/linux_packaging/build | |
| parent | f9c7603bdb2cd9720c17146387b39c433d757327 (diff) | |
possible new naming convention, plus factor out version/DEBUG info into a sourced shell script fragment that can be shared by build+package
Diffstat (limited to 'tools/linux_packaging/build')
| -rwxr-xr-x | tools/linux_packaging/build | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 93bbcc95b8..df78bc27f8 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -87,10 +87,10 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then exit 1 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 | sed -e "s/$release_version-//"` -echo "Version is $release_version / $revision" -info_string="$release_version/$revision built on `hostname` by `whoami` on `date`" +. ./define_versions.sh + +echo "Version is $version / $commit" +info_string="$version ($commit) built on `hostname` by `whoami` on `date`" echo "Info string is $info_string" # Figure out our CPU type @@ -113,13 +113,6 @@ case `uname -m` in ;; esac -# Figure out the Build Type -if grep -q "DEBUG = True" ../../build/c4che/_cache.py; then - DEBUG="T" -else - DEBUG="F" -fi - if [ x$DEBUG = xT ]; then BUILDTYPE="dbg" if [ x$STRIP = xall ] ; then @@ -131,11 +124,11 @@ fi # setup directory structure if [ -z "${BUILDTYPE}" ]; then - APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision} - APP_VER_NAME=${APPNAME}-${release_version}-${revision} + APPDIR=${APPNAME}_${ARCH}-${version} + APP_VER_NAME=${APPNAME}-${version} else - APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision}-${BUILDTYPE} - APP_VER_NAME=${APPNAME}-${release_version}-${revision}-${BUILDTYPE} + APPDIR=${APPNAME}_${ARCH}-${version}-${BUILDTYPE} + APP_VER_NAME=${APPNAME}-${version}-${BUILDTYPE} fi APPBIN=$APPDIR/bin @@ -535,7 +528,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%/${revision}/" -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%/${version}/" -e "s/%REPLACE_BUILD%/${commit}/" -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 |