Make bundle DSP URI configurable and version/variant independent

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 00d79620149339a04bad858a965b995ba6a9e6fa..5016aff0625b1f5d340dc154d41106bf52674791 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -38,6 +38,7 @@ NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libe
 
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
 : ${HARRISONLV2=harrison_lv2s-n}
+: ${HARRISONDSPURL=http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp}
 
 if [ $# -eq 0 ] ; then
        echo ""
@@ -630,7 +631,7 @@ if test x$WITH_HARRISON_LV2 != x ; then
        curl -s -S --fail -# \
                -z "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip" \
                -o "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip" \
-               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONLV2}.${HARCH}.zip"
+               "${HARRISONDSPURL}/${HARRISONLV2}.${HARCH}.zip"
        unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip"
 fi
 
@@ -641,7 +642,7 @@ if test -n "$MIXBUS"; then
        curl -s -S --fail -# \
                -z "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
                -o "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
-               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONCHANNELSTRIP}.${HARCH}.so"
+               "${HARRISONDSPURL}/${HARRISONCHANNELSTRIP}.${HARCH}.so"
 
        cp "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
                $APPLIB/ladspa/strip/${HARRISONCHANNELSTRIP}.so
@@ -657,7 +658,7 @@ if test -n "$MIXBUS"; then
        curl -s -S --fail -# \
                -z "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
                -o "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
-               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_vamp.${VAMPARCH}.so"
+               "${HARRISONDSPURL}/harrison_vamp.${VAMPARCH}.so"
 
        cp "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
                $APPLIB/harrison_vamp.so

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index c499638caa065c3a0a8e8b8d62cf306984d7ab4e..81e15fce44edcce7777dc49178d205f5959aed70 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -26,6 +26,7 @@ WITH_NLS=
 
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
 : ${HARRISONLV2=harrison_lv2s-n}
+: ${HARRISONDSPURL=http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp}
 
 . ../define_versions.sh
 
@@ -609,7 +610,7 @@ if test x$WITH_HARRISON_LV2 != x ; then
        curl -s -S --fail -#  \
                -z "${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip" \
                -o "${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip" \
-               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONLV2}.${OSX_BENSID}.zip"
+               "${HARRISONDSPURL}/${HARRISONLV2}.${OSX_BENSID}.zip"
 
        mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2"
        bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
@@ -683,7 +684,7 @@ if test -n "$MIXBUS"; then
        curl -s -S --fail -#  \
                -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"
+               "${HARRISONDSPURL}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so"
 
        cp "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${OSX_BENSID}.so" \
                "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip/${HARRISONCHANNELSTRIP}.so"
@@ -693,7 +694,7 @@ if test -n "$MIXBUS"; then
        curl -s -S --fail -#  \
                -z "${CACHEDIR}/harrison_vamp.${OSX_BENSID}.dylib" \
                -o "${CACHEDIR}/harrison_vamp.${OSX_BENSID}.dylib" \
-               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_vamp.${OSX_BENSID}.dylib"
+               "${HARRISONDSPURL}/harrison_vamp.${OSX_BENSID}.dylib"
 
        cp "${CACHEDIR}/harrison_vamp.${OSX_BENSID}.dylib" \
                "${PRODUCT_PKG_DIR}/${APPROOT}/lib/harrison_vamp.dylib"

diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 9f2f7ee19e333e41e8b0ee819fce901ac111a7ba..57c8eef1b60ef898bd79b12f4d0448eae3d10f60 100755 (executable)
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -19,6 +19,7 @@ test -f gtk2_ardour/wscript || exit 1
 
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
 : ${HARRISONLV2=harrison_lv2s-n}
+: ${HARRISONDSPURL=http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp}
 
 # see also wscript, video_tool_paths.cc, bundle_env_mingw.cc
 # registry keys based on this are used there
@@ -269,7 +270,7 @@ if test x$WITH_HARRISON_LV2 != x ; then
        curl -s -S --fail -# \
                -z "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip" \
                -o "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip" \
-               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONLV2}.${WARCH}.zip"
+               "${HARRISONDSPURL}/${HARRISONLV2}.${WARCH}.zip"
        unzip -q -d "$ALIBDIR/LV2/" "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip"
 fi
 
@@ -280,7 +281,7 @@ if test -n "$MIXBUS"; then
        curl -s -S --fail -# \
                -z "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \
                -o "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \
-               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONCHANNELSTRIP}.${WARCH}.dll"
+               "${HARRISONDSPURL}/${HARRISONCHANNELSTRIP}.${WARCH}.dll"
 
        cp "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \
                "$ALIBDIR/ladspa/strip/${HARRISONCHANNELSTRIP}.dll"
@@ -290,7 +291,7 @@ if test -n "$MIXBUS"; then
        curl -s -S --fail -# \
                -z "${SRCCACHE}/harrison_vamp.${WARCH}.dll" \
                -o "${SRCCACHE}/harrison_vamp.${WARCH}.dll" \
-               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_vamp.${WARCH}.dll"
+               "${HARRISONDSPURL}/harrison_vamp.${WARCH}.dll"
 
        cp "${SRCCACHE}/harrison_vamp.${WARCH}.dll" \
                "$ALIBDIR/vamp/harrison_vamp.dll"