[phodav] build-sys: add chezdav msi rule
- From: Marc-Andre Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [phodav] build-sys: add chezdav msi rule
- Date: Tue, 11 Feb 2014 20:10:10 +0000 (UTC)
commit 46082ead2f214c6cbf9acc98fa7ed1c0d8436355
Author: Marc-André Lureau <marcandre lureau gmail com>
Date: Tue Feb 11 19:37:05 2014 +0100
build-sys: add chezdav msi rule
Makefile.am | 13 ++++++++++-
chezdav.wxs.in | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 5 ++-
3 files changed, 79 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 313fa8c..5027a7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,15 @@ deps.txt:
MANUFACTURER = The Spice Project
+chezdav-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: chezdav.wxs deps.txt all
+ $(AM_V_GEN)DESTDIR=`mktemp -d`&& \
+ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
+ MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \
+ -D DESTDIR=$$DESTDIR$(prefix) \
+ --arch $(WIXL_ARCH) -o $@ $<
+
+MSI = chezdav-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi
+
spice-webdavd-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-webdavd.wxs deps.txt all
$(AM_V_GEN)DESTDIR=`mktemp -d`&& \
make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
@@ -65,7 +74,9 @@ spice-webdavd-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-webdavd.wxs deps.txt
-D DESTDIR=$$DESTDIR$(prefix) \
--arch $(WIXL_ARCH) -o $@ $<
-msi: spice-webdavd-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi
+MSI += spice-webdavd-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi
+
+msi: $(MSI)
CLEANFILES = spice-webavd-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi
diff --git a/chezdav.wxs.in b/chezdav.wxs.in
new file mode 100644
index 0000000..c869fad
--- /dev/null
+++ b/chezdav.wxs.in
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+ <?define Version = "@WINDOWS_PRODUCTVERSION@"?>
+ <?define UpgradeCode = "7eb9b146-db04-42d7-a8ba-71fc8ced7eed"?>
+ <?define Arch = "@WIXL_ARCH@"?>
+ <?if $(var.Arch) = "x64"?>
+ <?define GLIB_ARCH = "win64"?>
+ <?define ArchString = "64-bit"?>
+ <?define ArchProgramFilesFolder = "ProgramFiles64Folder"?>
+ <?define Win64 = "yes"?>
+ <?else?>
+ <?define GLIB_ARCH = "win32"?>
+ <?define ArchString = "32-bit"?>
+ <?define ArchProgramFilesFolder = "ProgramFilesFolder"?>
+ <?define Win64 = "no"?>
+ <?endif?>
+
+ <?require libsoup.wxi?>
+
+ <Product Id="*" Name="chezdav @VERSION@@BUILDID@ ($(var.ArchString))"
+ Manufacturer="$(env.MANUFACTURER)"
+ Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)"
+ Language="1033">
+
+ <Package InstallerVersion="200" Compressed="yes" Comments="comments"/>
+ <Media Id="1" Cabinet="cabinet.cab" EmbedCab="yes"/>
+
+ <Property Id="ARPHELPLINK" Value="http://www.spice-space.org"/>
+ <Property Id="ARPNOMODIFY" Value="1"/>
+ <Property Id="ARPNOREPAIR" Value="1"/>
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion Minimum="$(var.Version)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
+ <UpgradeVersion Minimum="0.0.0" Maximum="$(var.Version)" IncludeMinimum="yes" IncludeMaximum="no"
Property="OLDERVERSIONBEINGUPGRADED"/>
+ </Upgrade>
+ <Condition Message="Product already installed.">NOT NEWERVERSIONDETECTED</Condition>
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallFinalize"/>
+ </InstallExecuteSequence>
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="$(var.ArchProgramFilesFolder)">
+ <Directory Id="INSTALLDIR" Name="chezdav">
+ <Directory Id="Dbindir" Name="bin">
+ <Component Id="CChezDAV" Guid="*">
+ <File Id='chezdav' Name='chezdav.exe' DiskId='1' Source='$(var.DESTDIR)/bin/chezdav.exe'
KeyPath='yes'/>
+ </Component>
+ </Directory>
+ <Component Id="CDepsTxt" Guid="*">
+ <File Id='depstxt' Name='deps.txt' DiskId='1' Source='deps.txt' KeyPath='yes'/>
+ </Component>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <Feature Id="Complete" Level="1">
+ <ComponentGroupRef Id="CG.libsoup"/>
+ <ComponentRef Id="CChezDAV"/>
+ <ComponentRef Id="CDepsTxt"/>
+ </Feature>
+
+ </Product>
+</Wix>
diff --git a/configure.ac b/configure.ac
index 044a470..b5dab16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,11 +152,12 @@ AC_SUBST(WIXL_ARCH)
AC_CONFIG_FILES([
Makefile
+chezdav.wxs
doc/Makefile
-po/Makefile.in
-spice/Makefile
libphodav/Makefile
+po/Makefile.in
spice-webdavd.wxs
+spice/Makefile
])
AC_OUTPUT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]