From db19b2ec997778a441206218f99d8824354ce32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 16 Jan 2013 17:27:58 +0100 Subject: [PATCH] win: add virt-viewer.msi build rule In order to build the MSI, you will need msitools: http://ftp.gnome.org/pub/GNOME/sources/msitools/ The MANUFACTURER environment variable is mandatory and should be set to the manufacturer/author of the MSI build. --- configure.ac | 1 + data/Makefile.am | 19 ++++++++- data/virt-viewer.wxs.in | 92 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 data/virt-viewer.wxs.in diff --git a/configure.ac b/configure.ac index e0adfe4..ec81041 100644 --- a/configure.ac +++ b/configure.ac @@ -203,6 +203,7 @@ AC_DEFINE_UNQUOTED([BUILDID], "$with_buildid", [Build version details]) AC_CONFIG_FILES([ Makefile data/Makefile + data/virt-viewer.wxs data/virt-viewer.nsis data/virt-viewer-debug.nsis icons/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index e3f98a9..3ab6190 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -3,11 +3,13 @@ CLEANFILES = EXTRA_DIST = \ spice-xpi-client-remote-viewer \ + virt-viewer.wxs.in \ virt-viewer.nsis.in \ virt-viewer-debug.nsis.in \ $(NULL) if OS_WIN32 + deps.txt: $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@ @@ -17,7 +19,22 @@ virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \ rm -rf $$DESTDIR -CLEANFILES += deps.txt virt-viewer-$(VERSION).exe +virt-viewer-$(VERSION).msi: virt-viewer.wxs deps.txt + $(AM_V_GEN)DESTDIR=`mktemp -d` && \ + make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \ + find $$DESTDIR | wixl-heat -p $$DESTDIR$(prefix)/ \ + --component-group CG.virt-viewer --var var.DESTDIR \ + --directory-ref=INSTALLDIR > virt-viewer-files.wxs && \ + wixl -D SourceDir=$(prefix) \ + -D DESTDIR=$$DESTDIR$(prefix) -o $@ \ + $< virt-viewer-files.wxs && \ + rm -rf $$DESTDIR virt-viewer-files.wxs + +CLEANFILES = \ + deps.txt \ + virt-viewer-$(VERSION).exe \ + virt-viewer-$(VERSION).msi \ + $(NULL) else #!WIN32 diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in new file mode 100644 index 0000000..5a83bcf --- /dev/null +++ b/data/virt-viewer.wxs.in @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + NOT NEWERVERSIONDETECTED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +