diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 2a109f77fc..16e7771214 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -20,6 +20,7 @@ fi MIXBUS= WITH_HARRISON_LV2= +WITH_HARRISON_VBM= WITH_COMMERCIAL_X42_LV2= WITH_GRATIS_X42_LV2= WITH_GMSYNYTH= @@ -33,6 +34,7 @@ VENDOR=Ardour ; EXENAME=ardour BUILDTYPE="" NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libevoral" +X42PLUGINS="x42-autotune x42-midifilter x42-stereoroute setBfree x42-avldrums x42-limiter x42-tuner" : ${HARRISONCHANNELSTRIP=harrison_channelstrip} : ${HARRISONLV2=harrison_lv2s-n} @@ -75,6 +77,20 @@ while [ $# -gt 0 ] ; do WITH_NLS=1 ; APPNAME=LiveTrax ; shift ;; + --vbm) + VBM=1 + WITH_HARRISON_LV2=1 ; + WITH_HARRISON_VBM=1 ; + WITH_COMMERCIAL_X42_LV2=1 + WITH_GRATIS_X42_LV2=1 + WITH_NLS=1 ; + STRIP=all + APPNAME=MixbusVBM ; + VENDOR=Harrison ; + EXENAME=mixbusvbm ; + major_version="" + X42PLUGINS="$X42PLUGINS x42-testsignal x42-nodelay" + shift ;; --public) WITH_HARRISON_LV2=1 ; WITH_GMSYNYTH=1 @@ -710,6 +726,17 @@ if test x$WITH_HARRISON_LV2 != x ; then unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip" fi +if test x$WITH_HARRISON_VBM != x ; then + echo "Including Harrison VBM Channelstrip LV2" + mkdir -p $APPLIB/LV2 + + curl -s -S --fail -# \ + -z "${CACHEDIR}/harrison_vbm.${HARCH}.zip" \ + -o "${CACHEDIR}/harrison_vbm.${HARCH}.zip" \ + "${HARRISONDSPURL}/harrison_vbm.${HARCH}.zip" + unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/harrison_vbm.${HARCH}.zip" +fi + if test -n "$MIXBUS"; then echo "Adding Mixbus Channelstrip" @@ -746,7 +773,7 @@ if test -n "$MIXBUS"; then rm -f "${MediaClips}/"*.* unzip -q -o -d "${MediaClips}" "${CACHEDIR}/MixbusBundledMedia.zip" fi -elif test -z "$LIVETRAX"; then +elif test -z "$LIVETRAX" -a -z "$VBM"; then echo "Fetching Ardour bundled content" curl -s -S --fail -# \ @@ -798,7 +825,17 @@ if test x$WITH_GRATIS_X42_LV2 != x ; then echo "Adding gratis x42 Plugins" - for proj in x42-autotune x42-midifilter x42-stereoroute setBfree x42-avldrums x42-limiter x42-tuner; do + for proj in $X42PLUGINS; do + + if test -n "$VBM"; then + if test "$proj" = "setBfree"; then + continue + fi + if test "$proj" = "x42-avldrums"; then + continue + fi + fi + X42_VERSION=$(curl -s -S http://x42-plugins.com/x42/linux/${proj}.latest.txt) rsync -a -q --partial \ rsync://x42-plugins.com/x42/linux/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip \ diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 6938b7a66a..4951526454 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -14,15 +14,18 @@ fi mkdir -p "$CACHEDIR" MIXBUS= +VBM= WITH_HARVID=1 WITH_XJADEO=1 WITH_HARRISON_LV2= +WITH_HARRISON_VBM= WITH_COMMERCIAL_X42_LV2= WITH_GRATIS_X42_LV2= WITH_GMSYNTH= STRIP=1 PRINT_SYSDEPS= WITH_NLS=1 +X42PLUGINS="x42-autotune x42-midifilter x42-stereoroute setBfree x42-avldrums x42-limiter x42-tuner" : ${HARRISONCHANNELSTRIP=harrison_channelstrip} : ${HARRISONLV2=harrison_lv2s-n} @@ -58,6 +61,19 @@ while [ $# -gt 0 ] ; do lower_case_appname=livetrax; BUNDLE_ID_BASE=com.harrisonconsoles shift ;; + --vbm) + VBM=1 + WITH_HARRISON_LV2=1 ; + WITH_HARRISON_VBM=1 ; + WITH_COMMERCIAL_X42_LV2=1 + WITH_GRATIS_X42_LV2=1 + STRIP= ; + PRODUCT_PKG_DIR=MixbusVBM; + lower_case_appname=mixbusvbm; + APPNAME=MixbusVBM ; + BUNDLENAME=MixbusVBM${major_version} ; + X42PLUGINS="$X42PLUGINS x42-testsignal x42-nodelay" + shift ;; --public) WITH_HARRISON_LV2=1 ; WITH_GMSYNTH=1 @@ -170,10 +186,13 @@ mkdir -p $ExportFormats mkdir -p $Etc mkdir -p $MackieControl mkdir -p $OSC -mkdir -p $PatchFiles mkdir -p $LuaScripts mkdir -p $Themes +if test -z "$VBM"; then +mkdir -p $PatchFiles +fi + EXECUTABLE=${BUNDLENAME} # @@ -233,6 +252,8 @@ if test x$MIXBUS != x ; then cp Mixbus.icns $Resources/appIcon.icns elif test x$LIVETRAX != x ; then cp LiveTrax.icns $Resources/appIcon.icns +elif test x$VBM != x ; then + cp MixbusVBM.icns $Resources/appIcon.icns else cp Ardour.icns $Resources/appIcon.icns fi @@ -345,9 +366,11 @@ done # MIDNAM Patch Files # got to be careful with names here -for x in $BUILD_ROOT/../share/patchfiles/*.midnam ; do - cp "$x" $PatchFiles -done +if test -z "$VBM"; then + for x in $BUILD_ROOT/../share/patchfiles/*.midnam ; do + cp "$x" $PatchFiles + done +fi # Lua Script Files # got to be careful with names here @@ -635,11 +658,11 @@ mkdir $PRODUCT_PKG_DIR DMGWINBOTTOM=440 DMGBACKGROUND=dmgbg -if test -n "$MIXBUS" -o -n "$LIVETRAX"; then +if test -n "$MIXBUS" -o -n "$LIVETRAX" -o -n "$VBM" ; then DMGBACKGROUND=dmgbgMB fi -echo "Creating Mixbus packaging directory" +echo "Creating $APPNAME packaging directory" mv $APPDIR $PRODUCT_PKG_DIR/ ################################################################################ @@ -692,6 +715,17 @@ if test x$WITH_HARRISON_LV2 != x ; then "${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip" fi +if test x$WITH_HARRISON_VBM != x ; then + curl -s -S --fail -# \ + -z "${CACHEDIR}/harrison_vbm.${OSX_BENSID}.zip" \ + -o "${CACHEDIR}/harrison_vbm.${OSX_BENSID}.zip" \ + "${HARRISONDSPURL}/harrison_vbm.${OSX_BENSID}.zip" + + mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2" + bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \ + "${CACHEDIR}/harrison_vbm.${OSX_BENSID}.zip" +fi + if test x$WITH_HARVID != x ; then echo "installing harvid..." HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt) @@ -768,7 +802,17 @@ if test x$WITH_GRATIS_X42_LV2 != x ; then echo "Adding gratis x42 plugins" mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2" - for proj in x42-autotune x42-midifilter x42-stereoroute setBfree x42-avldrums x42-limiter x42-tuner; do + for proj in $X42PLUGINS; do + + if test -n "$VBM"; then + if test "$proj" = "setBfree"; then + continue + fi + if test "$proj" = "x42-avldrums"; then + continue + fi + fi + X42_VERSION=$(curl -s -S http://${OSX_X42URI}/${proj}.latest.txt) rsync -a -q --partial \ rsync://${OSX_X42URI}/${proj}-lv2-${OSX_X42ID}-${X42_VERSION}.zip \ @@ -821,7 +865,7 @@ if test -n "$MIXBUS"; then bsdtar -C "${PRODUCT_PKG_DIR}/${MediaClips}" -xf \ "${CACHEDIR}/MixbusBundledMedia.zip" fi -elif test -z "$LIVETRAX"; then +elif test -z "$LIVETRAX" -a -z "$VBM" ; then echo "Fetching Ardour bundled content" curl -s -S --fail -# \ -z "${CACHEDIR}/ArdourBundledMedia.zip" \ diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 715bac1d01..3b192d722c 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -30,12 +30,14 @@ PROGRAM_VERSION=${major_version} PRODUCT_NAME=Ardour PRODUCT_VERSION=${major_version} -WITH_HARRISON_LV2=1 ; +WITH_HARRISON_LV2=1 +WITH_HARRISON_VBM= WITH_COMMERCIAL_X42_LV2= WITH_GRATIS_X42_LV2= WITH_GMSYNTH=1 WITH_HARVID=1 WITH_XJADEO=1 +X42PLUGINS="x42-autotune x42-midifilter x42-stereoroute setBfree x42-avldrums x42-limiter x42-tuner" # TODO: grep from build/config.log instead while [ $# -gt 0 ] ; do @@ -61,6 +63,20 @@ while [ $# -gt 0 ] ; do PRODUCT_NAME=LiveTrax MANUAL_URL="https://rsrc.harrisonconsoles.com/livetrax/livetrax-live-manual/" shift ;; + --vbm) + VBM=1 + WITH_HARRISON_LV2=1 ; + WITH_HARRISON_VBM=1 ; + WITH_COMMERCIAL_X42_LV2=1 + WITH_GRATIS_X42_LV2=1 + WITH_GMSYNTH="" ; + PRODUCT_NAME=MixbusVBM + PROGRAM_KEY=MixbusVBM + PROGRAM_NAME=MixbusVBM-${PROGRAM_VERSION} + PROGRAM_VERSION="" + MANUAL_NAME="mixbusvbm-${major_version}-live-manual" + X42PLUGINS="$X42PLUGINS x42-testsignal x42-nodelay" + shift ;; --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;; esac done @@ -338,7 +354,17 @@ if test x$WITH_GRATIS_X42_LV2 != x ; then echo "Adding gratis x42 Plugins" - for proj in x42-autotune x42-midifilter x42-stereoroute setBfree x42-avldrums x42-limiter x42-tuner; do + for proj in $X42PLUGINS; do + + if test -n "$VBM"; then + if test "$proj" = "setBfree"; then + continue + fi + if test "$proj" = "x42-avldrums"; then + continue + fi + fi + X42_VERSION=$(curl -s -S http://x42-plugins.com/x42/win/${proj}.latest.txt) rsync -a -q --partial \ rsync://x42-plugins.com/x42/win/${proj}-lv2-${WARCH}-${X42_VERSION}.zip \ @@ -359,6 +385,21 @@ if test x$WITH_HARRISON_LV2 != x ; then unzip -q -d "$DESTDIR/LV2/" "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip" fi +if test x$WITH_HARRISON_VBM != x ; then + mkdir -p $DESTDIR/LV2 + + echo "Including Harrison VBM Channelstrip LV2" + + curl -s -S --fail -# \ + -z "${SRCCACHE}/harrison_vbm.${WARCH}.zip" \ + -o "${SRCCACHE}/harrison_vbm.${WARCH}.zip" \ + "${HARRISONDSPURL}/harrison_vbm.${WARCH}.zip" + unzip -q -d "$DESTDIR/LV2/" "${SRCCACHE}/harrison_vbm.${WARCH}.zip" + + # use mingw-11 gcc-12's libstdc++-6.dll (channelstrip compat) + cp -v "${SRCCACHE}/libstdc++-6.dll" $DESTDIR/bin/ +fi + if test -n "$MIXBUS"; then echo "Deploying Harrison Mixbus Channelstrip" @@ -392,7 +433,7 @@ if test -n "$MIXBUS"; then rm -f $DESTDIR/share/${LOWERCASE_DIRNAME}/media/*.* unzip -q -o -d "$DESTDIR/share/${LOWERCASE_DIRNAME}/media/" "${SRCCACHE}/MixbusBundledMedia.zip" fi -elif test -z "$LIVETRAX"; then +elif test -z "$LIVETRAX" -a -z "$VBM"; then echo "Fetching Ardour bundled media" curl -s -S --fail -# \ -z "${SRCCACHE}/ArdourBundledMedia.zip" \ @@ -465,7 +506,7 @@ InstallDirRegKey HKLM "Software\\${PRODUCT_NAME}\\${PRODUCT_ID}\\$WARCH" "Instal EOF -if test -n "$MIXBUS" -o -n "$LIVETRAX" ; then +if test -n "$MIXBUS" -o -n "$LIVETRAX" -o -n "$VBM"; then # TODO: proper welcome/finish text. cat >> $NSISFILE << EOF @@ -534,7 +575,7 @@ EOF fi if test x$WITH_HARRISON_LV2 != x ; then -if test -n "$MIXBUS"; then +if [ -n "$MIXBUS" ] || [ -n "$VBM" ]; then cat >> $NSISFILE << EOF Section "Harrison XT plugins (required)" SecXT SectionIn RO