[vidalia-svn] r3586: Add support for the msi upgrade stuff based on coderman's wo (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-02-24 00:46:46 -0500 (Tue, 24 Feb 2009)
New Revision: 3586

Modified:
   vidalia/trunk/pkg/win32/vidalia.wxs.in
Log:

Add support for the msi upgrade stuff based on coderman's work in Tor's
tor.wxs.in.


Modified: vidalia/trunk/pkg/win32/vidalia.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.wxs.in	2009-02-24 05:22:17 UTC (rev 3585)
+++ vidalia/trunk/pkg/win32/vidalia.wxs.in	2009-02-24 05:46:46 UTC (rev 3586)
@@ -4,6 +4,8 @@
  -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
 
+  <?define VidaliaVersion="@VER_MAJOR@.@VER_MINOR@.@VER_PATCH@" ?>
+  <?define VidaliaUpgradeCode="B7FBFE11-D7CA-4895-A1FB-1D7E065E4D04" ?>
   <?define VidaliaProductGuid="B3C22D59-D907-4559-9569-92AAA34DB6F0" ?>
   <?define VidaliaDocumentsGuid="6A51C86C-A7D4-407f-9B84-7ADCE016E939" ?>
   <?define QtLibraryGuid="00F354CB-B313-4100-8900-11293A66B385" ?>
@@ -23,9 +25,9 @@
 
   <Product Name="Vidalia @VERSION@" Id="$(var.VidaliaProductGuid)"
            Language="1033" Codepage="1252"
-           Version="@VER_MAJOR@.@VER_MINOR@.@VER_PATCH@" 
+           Version="$(var.VidaliaVersion)" 
            Manufacturer="vidalia-project.net"
-           UpgradeCode="B7FBFE11-D7CA-4895-A1FB-1D7E065E4D04">
+           UpgradeCode="$(var.VidaliaUpgradeCode)">
     
     <Package Id="*" Keywords="Installer"
              Description="Vidalia @VERSION@ Installer"
@@ -37,6 +39,12 @@
            EmbedCab="yes" DiskPrompt="CD-ROM #1" />
     <Property Id="DiskPrompt" Value="Vidalia @VERSION@ Installation [1]" />
 
+    <Upgrade Id="$(var.VidaliaUpgradeCode)">
+      <UpgradeVersion Property="UPGRADEFOUND" OnlyDetect="no"
+                      Minimum="0.0.1" IncludeMinimum="yes"
+                      Maximum="$(var.VidaliaVersion)" IncludeMaximum="no" />
+    </Upgrade>
+
     <!-- Define the target installation directory hierarchy -->
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="ProgramFilesDir">
@@ -312,6 +320,11 @@
       </Feature>
     </Feature>
 
+    <!-- Upgrade installation sequence -->
+    <InstallExecuteSequence>
+      <RemoveExistingProducts After="InstallValidate" />
+    </InstallExecuteSequence>
+
     <!-- Set the UI options -->
     <UIRef Id="WixUI_Custom" />
     <Icon Id="vidalia.ico" SourceFile="@Vidalia_SOURCE_DIR@\src\vidalia\res\icons\vidalia.ico" />