From f47f53d959f2219e8f38d823ee62e05c78a429bb Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Wed, 3 Jun 2015 00:16:38 +0200
Subject: Windows msi changes (nkalvi):

* Allow setting of installation path.
* Use cleaner wix syntax for setting the path:
  https://www.firegiant.com/wix/tutorial/com-expression-syntax-miscellanea/environmentally-friendly/
* Show the user what changes, in a new command window.

See #2205.
---
 windows/pandoc.wxs | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'windows/pandoc.wxs')

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 75c316772..3e94c46fe 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -34,6 +34,9 @@
       <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
     </InstallUISequence>
 
+<CustomActionRef Id="WixBroadcastSettingChange" />
+<CustomActionRef Id="WixBroadcastEnvironmentChange" />
+
     <Directory Id="TARGETDIR" Name="SourceDir">
 
       <Directory Id="ProgramFilesFolder">
@@ -59,23 +62,7 @@
             Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" />
           </Component>
 
-          <Component Id="UpdatePathUser"
-            Guid="C7B71304-09FC-421D-9EA2-AEFB7D61759D">
-            <Condition><![CDATA[ ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)) ]]></Condition>
-            <Environment Id="UpdatePathUser" Name="PATH" Action="set"
-            Part="last" Value="[APPLICATIONFOLDER]" System="no" />
-            <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
-            Name="UserPathUpdated" Type="integer" Value="1" KeyPath="yes"/>
-          </Component>
-
-          <Component Id="UpdatePathMachine"
-            Guid="0C642D0A-7175-4CD7-B11F-0A69F73FD757">
-            <Condition><![CDATA[ ALLUSERS=1 OR (ALLUSERS=2 AND Privileged) ]]></Condition>
-            <Environment Id="UpdatePathMachine" Name="PATH" Action="set"
-            Part="last" Value="[APPLICATIONFOLDER]" System="yes" />
-            <RegistryValue Root="HKLM" Key="Software\John MacFarlane\Pandoc"
-            Name="SystemPathUpdated" Type="integer" Value="1" KeyPath="yes"/>
-          </Component>
+<Environment Id='UpdatePath' Name='PATH' Action='set' Permanent='no' System='no' Part='last' Value='[INSTALLDIR]' />
 
           <Component Id="Documentation"
           Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3">
@@ -116,7 +103,7 @@
     </Feature>
 
     <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
-    <UIRef Id="WixUI_Minimal" />
+    <UIRef Id="WixUI_InstallDir" />
     <UIRef Id="WixUI_ErrorProgressText" />
     <WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" />
 
-- 
cgit v1.2.3