diff options
| author | Julien de Kozak <jdekozak@hotmail.com> | 2013-03-17 14:53:30 +0100 |
|---|---|---|
| committer | Julien de Kozak <jdekozak@hotmail.com> | 2013-03-18 20:13:05 +0100 |
| commit | eb7a85b8f992d0e2783c40c4809d81b17e80436c (patch) | |
| tree | a461828941636a1e7e09202ab1a40065ca6f93c8 /tools/linux_packaging | |
| parent | 62f1ed054b655bb45b82afa2ea6a7787a988b4f9 (diff) | |
Set the revision mechanism independent from the VCS name
Diffstat (limited to 'tools/linux_packaging')
| -rwxr-xr-x | tools/linux_packaging/build | 16 | ||||
| -rwxr-xr-x | tools/linux_packaging/package | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index f992b6604a..8b692de74e 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -88,9 +88,9 @@ 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"` -svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d'"' -f 2` -echo "Version is $release_version / $svn_version" -info_string="$release_version/$svn_version built on `hostname` by `whoami` on `date`" +revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2` +echo "Version is $release_version / $revision" +info_string="$release_version/$revision built on `hostname` by `whoami` on `date`" echo "Info string is $info_string" # Figure out our CPU type @@ -131,11 +131,11 @@ fi # setup directory structure if [ -z "${BUILDTYPE}" ]; then - APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version} - APP_VER_NAME=${APPNAME}-${release_version}_${svn_version} + APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision} + APP_VER_NAME=${APPNAME}-${release_version}_${revision} else - APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}-${BUILDTYPE} - APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE} + APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}-${BUILDTYPE} + APP_VER_NAME=${APPNAME}-${release_version}_${revision}-${BUILDTYPE} fi APPBIN=$APPDIR/bin @@ -535,7 +535,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%/${svn_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_BUILD%/${revision}/" -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 9abe586868..85cac2ed98 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"` -svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d'"' -f 2` +revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2` -X86_BUNDLE="${APPNAME}_x86-${release_version}_${svn_version}" -X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}_${svn_version}" +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}" @@ -122,22 +122,22 @@ fi if [ -z ${BUILDTYPE} ]; then if [ "${SINGLE_ARCH}" = "T" ]; then if [ "${X86_BUNDLE_OK}" = "T" ]; then - PACKAGE="${APPNAME}_32bit-${release_version}_${svn_version}" + PACKAGE="${APPNAME}_32bit-${release_version}_${revision}" else - PACKAGE="${APPNAME}_64bit-${release_version}_${svn_version}" + PACKAGE="${APPNAME}_64bit-${release_version}_${revision}" fi else - PACKAGE="${APPNAME}-${release_version}_${svn_version}" + PACKAGE="${APPNAME}-${release_version}_${revision}" fi else if [ "${SINGLE_ARCH}" = "T" ]; then if [ "${X86_BUNDLE_OK}" = "T" ]; then - PACKAGE="${APPNAME}_32bit-${release_version}_${svn_version}-${BUILDTYPE}" + PACKAGE="${APPNAME}_32bit-${release_version}_${revision}-${BUILDTYPE}" else - PACKAGE="${APPNAME}_64bit-${release_version}_${svn_version}-${BUILDTYPE}" + PACKAGE="${APPNAME}_64bit-${release_version}_${revision}-${BUILDTYPE}" fi else - PACKAGE="${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE}" + PACKAGE="${APPNAME}-${release_version}_${revision}-${BUILDTYPE}" fi fi |