From bad7dcbfa5c8169b99ea3babe785a3ad20cf45c0 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 23 Sep 2016 00:47:33 +0200
Subject: Make bundle DSP URI configurable and version/variant independent

---
 tools/linux_packaging/build   | 7 ++++---
 tools/osx_packaging/osx_build | 7 ++++---
 tools/x-win/package.sh        | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'tools')

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 00d7962014..5016aff062 100755
--- 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 c499638caa..81e15fce44 100755
--- 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 9f2f7ee19e..57c8eef1b6 100755
--- 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"
-- 
cgit v1.2.3