Added LV2 libs and bundled LV2 plugins to windows packaging scripts

7 files changed, 26 insertions, 4 deletions

diff --git a/tools/windows_packaging/configure-debug.sh b/tools/windows_packaging/configure-debug.sh
index bcee29deba..ecfcaab6fd 100755
--- a/tools/windows_packaging/configure-debug.sh
+++ b/tools/windows_packaging/configure-debug.sh
@@ -5,4 +5,4 @@
 . ./print-env.sh
 
 cd $BASE || exit 1
-./waf configure --prefix="/" --bindir="/" --configdir="/share" --noconfirm --no-lv2 --test --single-tests --dist-target=mingw "$@"
+./waf configure --prefix="/" --bindir="/" --configdir="/share" --noconfirm --test --single-tests --dist-target=mingw "$@"
diff --git a/tools/windows_packaging/configure-distcc-debug.sh b/tools/windows_packaging/configure-distcc-debug.sh
index 501e849860..5855f1fbee 100755
--- a/tools/windows_packaging/configure-distcc-debug.sh
+++ b/tools/windows_packaging/configure-distcc-debug.sh
@@ -9,4 +9,4 @@ export CXX="distcc $HOST-g++"
 . ./print-env.sh
 
 cd $BASE || exit 1
-./waf configure --prefix="/" --bindir="/" --configdir="/share" --noconfirm --no-lv2 --test --single-tests --dist-target=mingw "$@"
+./waf configure --prefix="/" --bindir="/" --configdir="/share" --noconfirm --test --single-tests --dist-target=mingw "$@"
diff --git a/tools/windows_packaging/configure-distcc-release.sh b/tools/windows_packaging/configure-distcc-release.sh
index 19cabf9c44..50d1ec37b5 100755
--- a/tools/windows_packaging/configure-distcc-release.sh
+++ b/tools/windows_packaging/configure-distcc-release.sh
@@ -9,4 +9,4 @@ export CXX="distcc $HOST-g++"
 . ./print-env.sh
 
 cd $BASE || exit 1
-./waf configure --prefix="/" --bindir="/" --configdir="/share" --optimize --noconfirm --no-lv2 --dist-target=mingw "$@"
+./waf configure --prefix="/" --bindir="/" --configdir="/share" --optimize --noconfirm --dist-target=mingw "$@"
diff --git a/tools/windows_packaging/configure-release.sh b/tools/windows_packaging/configure-release.sh
index 2e943e00fe..c6869e79d0 100755
--- a/tools/windows_packaging/configure-release.sh
+++ b/tools/windows_packaging/configure-release.sh
@@ -5,4 +5,4 @@
 . ./print-env.sh
 
 cd $BASE || exit 1
-./waf configure --prefix="/" --bindir="/" --configdir="/share" --optimize --noconfirm --no-lv2 --dist-target=mingw "$@"
+./waf configure --prefix="/" --bindir="/" --configdir="/share" --optimize --noconfirm --dist-target=mingw "$@"
diff --git a/tools/windows_packaging/package-f19.sh b/tools/windows_packaging/package-f19.sh
index 3900571fd6..ba7bfd5674 100755
--- a/tools/windows_packaging/package-f19.sh
+++ b/tools/windows_packaging/package-f19.sh
@@ -65,9 +65,14 @@ portaudio-2.dll
 vamp-hostsdk-3.dll
 vamp-sdk-2.dll
 zlib1.dll
+lilv-0.dll
+sratom-0-0.dll
+serd-0-0.dll
+sord-0-0.dll
 '
 
 WITH_JACK='TRUE'
+WITH_LV2='TRUE'
 
 . ./copydll-fedora.sh
 . ./package.sh
diff --git a/tools/windows_packaging/package-f20.sh b/tools/windows_packaging/package-f20.sh
index 50cbcd9734..a60d53c020 100755
--- a/tools/windows_packaging/package-f20.sh
+++ b/tools/windows_packaging/package-f20.sh
@@ -65,9 +65,14 @@ portaudio-2.dll
 vamp-hostsdk-3.dll
 vamp-sdk-2.dll
 zlib1.dll
+lilv-0.dll
+sratom-0-0.dll
+serd-0-0.dll
+sord-0-0.dll
 '
 
 WITH_JACK='TRUE'
+WITH_LV2='TRUE'
 
 . ./copydll-fedora.sh
 . ./package.sh
diff --git a/tools/windows_packaging/package.sh b/tools/windows_packaging/package.sh
index 33eaa350e3..c6ad13c42b 100755
--- a/tools/windows_packaging/package.sh
+++ b/tools/windows_packaging/package.sh
@@ -80,6 +80,11 @@ if test x$WITH_JACK != x; then
 	cp -r $MINGW_ROOT/bin/jack $PACKAGE_DIR
 fi
 
+if test x$WITH_LV2 != x; then
+	echo "Moving Bundled LV2 $PACKAGE_DIR ..."
+	mv $PACKAGE_DIR/lib/lv2 $PACKAGE_DIR/lib/ardour3/LV2
+fi
+
 SRC_DIRS='
 libs/ardour
 libs/pbd
@@ -107,6 +112,13 @@ if [ x$DEBUG = xT ]; then
 		cp $MINGW_ROOT/bin/jack_*.exe $PACKAGE_DIR
 	fi
 
+	if test x$WITH_LV2 != x; then
+		echo "Copying LV2 utility programs to $PACKAGE_DIR ..."
+		cp $MINGW_ROOT/bin/lilv-bench.exe $PACKAGE_DIR
+		cp $MINGW_ROOT/bin/lv2info.exe $PACKAGE_DIR
+		cp $MINGW_ROOT/bin/lv2ls.exe $PACKAGE_DIR
+	fi
+
 	#echo "Copying any debug files to $PACKAGE_DIR ..."
 	#cp $MINGW_ROOT/bin/*.debug $PACKAGE_DIR