Only include spice-gtk as dep when it's explicitly done in the configure.
---
data/Makefile.am | 1 +
data/virt-viewer.nsis.in | 196 +++++++++++++++++++++++++----------------------
2 files changed, 107 insertions(+), 90 deletions(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index 02b9cd4..e8daaf8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -49,6 +49,7 @@ virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt
makensis -NOCD \
-DDESTDIR=$$DESTDIR \
-DGTK_VERSION=$(GTK_API_VERSION) \
+ -DHaveSpiceGtk=$(HaveSpiceGtk) \
-DHaveLibvirt=$(HaveLibvirt) \
-DHaveOVirt=$(HaveOVirt) \
$< >/dev/null && \
diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in
index 6581e65..03dbb6b 100755
--- a/data/virt-viewer.nsis.in
+++ b/data/virt-viewer.nsis.in
@@ -65,24 +65,52 @@ Section "VirtViewer"
File "deps.txt"
SetOutPath "$INSTDIR\bin"
- File "@prefix@/bin/gst-discoverer-0.10.exe"
- File "@prefix@/bin/gst-feedback.exe"
- File "@prefix@/bin/gst-inspect-0.10.exe"
- File "@prefix@/bin/gst-inspect.exe"
- File "@prefix@/bin/gst-launch-0.10.exe"
- File "@prefix@/bin/gst-launch.exe"
- File "@prefix@/bin/gst-typefind-0.10.exe"
- File "@prefix@/bin/gst-typefind.exe"
- File "@prefix@/bin/gst-xmlinspect-0.10.exe"
- File "@prefix@/bin/gst-xmlinspect.exe"
- File "@prefix@/bin/gst-xmllaunch-0.10.exe"
- File "@prefix@/bin/gst-xmllaunch.exe"
+ !if ${HaveSpiceGtk} == True
+ File "@prefix@/bin/gst-discoverer-0.10.exe"
+ File "@prefix@/bin/gst-feedback.exe"
+ File "@prefix@/bin/gst-inspect-0.10.exe"
+ File "@prefix@/bin/gst-inspect.exe"
+ File "@prefix@/bin/gst-launch-0.10.exe"
+ File "@prefix@/bin/gst-launch.exe"
+ File "@prefix@/bin/gst-typefind-0.10.exe"
+ File "@prefix@/bin/gst-typefind.exe"
+ File "@prefix@/bin/gst-xmlinspect-0.10.exe"
+ File "@prefix@/bin/gst-xmlinspect.exe"
+ File "@prefix@/bin/gst-xmllaunch-0.10.exe"
+ File "@prefix@/bin/gst-xmllaunch.exe"
+ File "@prefix@/bin/libgstapp-0.10-0.dll"
+ File "@prefix@/bin/libgstaudio-0.10-0.dll"
+ File "@prefix@/bin/libgstbase-0.10-0.dll"
+ File "@prefix@/bin/libgstcontroller-0.10-0.dll"
+ File "@prefix@/bin/libgstfft-0.10-0.dll"
+ File "@prefix@/bin/libgstinterfaces-0.10-0.dll"
+ File "@prefix@/bin/libgstpbutils-0.10-0.dll"
+ File "@prefix@/bin/libgstreamer-0.10-0.dll"
+ File "@prefix@/bin/libgstvideo-0.10-0.dll"
+
+ File "@prefix@/bin/libusb-1.0.dll"
+ File "@prefix@/bin/libusbredirhost-1.dll"
+ File "@prefix@/bin/libusbredirparser-1.dll"
+
+ File "@prefix@/bin/libcelt051-0.dll"
+ File "@prefix@/bin/libopus-0.dll"
+ File "@prefix@/bin/liborc-0.4-0.dll"
+ File "@prefix@/bin/liborc-test-0.4-0.dll"
+
+ File "@prefix@/bin/libspice-client-glib-2.0-8.dll"
+ File "@prefix@/bin/libspice-controller-0.dll"
+ !if ${GTK_VERSION} == 2.0
+ File "@prefix@/bin/libspice-client-gtk-2.0-4.dll"
+ !else
+ File "@prefix@/bin/libspice-client-gtk-3.0-4.dll"
+ !endif
+ !endif
+
File "@prefix@/bin/libatk-1.0-0.dll"
File "@prefix@/bin/libcairo-2.dll"
!if ${GTK_VERSION} == 3.0
File "@prefix@/bin/libcairo-gobject-2.dll"
!endif
- File "@prefix@/bin/libcelt051-0.dll"
File "@prefix@/bin/libcrypto-10.dll"
File "@prefix@/bin/libexpat-1.dll"
File "@prefix@/bin/libffi-6.dll"
@@ -98,15 +126,6 @@ Section "VirtViewer"
File "@prefix@/bin/libglib-2.0-0.dll"
File "@prefix@/bin/libgmodule-2.0-0.dll"
File "@prefix@/bin/libgobject-2.0-0.dll"
- File "@prefix@/bin/libgstapp-0.10-0.dll"
- File "@prefix@/bin/libgstaudio-0.10-0.dll"
- File "@prefix@/bin/libgstbase-0.10-0.dll"
- File "@prefix@/bin/libgstcontroller-0.10-0.dll"
- File "@prefix@/bin/libgstfft-0.10-0.dll"
- File "@prefix@/bin/libgstinterfaces-0.10-0.dll"
- File "@prefix@/bin/libgstpbutils-0.10-0.dll"
- File "@prefix@/bin/libgstreamer-0.10-0.dll"
- File "@prefix@/bin/libgstvideo-0.10-0.dll"
File "@prefix@/bin/libgthread-2.0-0.dll"
!if ${GTK_VERSION} == 2.0
File "@prefix@/bin/libgtk-win32-2.0-0.dll"
@@ -116,27 +135,14 @@ Section "VirtViewer"
File "@prefix@/bin/iconv.dll"
File "@prefix@/bin/libintl-8.dll"
File "@prefix@/bin/libjpeg-62.dll"
- File "@prefix@/bin/libopus-0.dll"
- File "@prefix@/bin/liborc-0.4-0.dll"
- File "@prefix@/bin/liborc-test-0.4-0.dll"
File "@prefix@/bin/libpango-1.0-0.dll"
File "@prefix@/bin/libpangocairo-1.0-0.dll"
File "@prefix@/bin/libpangoft2-1.0-0.dll"
File "@prefix@/bin/libpangowin32-1.0-0.dll"
File "@prefix@/bin/libpixman-1-0.dll"
File "@prefix@/bin/libpng16-16.dll"
- File "@prefix@/bin/libspice-client-glib-2.0-8.dll"
- !if ${GTK_VERSION} == 2.0
- File "@prefix@/bin/libspice-client-gtk-2.0-4.dll"
- !else
- File "@prefix@/bin/libspice-client-gtk-3.0-4.dll"
- !endif
- File "@prefix@/bin/libspice-controller-0.dll"
File "@prefix@/bin/libssl-10.dll"
File "@prefix@/bin/libtasn1-6.dll"
- File "@prefix@/bin/libusb-1.0.dll"
- File "@prefix@/bin/libusbredirhost-1.dll"
- File "@prefix@/bin/libusbredirparser-1.dll"
File "@prefix@/bin/libxml2-2.dll"
File "@prefix@/bin/libp11-kit-0.dll"
File "@prefix@/bin/libssp-0.dll"
@@ -214,16 +220,18 @@ Section "VirtViewer"
!endif
File /r "@prefix@/lib/pango"
- SetOutPath "$INSTDIR\lib\gstreamer-0.10"
- File "@prefix@/lib/gstreamer-0.10/libgstapp.dll"
- File "@prefix@/lib/gstreamer-0.10/libgstaudioconvert.dll"
- File "@prefix@/lib/gstreamer-0.10/libgstaudiorate.dll"
- File "@prefix@/lib/gstreamer-0.10/libgstaudioresample.dll"
- File "@prefix@/lib/gstreamer-0.10/libgstaudiotestsrc.dll"
- File "@prefix@/lib/gstreamer-0.10/libgstautodetect.dll"
- File "@prefix@/lib/gstreamer-0.10/libgstcoreelements.dll"
- File "@prefix@/lib/gstreamer-0.10/libgstdirectsoundsink.dll"
- File "@prefix@/lib/gstreamer-0.10/libgstdirectsoundsrc.dll"
+ !if ${HaveSpiceGtk} == True
+ SetOutPath "$INSTDIR\lib\gstreamer-0.10"
+ File "@prefix@/lib/gstreamer-0.10/libgstapp.dll"
+ File "@prefix@/lib/gstreamer-0.10/libgstaudioconvert.dll"
+ File "@prefix@/lib/gstreamer-0.10/libgstaudiorate.dll"
+ File "@prefix@/lib/gstreamer-0.10/libgstaudioresample.dll"
+ File "@prefix@/lib/gstreamer-0.10/libgstaudiotestsrc.dll"
+ File "@prefix@/lib/gstreamer-0.10/libgstautodetect.dll"
+ File "@prefix@/lib/gstreamer-0.10/libgstcoreelements.dll"
+ File "@prefix@/lib/gstreamer-0.10/libgstdirectsoundsink.dll"
+ File "@prefix@/lib/gstreamer-0.10/libgstdirectsoundsrc.dll"
+ !endif
!if ${HaveOVirt} == True
SetOutPath "$INSTDIR\lib\gio\modules"
@@ -507,16 +515,19 @@ Section "Uninstall"
!else
RMDir /r "$INSTDIR\lib\gtk-3.0"
!endif
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsrc.dll"
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsink.dll"
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstcoreelements.dll"
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstautodetect.dll"
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiotestsrc.dll"
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioresample.dll"
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiorate.dll"
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioconvert.dll"
- Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstapp.dll"
- RMDir "$INSTDIR\lib\gstreamer-0.10"
+
+ !if ${HaveSpiceGtk} == True
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsrc.dll"
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsink.dll"
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstcoreelements.dll"
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstautodetect.dll"
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiotestsrc.dll"
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioresample.dll"
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiorate.dll"
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioconvert.dll"
+ Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstapp.dll"
+ RMDir "$INSTDIR\lib\gstreamer-0.10"
+ !endif
RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
RMDir /r "$INSTDIR\etc\pango"
@@ -540,18 +551,46 @@ Section "Uninstall"
!else
Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
!endif
- Delete /rebootok "$INSTDIR\bin\gst-xmllaunch.exe"
- Delete /rebootok "$INSTDIR\bin\gst-xmllaunch-0.10.exe"
- Delete /rebootok "$INSTDIR\bin\gst-xmlinspect.exe"
- Delete /rebootok "$INSTDIR\bin\gst-xmlinspect-0.10.exe"
- Delete /rebootok "$INSTDIR\bin\gst-typefind.exe"
- Delete /rebootok "$INSTDIR\bin\gst-typefind-0.10.exe"
- Delete /rebootok "$INSTDIR\bin\gst-launch.exe"
- Delete /rebootok "$INSTDIR\bin\gst-launch-0.10.exe"
- Delete /rebootok "$INSTDIR\bin\gst-inspect.exe"
- Delete /rebootok "$INSTDIR\bin\gst-inspect-0.10.exe"
- Delete /rebootok "$INSTDIR\bin\gst-feedback.exe"
- Delete /rebootok "$INSTDIR\bin\gst-discoverer-0.10.exe"
+ !if ${HaveSpiceGtk} == True
+ Delete /rebootok "$INSTDIR\bin\gst-xmllaunch.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-xmllaunch-0.10.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-xmlinspect.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-xmlinspect-0.10.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-typefind.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-typefind-0.10.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-launch.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-launch-0.10.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-inspect.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-inspect-0.10.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-feedback.exe"
+ Delete /rebootok "$INSTDIR\bin\gst-discoverer-0.10.exe"
+ Delete /rebootok "$INSTDIR\bin\libgstvideo-0.10-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libgstreamer-0.10-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libgstpbutils-0.10-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libgstinterfaces-0.10-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libgstfft-0.10-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libgstcontroller-0.10-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libgstbase-0.10-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libgstaudio-0.10-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libgstapp-0.10-0.dll"
+
+ Delete /rebootok "$INSTDIR\bin\libusb-1.0.dll"
+ Delete /rebootok "$INSTDIR\bin\libusbredirhost-1.dll"
+ Delete /rebootok "$INSTDIR\bin\libusbredirparser-1.dll"
+
+ Delete /rebootok "$INSTDIR\bin\libcelt051-0.dll"
+ Delete /rebootok "$INSTDIR\bin\libopus-0.dll"
+ Delete /rebootok "$INSTDIR\bin\liborc-test-0.4-0.dll"
+ Delete /rebootok "$INSTDIR\bin\liborc-0.4-0.dll"
+
+ Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll"
+ Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll"
+ !if ${GTK_VERSION} == 2.0
+ Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll"
+ !else
+ Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-3.0-4.dll"
+ !endif
+ !endif
Delete /rebootok "$INSTDIR\bin\zlib1.dll"
Delete /rebootok "$INSTDIR\bin\libreadline6.dll"
Delete /rebootok "$INSTDIR\bin\libffi-6.dll"
@@ -559,26 +598,13 @@ Section "Uninstall"
Delete /rebootok "$INSTDIR\bin\libxml2-2.dll"
Delete /rebootok "$INSTDIR\bin\libtasn1-6.dll"
Delete /rebootok "$INSTDIR\bin\libssl-10.dll"
- !if ${GTK_VERSION} == 2.0
- Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll"
- !else
- Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-3.0-4.dll"
- !endif
- Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll"
- Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll"
Delete /rebootok "$INSTDIR\bin\libpng16-16.dll"
Delete /rebootok "$INSTDIR\bin\libpixman-1-0.dll"
Delete /rebootok "$INSTDIR\bin\libpangowin32-1.0-0.dll"
Delete /rebootok "$INSTDIR\bin\libpangocairo-1.0-0.dll"
Delete /rebootok "$INSTDIR\bin\libpango-1.0-0.dll"
- Delete /rebootok "$INSTDIR\bin\liborc-test-0.4-0.dll"
- Delete /rebootok "$INSTDIR\bin\liborc-0.4-0.dll"
Delete /rebootok "$INSTDIR\bin\libjpeg-62.dll"
- Delete /rebootok "$INSTDIR\bin\libopus-0.dll"
Delete /rebootok "$INSTDIR\bin\libintl-8.dll"
- Delete /rebootok "$INSTDIR\bin\libusb-1.0.dll"
- Delete /rebootok "$INSTDIR\bin\libusbredirhost-1.dll"
- Delete /rebootok "$INSTDIR\bin\libusbredirparser-1.dll"
!if ${HaveLibvirt} == True
Delete /rebootok "$INSTDIR\bin\libvirt-0.dll"
Delete /rebootok "$INSTDIR\bin\libwinpthread-1.dll"
@@ -613,15 +639,6 @@ Section "Uninstall"
Delete /rebootok "$INSTDIR\bin\libgtk-3-0.dll"
!endif
Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstvideo-0.10-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstreamer-0.10-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstpbutils-0.10-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstinterfaces-0.10-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstfft-0.10-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstcontroller-0.10-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstbase-0.10-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstaudio-0.10-0.dll"
- Delete /rebootok "$INSTDIR\bin\libgstapp-0.10-0.dll"
Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll"
Delete /rebootok "$INSTDIR\bin\libgnutls-28.dll"
Delete /rebootok "$INSTDIR\bin\libgcrypt-20.dll"
@@ -632,7 +649,6 @@ Section "Uninstall"
Delete /rebootok "$INSTDIR\bin\libfontconfig-1.dll"
Delete /rebootok "$INSTDIR\bin\libexpat-1.dll"
Delete /rebootok "$INSTDIR\bin\libcrypto-10.dll"
- Delete /rebootok "$INSTDIR\bin\libcelt051-0.dll"
Delete /rebootok "$INSTDIR\bin\libcairo-2.dll"
!if ${GTK_VERSION} == 3.0
Delete /rebootok "$INSTDIR\bin\libcairo-gobject-2.dll"
--
2.1.0
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
