From a9a6d6da4e4990833d6b00b6415c2ed8d038ddda Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 7 Apr 2016 22:27:03 +0200 Subject: [PATCH] variable for packaging channelstrip. allow rename --- tools/linux_packaging/build | 14 ++++++++------ tools/osx_packaging/osx_build | 12 +++++++----- tools/x-win/package.sh | 12 +++++++----- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index ceae9a9732..c753347fcf 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -36,6 +36,7 @@ GCC5ABI=false USEWINE=false BUILDTYPE="" NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libevoral" +: ${HARRISONCHANNELSTRIP=harrison_channelstrip} if [ $# -eq 0 ] ; then @@ -90,6 +91,7 @@ while [ $# -gt 0 ] ; do --nls) WITH_NLS=1 ; shift ;; --harvid) WITH_HARVID=1 ; shift ;; --gcc5abi) GCC5ABI=true ; shift ;; + --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;; *) #catch all for unknown arguments @@ -625,13 +627,13 @@ if test -n "$MIXBUS"; then mkdir -p $APPLIB/ladspa/strip/ curl -s -S --fail -# \ - -z "${CACHEDIR}/harrison_channelstrip.${HARCH}.so" \ - -o "${CACHEDIR}/harrison_channelstrip.${HARCH}.so" \ - "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_channelstrip.${HARCH}.so" + -z "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \ + -o "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \ + "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONCHANNELSTRIP}.${HARCH}.so" - cp "${CACHEDIR}/harrison_channelstrip.${HARCH}.so" \ - $APPLIB/ladspa/strip/harrison_channelstrip.so - chmod +x $APPLIB/ladspa/strip/harrison_channelstrip.so + cp "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \ + $APPLIB/ladspa/strip/${HARRISONCHANNELSTRIP}.so + chmod +x $APPLIB/ladspa/strip/${HARRISONCHANNELSTRIP}.so fi if test x$WITH_X42_LV2 != x ; then diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index ca3db40ea3..67a2043021 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -23,6 +23,7 @@ WITH_LADSPA=1 STRIP=1 PRINT_SYSDEPS= WITH_NLS= +: ${HARRISONCHANNELSTRIP=harrison_channelstrip} while [ $# -gt 0 ] ; do echo "arg = $1" @@ -71,6 +72,7 @@ while [ $# -gt 0 ] ; do --nostrip) STRIP= ; shift ;; --sysdeps) PRINT_SYSDEPS=1; shift ;; --nls) WITH_NLS=1 ; shift ;; + --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;; esac done @@ -688,12 +690,12 @@ if test -n "$MIXBUS"; then mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip" curl -s -S --fail -# \ - -z "${CACHEDIR}/harrison_channelstrip.${OSX_BENSID}.so" \ - -o "${CACHEDIR}/harrison_channelstrip.${OSX_BENSID}.so" \ - "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_channelstrip.${OSX_BENSID}.so" + -z "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \ + -o "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \ + "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" - cp "${CACHEDIR}/harrison_channelstrip.${OSX_BENSID}.so" \ - "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip/harrison_channelstrip.so" + cp "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \ + "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip/${HARRISONCHANNELSTRIP}.so" fi ################################################################################ diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index fb525844f8..62cb5a78e8 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -16,6 +16,7 @@ test -f gtk2_ardour/wscript || exit 1 : ${MAKEFLAGS=-j4} : ${TMPDIR=/var/tmp} : ${SRCCACHE=/var/tmp/winsrc} # source-code tgz cache +: ${HARRISONCHANNELSTRIP=harrison_channelstrip} # TODO: grep from build/config.log instead while [ $# -gt 0 ] ; do @@ -26,6 +27,7 @@ while [ $# -gt 0 ] ; do WITH_HARRISON_LV2=1 ; WITH_X42_LV2=1 ; shift ;; + --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;; esac done @@ -275,12 +277,12 @@ if test -n "$MIXBUS"; then mkdir -p $ALIBDIR/ladspa/strip curl -s -S --fail -# \ - -z "${SRCCACHE}/harrison_channelstrip.${WARCH}.dll" \ - -o "${SRCCACHE}/harrison_channelstrip.${WARCH}.dll" \ - "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_channelstrip.${WARCH}.dll" + -z "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \ + -o "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \ + "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONCHANNELSTRIP}.${WARCH}.dll" - cp "${SRCCACHE}/harrison_channelstrip.${WARCH}.dll" \ - "$ALIBDIR/ladspa/strip/harrison_channelstrip.dll" + cp "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \ + "$ALIBDIR/ladspa/strip/${HARRISONCHANNELSTRIP}.dll" fi ( cd $DESTDIR ; find . ) > ${TMPDIR}/file_list.txt