From 0481b10d97fa13179807714f63cd6a00d577f3c5 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 17 Jan 2022 19:50:34 +0100 Subject: [PATCH] Bundle Mixbus Media --- tools/linux_packaging/build | 12 ++++++++++++ tools/osx_packaging/osx_build | 23 ++++++++++++++++++++++- tools/x-win/package.sh | 12 ++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 8351ab3220..ed1c16c404 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -730,6 +730,18 @@ if test -n "$MIXBUS"; then cp "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \ $APPLIB/harrison_vamp.so chmod +x $APPLIB/harrison_vamp.so + + # Mixbus Bundled Media Content + curl -s -S --fail -# \ + -z "${CACHEDIR}/MixbusBundledMedia.zip" \ + -o "${CACHEDIR}/MixbusBundledMedia.zip" \ + "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + + if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then + echo "Adding Mixbus Bundled Content" + rm -f "${MediaClips}/"*.* + unzip -q -d "${MediaClips}" "${CACHEDIR}/MixbusBundledMedia.zip" + fi fi if true ; then diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 8a4d450b5c..a53bc652c1 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -172,10 +172,10 @@ mkdir -p $MackieControl mkdir -p $OSC mkdir -p $PatchFiles mkdir -p $LuaScripts +mkdir -p $MediaClips mkdir -p $Themes - EXECUTABLE=${BUNDLENAME} # @@ -362,6 +362,10 @@ done cp -R $BUILD_ROOT/../share/web_surfaces $WebSurfaces rm $WebSurfaces/wscript +# recusively copy clips/media +cp -a $BUILD_ROOT/../share/media $MediaClips +rm $MediaClips/wscript + # MackieControl data # got to be careful with names here for x in $BUILD_ROOT/../share/mcp/*.device $BUILD_ROOT/../share/mcp/*.profile ; do @@ -640,6 +644,10 @@ else fi +################################################################################ +# from here on $PRODUCT_PKG_DIR/ prefix is needed +################################################################################ + DMG_ARCH="" if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then OSX_ARCH=x86_64 @@ -792,6 +800,19 @@ if test -n "$MIXBUS"; then cp "${CACHEDIR}/harrison_vamp.${OSX_BENSID}.dylib" \ "${PRODUCT_PKG_DIR}/${APPROOT}/lib/harrison_vamp.dylib" + + # Mixbus Bundled Media Content + curl -s -S --fail -# \ + -z "${CACHEDIR}/MixbusBundledMedia.zip" \ + -o "${CACHEDIR}/MixbusBundledMedia.zip" \ + "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + + if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then + echo "Adding Mixbus Bundled Content" + rm -f "${PRODUCT_PKG_DIR}/${MediaClips}/"*.* + bsdtar -C "${PRODUCT_PKG_DIR}/${MediaClips}" -xf \ + "${CACHEDIR}/MixbusBundledMedia.zip" + fi fi ################################################################################ diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 7186ba42d8..915217dcf9 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -350,6 +350,18 @@ if test -n "$MIXBUS"; then cp "${SRCCACHE}/harrison_vamp.${WARCH}.dll" \ "$ALIBDIR/vamp/harrison_vamp.dll" + + # Mixbus Bundled Media Content + curl -s -S --fail -# \ + -z "${SRCCACHE}/MixbusBundledMedia.zip" \ + -o "${SRCCACHE}/MixbusBundledMedia.zip" \ + "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + + if test -f "${SRCCACHE}/MixbusBundledMedia.zip"; then + echo "Adding Mixbus Bundled Content" + rm -f $DESTDIR/share/media/*.* + unzip -q -d "$DESTDIR/share/media/" "${SRCCACHE}/MixbusBundledMedia.zip" + fi fi ################################################################################