From b1795550f305b5c01e11959dea3e68b9478ba87a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 26 Feb 2015 00:55:55 +0100 Subject: [PATCH] include x42 plugins in mixbus bundle --- tools/linux_packaging/build | 30 ++++++++++++++++++++++++++++++ tools/osx_packaging/osx_build | 34 +++++++++++++++++++++++++++++++++- tools/x-win/package.sh | 25 +++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 1 deletion(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 5854229fe5..3bddd16b6b 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -110,12 +110,14 @@ case `uname -m` in i[3456789]86|x86|i86pc) echo "Architecture is x86" ARCH='x86' + WARCH='i386' ARCH_BITS='32-bit' MULTIARCH='i386-linux-gnu' ;; x86_64|amd64|AMD64) echo "Architecture is x86_64" ARCH='x86_64' + WARCH='x86_64' ARCH_BITS='64-bit' MULTIARCH='x86_64-linux-gnu' ;; @@ -581,6 +583,34 @@ for svndir in `find $APPDIR -name .svn -type d`; do rm -rf $svndir done + +################################################################################ +### Mixbus plugins, etc +if test -n "$MIXBUS"; then + + mkdir -p $APPLIB/LV2 + 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-${WARCH}-${METERS_VERSION}.zip \ + "${SRCDIR}/x42-meters-lv2-linux-${WARCH}-${METERS_VERSION}.zip" + unzip -d "$APPLIB/LV2/" "${SRCDIR}/x42-meters-lv2-linux-${WARCH}-${METERS_VERSION}.zip" + + SETBFREE_VERSION=$(curl -s -S http://gareus.org/x42/linux/setBfree.latest.txt) + rsync -a -q --partial \ + rsync://gareus.org/x42/linux/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip \ + "${SRCDIR}/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip" + unzip -d "$APPLIB/LV2/" "${SRCDIR}/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip" + + MIDIFILTER_VERSION=$(curl -s -S http://gareus.org/x42/linux/x42-midifilter.latest.txt) + rsync -a -q --partial \ + rsync://gareus.org/x42/linux/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip \ + "${SRCDIR}/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip" + unzip -d "$APPLIB/LV2/" "${SRCDIR}/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip" + +fi +################################################################################ + + if test x$WITH_HARVID != x ; then cd $APPBIN HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt) diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 300a731799..9e138f176c 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -171,7 +171,7 @@ if test x$SAE != x ; then env="$envARDOUR_KEYBOARD_LAYOUTde-nokeypad" env="$envARDOUR_UI_CONFardour3_ui_sae.conf" elif test x$MIXBUS != x ; then - appname="Ardour3/Mixbus" + appname="Mixbus" env="$envARDOUR_MIXBUStrue" # # current default for MIXBUS version is US keyboard layout without a keypad @@ -615,6 +615,38 @@ if test x$WITH_HARVID != x ; then DMGBACKGROUND=${DMGBACKGROUND}xj fi +################################################################### +### Mixbus plugins, etc +if test -n "$MIXBUS"; then + if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then + OSX_ARCH=x86_64 + else + OSX_ARCH=i386 + fi + + mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2" + + # TODO use rsync://gareus.org/x42/ and cache locally - see harvid/xjadeo below + METERS_VERSION=$(curl -s -S http://gareus.org/x42/osx/x42-meters.latest.txt) + curl -s http://gareus.org/x42/osx/x42-meters-lv2-osx-${METERS_VERSION}.zip \ + | bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf - + + SETBFREE_VERSION=$(curl -s -S http://gareus.org/x42/osx/setBfree.latest.txt) + curl -s http://gareus.org/x42/osx/setBfree-lv2-osx-${SETBFREE_VERSION}.zip \ + | bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf - + + MIDIFILTER_VERSION=$(curl -s -S http://gareus.org/x42/osx/x42-midifilter.latest.txt) + curl -s http://gareus.org/x42/osx/x42-midifilter-lv2-osx-${MIDIFILTER_VERSION}.zip \ + | bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf - + + for file in ${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/*/.dylib ; do + lipo -thin ${OSX_ARCH} ${file} -output ${file}.thin + mv ${file}.thin ${file} + done + +fi +################################################################################ + ( cd $PRODUCT_PKG_DIR ; find . ) > file_list.txt echo "Building DMG ..." diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 14199b95aa..8c66174954 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -211,6 +211,31 @@ else VERSIONINFO="Optimized Version." fi +################################################################################ +### Mixbus plugins, etc +if test -n "$MIXBUS"; then + + mkdir -p $ALIBDIR/LV2 + 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 \ + "${SRCDIR}/x42-meters-lv2-${WARCH}-${METERS_VERSION}.zip" + unzip -d "$ALIBDIR/LV2/" "${SRCDIR}/x42-meters-lv2-${WARCH}-${METERS_VERSION}.zip" + + SETBFREE_VERSION=$(curl -s -S http://gareus.org/x42/win/setBfree.latest.txt) + rsync -a -q --partial \ + rsync://gareus.org/x42/win/setBfree-lv2-${WARCH}-${SETBFREE_VERSION}.zip \ + "${SRCDIR}/setBfree-lv2-${WARCH}-${SETBFREE_VERSION}.zip" + unzip -d "$ALIBDIR/LV2/" "${SRCDIR}/setBfree-lv2-${WARCH}-${SETBFREE_VERSION}.zip" + + MIDIFILTER_VERSION=$(curl -s -S http://gareus.org/x42/win/x42-midifilter.latest.txt) + rsync -a -q --partial \ + 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 + ################################################################################ echo " === Preparing Windows Installer" NSISFILE=$DESTDIR/a3.nsis