@@ -1,31 +1,34 @@
11<?xml version="1.0"?>
2+<?define UpgradeCode = "A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" ?>
23<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
34 <Product Id="*"
4− UpgradeCode="A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" Name="Pandoc $(var.VERSION)"
5+ UpgradeCode="$(var.UpgradeCode)" Name="Pandoc $(var.VERSION)"
56 Version="$(var.VERSION)" Manufacturer="John MacFarlane"
67 Language="1033">
7− <Package InstallerVersion="200" Compressed="yes"
8+ <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser"
89 Comments="Windows Installer Package" />
910 <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
1011 <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
11− <Upgrade Id="A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562">
12− <UpgradeVersion
13− Minimum="0.46.0.0" Maximum="$(var.VERSION)"
14− Property="PREVIOUSVERSIONSINSTALLED"
15− IncludeMinimum="yes" IncludeMaximum="no" />
12+ <Upgrade Id="$(var.UpgradeCode)">
13+ <UpgradeVersion Property='PREVIOUSVERSIONSINSTALLED'
14+ Minimum='0.0.0.0' IncludeMinimum='yes'
15+ Maximum="99.0.0.0" IncludeMaximum="no" />
1616 </Upgrade>
17+ <Property Id="ARPURLINFOABOUT" Value="http://johnmacfarlane.net/pandoc/" />
1718 <InstallExecuteSequence>
1819 <RemoveExistingProducts After="InstallFinalize"/>
1920 </InstallExecuteSequence>
2021 <Directory Id="TARGETDIR" Name="SourceDir">
21− <Directory Id="DesktopFolder" Name="Desktop" />
2222 <Directory Id="ProgramMenuFolder">
2323 <Directory Id="ApplicationProgramsFolder" Name="Pandoc"/>
2424 </Directory>
25− <Directory Id="ProgramFilesFolder">
25+ <Directory Id="LocalAppDataFolder">
2626 <Directory Id="INSTALLDIR" Name="Pandoc">
2727 <Component Id="MainExecutable"
28− Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7" KeyPath="yes">
28+ Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7">
29+ <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
30+ Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
31+ <RemoveFolder Id="INSTALLDIR" On="uninstall"/>
2932 <File Id="pandocEXE" Name="pandoc.exe"
3033 Source="..\cabal-dev\bin\pandoc.exe" />
3134 <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
@@ -33,10 +36,12 @@
3336 <File Id="pandocCOPYING" Name="COPYING.rtf"
3437 Source="..\COPYING.rtf" />
3538 <Environment Id="UpdatePath" Name="PATH" Action="set"
36− Part="last" System="yes" Value="[INSTALLDIR]" />
39+ Part="last" Value="[INSTALLDIR]" />
3740 </Component>
3841 <Component Id="Documentation"
39− Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3" KeyPath="yes">
42+ Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3">
43+ <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
44+ Name="DocumentationInstalled" Type="integer" Value="1" KeyPath="yes"/>
4045 <File Id="pandocREADME" Name="Pandoc User's Guide.html"
4146 Source="..\README.html" />
4247 </Component>
@@ -51,7 +56,8 @@
5156 Target="[INSTALLDIR]Pandoc User's Guide.html"
5257 WorkingDirectory="INSTALLDIR" />
5358 <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
54− <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
59+ <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
60+ Name="ShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
5561 </Component>
5662 </DirectoryRef>
5763 <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="INSTALLDIR">