From 2f79682460a3761a78bc25ddebc7b4952242f394 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 2 Jul 2015 11:20:10 +0200 Subject: [PATCH] separate plugin & channel-strip installation --- tools/linux_packaging/build | 22 ++++++++++----- tools/osx_packaging/osx_build | 38 +++++++++++++++++++++---- tools/x-win/package.sh | 52 +++++++++++++++++++++++++++++------ 3 files changed, 91 insertions(+), 21 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 52d5a927a8..feca650dee 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -22,6 +22,8 @@ if test -z "$CACHEDIR" -o ! -d "$CACHEDIR"; then fi MIXBUS= +WITH_HARRISON_LV2= +WITH_X42_LV2= WITH_LADSPA=0 WITH_HARVID= STRIP=all @@ -52,6 +54,8 @@ while [ $# -gt 0 ] ; do --mixbus) MIXBUS=1; + WITH_HARRISON_LV2=1 ; + WITH_X42_LV2=1 ; WITH_NLS=1 ; WITH_LADSPA=; STRIP=all @@ -575,27 +579,31 @@ done ################################################################################ ### Mixbus plugins, etc -if test -n "$MIXBUS"; then - - echo "Adding Mixbus LADSPA and LV2s" - +if test x$WITH_HARRISON_LV2 != x ; then + echo "Adding Harrison LV2s" mkdir -p $APPLIB/LV2 - mkdir -p $APPLIB/ladspa/strip/ - curl -s -S -# \ + curl -s -S --fail -# \ -z "${CACHEDIR}/harrison_lv2s.${HARCH}.zip" \ -o "${CACHEDIR}/harrison_lv2s.${HARCH}.zip" \ http://www.harrisonconsoles.com/mixbus/mb3/${HARCH}/harrison_lv2s.zip unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/harrison_lv2s.${HARCH}.zip" +fi - curl -s -S -# \ +if test -n "$MIXBUS"; then + echo "Adding Mixbus Channelstrip" + + 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/${HARCH}/harrison_channelstrip.so cp "${CACHEDIR}/harrison_channelstrip.${HARCH}.so" \ $APPLIB/ladspa/strip/harrison_channelstrip.so +fi +if test x$WITH_X42_LV2 != x ; then METERS_VERSION=$(curl -s -S http://gareus.org/x42/linux/x42-meters.latest.txt) rsync -a -q --partial \ rsync://gareus.org/x42/linux/x42-meters-lv2-linux-${WARCH}-${METERS_VERSION}.zip \ diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 757835b1bd..4ca9bc32fa 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -18,6 +18,7 @@ SAE= MIXBUS= WITH_HARVID=1 WITH_HARRISON_LV2= +WITH_X42_LV2= WITH_LADSPA=1 STRIP=1 PRINT_SYSDEPS= @@ -39,11 +40,13 @@ while [ $# -gt 0 ] ; do APPNAME=Ardour ; shift ;; --mixbus) MIXBUS=1; + WITH_HARRISON_LV2=1 ; + WITH_X42_LV2=1 ; WITH_NLS=1 ; SAE= ; WITH_LADSPA=; STRIP= ; - PRODUCT_PKG_DIR=MixBus; + PRODUCT_PKG_DIR=Mixbus; APPNAME=Mixbus ; shift ;; --public) WITH_NLS= ; @@ -571,8 +574,14 @@ if test x$WITH_HARRISON_LV2 != x ; then else OSX_ARCH=osx32 fi - curl -s http://www.harrisonconsoles.com/mixbus/mb3/${OSX_ARCH}/harrison_lv2s.zip \ - | bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf - + curl -s -S --fail -# \ + -z "${CACHEDIR}/harrison_lv2s.${OSX_ARCH}.zip" \ + -o "${CACHEDIR}/harrison_lv2s.${OSX_ARCH}.zip" \ + http://www.harrisonconsoles.com/mixbus/mb3/${OSX_ARCH}/harrison_lv2s.zip + + mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2" + bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \ + "${CACHEDIR}/harrison_lv2s.${OSX_ARCH}.zip" fi if test x$WITH_HARVID != x ; then @@ -605,9 +614,9 @@ if test x$WITH_HARVID != x ; then DMGBACKGROUND=${DMGBACKGROUND}xj fi -################################################################### +################################################################################ ### Mixbus plugins, etc -if test -n "$MIXBUS"; then +if test x$WITH_X42_LV2 != x ; then echo "bundling x42 plugins" if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then OSX_ARCH=x86_64 @@ -642,7 +651,26 @@ if test -n "$MIXBUS"; then lipo -thin ${OSX_ARCH} ${file} -output ${file}.thin mv ${file}.thin ${file} done +fi +if test -n "$MIXBUS"; then + if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then + OSX_ARCH=osx64 + else + OSX_ARCH=osx32 + fi + + echo "deploying harrison tools for $OSX_ARCH" + + mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip" + + curl -s -S --fail -# \ + -z "${CACHEDIR}/harrison_channelstrip.${OSX_ARCH}.so" \ + -o "${CACHEDIR}/harrison_channelstrip.${OSX_ARCH}.so" \ + http://www.harrisonconsoles.com/mixbus/mb3/${OSX_ARCH}/harrison_channelstrip.so + + cp "${CACHEDIR}/harrison_channelstrip.${HARCH}.so" \ + "${PRODUCT_PKG_DIR}/${APPROOT}/lib/ladspa/strip/harrison_channelstrip.so" fi ################################################################################ diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 8a1da07eda..23eef0cd72 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -36,13 +36,21 @@ PROGRAM_VERSION=${major_version} LOWERCASE_DIRNAME=ardour${major_version} STATEFILE_SUFFIX=ardour # see filename_extensions.cc +BIT_SUFFIX="" + if test -n "$MIXBUS"; then - PROGRAM_NAME=Mixbus - PRODUCT_NAME=mixbus + if test "$XARCH" = "x86_64"; then + PROGRAM_NAME=Mixbus + PRODUCT_NAME=mixbus + else + PROGRAM_NAME=Mixbus + PRODUCT_NAME=mixbus + BIT_SUFFIX="(x86)" + fi fi # derived variables -PRODUCT_ID=${PROGRAM_NAME}${PROGRAM_VERSION} +PRODUCT_ID=${PROGRAM_NAME}${PROGRAM_VERSION}${BIT_SUFFIX} PRODUCT_EXE=${PRODUCT_NAME}.exe PRODUCT_ICON=${PRODUCT_NAME}.ico @@ -225,9 +233,11 @@ fi ################################################################################ ### Mixbus plugins, etc -if test -n "$MIXBUS"; then - +if test -n "$MIXBUS"; then # TODO use separate variable mkdir -p $ALIBDIR/LV2 + + echo "Adding x42 Plugins" + METERS_VERSION=$(curl -s -S http://gareus.org/x42/win/x42-meters.latest.txt) rsync -a -q --partial \ rsync://gareus.org/x42/win/x42-meters-lv2-${WARCH}-${METERS_VERSION}.zip \ @@ -245,7 +255,31 @@ if test -n "$MIXBUS"; then rsync://gareus.org/x42/win/x42-midifilter-lv2-${WARCH}-${MIDIFILTER_VERSION}.zip \ "${SRCDIR}/x42-midifilter-lv2-${WARCH}-${MIDIFILTER_VERSION}.zip" unzip -d "$ALIBDIR/LV2/" "${SRCDIR}/x42-midifilter-lv2-${WARCH}-${MIDIFILTER_VERSION}.zip" +fi +if test -n "$MIXBUS"; then # TODO use separate variable + mkdir -p $ALIBDIR/LV2 + + echo "Including Harrison LV2s" + + curl -s -S --fail -# \ + -z "${SRCDIR}/harrison_lv2s.${WARCH}.zip" \ + -o "${SRCDIR}/harrison_lv2s.${WARCH}.zip" \ + http://www.harrisonconsoles.com/mixbus/mb3/${WARCH}/harrison_lv2s.zip + unzip -q -d "$ALIBDIR/LV2/" "${SRCDIR}/harrison_lv2s.${WARCH}.zip" +fi + +if test -n "$MIXBUS"; then + echo "Deploying Harrison Mixbus Channelstrip" + + mkdir -p $ALIBDIR/ladspa/strip + curl -s -S --fail -# \ + -z "${SRCDIR}/harrison_channelstrip.${WARCH}.dll" \ + -o "${SRCDIR}/harrison_channelstrip.${WARCH}.dll" \ + http://www.harrisonconsoles.com/mixbus/mb3/${WARCH}/harrison_channelstrip.dll + + cp "${SRCDIR}/harrison_channelstrip.${WARCH}.dll" \ + "$ALIBDIR/ladspa/strip/rrison_channelstrip.dll" fi ################################################################################ @@ -290,10 +324,10 @@ if test -n "$MIXBUS"; then # TODO: proper welcome/finish text. cat >> $NSISFILE << EOF -!define MUI_FINISHPAGE_TITLE "Welcome to Mixbus" -!define MUI_FINISHPAGE_TEXT "Thank you for choosing Harrison Mixbus." -!define MUI_FINISHPAGE_LINK "Harrison Consoles Website" -!define MUI_FINISHPAGE_LINK_LOCATION "http://harrisonconsoles.com" +!define MUI_FINISHPAGE_TITLE "Welcome to Harrison Mixbus" +!define MUI_FINISHPAGE_TEXT "Thanks for your purchase of Mixbus!\$\\r\$\\nYou will find the Mixbus application in the Start Menu (or the All Apps panel for Windows 8) \$\\r\$\\nClick the link below to view the Mixbus manual, and learn ways to get involved with the Mixbus community." +!define MUI_FINISHPAGE_LINK "Mixbus Manual" +!define MUI_FINISHPAGE_LINK_LOCATION "http://www.harrisonconsoles.com/mixbus/mixbus3-live-manual" !define MUI_FINISHPAGE_NOREBOOTSUPPORT EOF