summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorFyodor Sheremetyev <sheremetyev@gmail.com>2013-03-15 21:43:47 +0000
committerFyodor Sheremetyev <sheremetyev@gmail.com>2013-03-15 21:43:47 +0000
commit7c572acbd659381997f2559d23beb2eb6b588c41 (patch)
tree2eeff00e8c65ffafbac76220a94ca73f3b9aa60d /windows
parentef40aa9393729c305b13233be1830a9da1a0de39 (diff)
WiX: Revert back to “Minimal” template.
The “Advanced” template doesn’t uninstall previous version if it was installed per-machine. FindRelatedProducts action executes before ALLUSERS property is set and search is performed in per-user products only.
Diffstat (limited to 'windows')
-rw-r--r--windows/pandoc.wxs14
1 files changed, 8 insertions, 6 deletions
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 9ca4b463c..85edd29a8 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -21,16 +21,17 @@
<RemoveExistingProducts After="InstallFinalize"/>
</InstallExecuteSequence>
- <Property Id="ApplicationFolderName" Value="Pandoc" />
- <Property Id="WixAppFolder" Value="WixPerUserFolder" />
<Property Id="DISABLEADVTSHORTCUTS" Value="1" />
- <CustomAction Id="WixSetPerUserFolderOverride" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder][ApplicationFolderName]" Execute="immediate" />
+ <CustomAction Id="SetPerUserFolder" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder]Pandoc" Execute="immediate" />
+ <CustomAction Id="SetPerMachineFolder" Property="APPLICATIONFOLDER" Value="[ProgramFilesFolder]Pandoc" Execute="immediate" />
<InstallExecuteSequence>
- <Custom Action="WixSetPerUserFolderOverride" After="WixSetPerUserFolder">ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
+ <Custom Action="SetPerUserFolder" Before="CostFinalize">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
+ <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
</InstallExecuteSequence>
<InstallUISequence>
- <Custom Action="WixSetPerUserFolderOverride" After="WixSetPerUserFolder">ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
+ <Custom Action="SetPerUserFolder" Before="CostFinalize">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
+ <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
</InstallUISequence>
<Directory Id="TARGETDIR" Name="SourceDir">
@@ -103,7 +104,8 @@
</Feature>
</Feature>
- <UIRef Id="WixUI_Advanced" />
+ <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
+ <UIRef Id="WixUI_Minimal" />
<UIRef Id="WixUI_ErrorProgressText" />
<WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" />