From 3ed9a712b9fbff3eae784abd887f9a8ddbcd99e0 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 18 Sep 2020 18:54:45 +0200
Subject: [PATCH] Bundle VST3 scanner with binary packages

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

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 184d2021f8..e5c8f3e7e8 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -447,8 +447,10 @@ fi
 #  neither binary nor script exists)
 if test -d $BUILD_ROOT/libs/fst ; then
     cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $APPLIB || true
+    cp $BUILD_ROOT/libs/fst/ardour-vst3-scanner* $APPLIB || true
     if test x$STRIP = xall ; then
         strip -s $APPLIB/ardour-vst-scanner*
+        strip -s $APPLIB/ardour-vst3-scanner*
     fi
 fi
 
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index fe844e7104..786c82731e 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -397,7 +397,8 @@ fi
 
 # VST scanner app and wrapper script, if they exist
 if test -d $BUILD_ROOT/libs/fst ; then
-	cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/
+	cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/ || true
+	cp $BUILD_ROOT/libs/fst/ardour-vst3-scanner* $Frameworks/ || true
 fi
 
 # vfork wrapper
@@ -550,6 +551,10 @@ if test -f "$Frameworks/ardour-vst-scanner"; then
 	executables="$executables ../lib/ardour-vst-scanner"
 fi
 
+if test -f "$Frameworks/ardour-vst3-scanner"; then
+	executables="$executables ../lib/ardour-vst3-scanner"
+fi
+
 for exe in $executables; do
 	echo "Processing Executable: $exe"
 	EXE=$APPROOT/MacOS/$exe
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 79d9cf7b72..484a9e7766 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -146,6 +146,7 @@ cp build/libs/pbd/pbd-*.dll $DESTDIR/bin/
 cp build/libs/ptformat/ptformat-*.dll $DESTDIR/bin/
 cp build/libs/audiographer/audiographer-*.dll $DESTDIR/bin/
 cp build/libs/fst/ardour-vst-scanner.exe $DESTDIR/bin/ || true
+cp build/libs/fst/ardour-vst3-scanner.exe $DESTDIR/bin/ || true
 cp build/session_utils/*-*.exe $DESTDIR/bin/ || true
 cp build/luasession/ardour6-lua.exe $DESTDIR/bin/ || true
 cp `ls -t build/gtk2_ardour/ardour-*.exe | head -n1` $DESTDIR/bin/${PRODUCT_EXE}