git.iko.soy/typeable/pandoc
on master help sign in
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.

commitf47f53d959f2219e8f38d823ee62e05c78a429bb authorJohn MacFarlane <jgm@berkeley.edu> dateWed 3 Jun 2015, 00:16 (11 years ago) parentd8e37d8
2 files changed+6−19
compare with master
unifiedsplit
windows/make-windows-installer.bat+1−1 windows/pandoc.wxs+5−18
windows/make-windows-installer.bat+1−1
@@ -28,7 +28,7 @@ cd windows
2828echo Creating msi...
2929candle -dVERSION=%VERSION% pandoc.wxs
3030if %errorlevel% neq 0 exit /b %errorlevel%
31−light -sw1076 -ext WixUIExtension -out pandoc-%VERSION%-windows.msi pandoc.wixobj
31+light -sw1076 -ext WixUIExtension -ext WixUtilExtension -out pandoc-%VERSION%-windows.msi pandoc.wixobj
3232if %errorlevel% neq 0 exit /b %errorlevel%
3333echo Starting kSign: sign, then quit kSign to complete the build...
3434kSign
windows/pandoc.wxs+5−18
@@ -34,6 +34,9 @@
3434 <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
3535 </InstallUISequence>
3636
37+<CustomActionRef Id="WixBroadcastSettingChange" />
38+<CustomActionRef Id="WixBroadcastEnvironmentChange" />
39+
3740 <Directory Id="TARGETDIR" Name="SourceDir">
3841
3942 <Directory Id="ProgramFilesFolder">
@@ -59,23 +62,7 @@
5962 Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" />
6063 </Component>
6164
62− <Component Id="UpdatePathUser"
63− Guid="C7B71304-09FC-421D-9EA2-AEFB7D61759D">
64− <Condition><![CDATA[ ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)) ]]></Condition>
65− <Environment Id="UpdatePathUser" Name="PATH" Action="set"
66− Part="last" Value="[APPLICATIONFOLDER]" System="no" />
67− <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
68− Name="UserPathUpdated" Type="integer" Value="1" KeyPath="yes"/>
69− </Component>
70−
71− <Component Id="UpdatePathMachine"
72− Guid="0C642D0A-7175-4CD7-B11F-0A69F73FD757">
73− <Condition><![CDATA[ ALLUSERS=1 OR (ALLUSERS=2 AND Privileged) ]]></Condition>
74− <Environment Id="UpdatePathMachine" Name="PATH" Action="set"
75− Part="last" Value="[APPLICATIONFOLDER]" System="yes" />
76− <RegistryValue Root="HKLM" Key="Software\John MacFarlane\Pandoc"
77− Name="SystemPathUpdated" Type="integer" Value="1" KeyPath="yes"/>
78− </Component>
65+<Environment Id='UpdatePath' Name='PATH' Action='set' Permanent='no' System='no' Part='last' Value='[INSTALLDIR]' />
7966
8067 <Component Id="Documentation"
8168 Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3">
@@ -116,7 +103,7 @@
116103 </Feature>
117104
118105 <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
119− <UIRef Id="WixUI_Minimal" />
106+ <UIRef Id="WixUI_InstallDir" />
120107 <UIRef Id="WixUI_ErrorProgressText" />
121108 <WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" />
122109