diff easyhg.wxs @ 616:32b8f32f14a6

Merge
author Chris Cannam
date Wed, 04 Jul 2012 16:15:15 +0100
parents ad163f8f6236
children cfaede84ad9d
line wrap: on
line diff
--- a/easyhg.wxs	Tue Jul 03 13:54:18 2012 +0100
+++ b/easyhg.wxs	Wed Jul 04 16:15:15 2012 +0100
@@ -2,13 +2,13 @@
 
   <Product
       Name="EasyMercurial" 
-      Id="CDD72D35-518B-49E2-A389-B3F7C1AE289D" 
+      Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="1.2.0" 
+      Version="1.2.2" 
       UpgradeCode="B82DFDA9-B9DE-49BC-93E5-0B96F9DEB04B"
       Manufacturer="Queen Mary, University of London">
-
+    
     <Package
         Id="*"
         Keywords="Installer"
@@ -20,6 +20,8 @@
         Compressed="yes" 
         SummaryCodepage="1252"/>
 
+    <MajorUpgrade DowngradeErrorMessage="A later version of EasyMercurial is already installed. Setup will now exit."/>
+
     <Media Id="1" Cabinet="easyhg.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
     <Property Id="DiskPrompt" Value="EasyMercurial Installation [1]"/>