diff options
| author | kenneth.skovhede@gmail.com <kenneth.skovhede@gmail.com@59da171f-624f-0410-aa54-27559c288bec> | 2009-03-17 20:35:08 +0300 |
|---|---|---|
| committer | kenneth.skovhede@gmail.com <kenneth.skovhede@gmail.com@59da171f-624f-0410-aa54-27559c288bec> | 2009-03-17 20:35:08 +0300 |
| commit | 34d2742a02fa018004f4ab490406ffc5dfd9fc20 (patch) | |
| tree | 659133ea4ff3f6f31637a9cfcdc79922f39d6dc7 | |
| parent | 725a77fa4f4bf393d165952d5dea25e473ffb922 (diff) | |
Fixed the MSI to support automatic updating.
git-svn-id: https://duplicati.googlecode.com/svn/trunk@120 59da171f-624f-0410-aa54-27559c288bec
| -rw-r--r-- | Installer/Duplicati.wxs | 20 | ||||
| -rw-r--r-- | Installer/UpgradeData.wxi | 23 | ||||
| -rw-r--r-- | Installer/WixInstaller.wixproj | 1 |
3 files changed, 41 insertions, 3 deletions
diff --git a/Installer/Duplicati.wxs b/Installer/Duplicati.wxs index c91b29829..b4f2e2bd6 100644 --- a/Installer/Duplicati.wxs +++ b/Installer/Duplicati.wxs @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?>
+
+<?include UpgradeData.wxi ?>
+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="d5867b1e-71af-450f-9204-e33f29eafc94" Name="Duplicati" Language="1033" Version="1.0.0.0" Manufacturer="HexaD" UpgradeCode="bab49745-b447-45cf-8b10-012006895593">
- <Package InstallerVersion="200" Compressed="yes" />
+ <Product Id="$(var.ProductCode)" Name="Duplicati" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+ <Package InstallerVersion="200" Compressed="yes" Id="$(var.PackageCode)" />
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@@ -11,6 +14,8 @@ </Condition>
<Property Id="ALLUSERS">1</Property>
+
+
<WixVariable Id="WixUILicenseRtf" Value="Resources/LGPL21.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="Resources/InstallerSmall.bmp" />
@@ -87,7 +92,16 @@ <!-- Set the Add/Remove icon -->
<Property Id="ARPPRODUCTICON" Value="DuplicatiIcon.exe" />
-
+
+ <!-- Remove old versions -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts Before='InstallInitialize' />
+ </InstallExecuteSequence>
+
+ <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion Minimum="1.0.0.0" Property="PREVIOUSVERSIONSINSTALLED" Maximum="99.0.0.0" IncludeMinimum="yes" IncludeMaximum="no" />
+ </Upgrade>
</Product>
</Wix>
diff --git a/Installer/UpgradeData.wxi b/Installer/UpgradeData.wxi new file mode 100644 index 000000000..11be554e5 --- /dev/null +++ b/Installer/UpgradeData.wxi @@ -0,0 +1,23 @@ +<Include>
+ <!-- Never change the UpgradeCode -->
+ <?define UpgradeCode="bab49745-b447-45cf-8b10-012006895593" ?>
+
+ <!-- Remember to change product version on each install -->
+ <?define ProductVersion="1.0.0.1" ?>
+
+ <?define Manufacturer="HexaD" ?>
+
+ <!--
+
+ This is REALLY lame!
+
+ It must be a MAJOR upgrade, otherwise the user cannot doubleclick the MSI.
+ Go figure:
+ Minor change, very difficult to install
+ Major change, very easy to install
+ -->
+
+ <?define ProductCode="*" ?>
+ <?define PackageCode="*" ?>
+
+</Include>
\ No newline at end of file diff --git a/Installer/WixInstaller.wixproj b/Installer/WixInstaller.wixproj index e31685978..271f150d7 100644 --- a/Installer/WixInstaller.wixproj +++ b/Installer/WixInstaller.wixproj @@ -30,6 +30,7 @@ <Content Include="Resources\InstallerLarge.bmp" />
<Content Include="Resources\InstallerSmall.bmp" />
<Content Include="Resources\LGPL21.rtf" />
+ <Content Include="UpgradeData.wxi" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
|