git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #748 from sheremetyev/wix-peruser
86dd9f1John MacFarlane
windows/make-windows-installer.bat+1−1
compare with master
unifiedsplit
@@ -26,7 +26,7 @@ cd windows
26echo Creating msi...
26echo Creating msi...
27"C:\Program Files\WiX Toolset v3.7\bin\candle.exe" -dVERSION=%VERSION% -ext WixUIExtension pandoc.wxs
27"C:\Program Files\WiX Toolset v3.7\bin\candle.exe" -dVERSION=%VERSION% -ext WixUIExtension pandoc.wxs
28if %errorlevel% neq 0 exit /b %errorlevel%
28if %errorlevel% neq 0 exit /b %errorlevel%
29−"C:\Program Files\WiX Toolset v3.7\bin\light.exe" -ext WixUIExtension -out pandoc-%VERSION%.msi pandoc.wixobj
29+"C:\Program Files\WiX Toolset v3.7\bin\light.exe" -sw1076 -ext WixUIExtension -out pandoc-%VERSION%.msi pandoc.wixobj
30if %errorlevel% neq 0 exit /b %errorlevel%
30if %errorlevel% neq 0 exit /b %errorlevel%
31echo Starting kSign: sign, then quit kSign to complete the build...
31echo Starting kSign: sign, then quit kSign to complete the build...
32"C:\Program Files\kSign\kSign.exe"
32"C:\Program Files\kSign\kSign.exe"
windows/pandoc.wxs+19−13
@@ -1,31 +1,34 @@
1<?xml version="1.0"?>
1<?xml version="1.0"?>
2+<?define UpgradeCode = "A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" ?>
2<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3 <Product Id="*"
4 <Product Id="*"
4− UpgradeCode="A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" Name="Pandoc $(var.VERSION)"
5+ UpgradeCode="$(var.UpgradeCode)" Name="Pandoc $(var.VERSION)"
5 Version="$(var.VERSION)" Manufacturer="John MacFarlane"
6 Version="$(var.VERSION)" Manufacturer="John MacFarlane"
6 Language="1033">
7 Language="1033">
7− <Package InstallerVersion="200" Compressed="yes"
8+ <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser"
8 Comments="Windows Installer Package" />
9 Comments="Windows Installer Package" />
9 <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
10 <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
10 <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
11 <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
11− <Upgrade Id="A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562">
12+ <Upgrade Id="$(var.UpgradeCode)">
12− <UpgradeVersion
13− Minimum="0.46.0.0" Maximum="$(var.VERSION)"
14− Property="PREVIOUSVERSIONSINSTALLED"
13+ <UpgradeVersion Property='PREVIOUSVERSIONSINSTALLED'
15− IncludeMinimum="yes" IncludeMaximum="no" />
14+ Minimum='0.0.0.0' IncludeMinimum='yes'
15+ Maximum="99.0.0.0" IncludeMaximum="no" />
16 </Upgrade>
16 </Upgrade>
17+ <Property Id="ARPURLINFOABOUT" Value="http://johnmacfarlane.net/pandoc/" />
17 <InstallExecuteSequence>
18 <InstallExecuteSequence>
18 <RemoveExistingProducts After="InstallFinalize"/>
19 <RemoveExistingProducts After="InstallFinalize"/>
19 </InstallExecuteSequence>
20 </InstallExecuteSequence>
20 <Directory Id="TARGETDIR" Name="SourceDir">
21 <Directory Id="TARGETDIR" Name="SourceDir">
21− <Directory Id="DesktopFolder" Name="Desktop" />
22 <Directory Id="ProgramMenuFolder">
22 <Directory Id="ProgramMenuFolder">
23 <Directory Id="ApplicationProgramsFolder" Name="Pandoc"/>
23 <Directory Id="ApplicationProgramsFolder" Name="Pandoc"/>
24 </Directory>
24 </Directory>
25− <Directory Id="ProgramFilesFolder">
25+ <Directory Id="LocalAppDataFolder">
26 <Directory Id="INSTALLDIR" Name="Pandoc">
26 <Directory Id="INSTALLDIR" Name="Pandoc">
27 <Component Id="MainExecutable"
27 <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"/>
29 <File Id="pandocEXE" Name="pandoc.exe"
32 <File Id="pandocEXE" Name="pandoc.exe"
30 Source="..\cabal-dev\bin\pandoc.exe" />
33 Source="..\cabal-dev\bin\pandoc.exe" />
31 <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
34 <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
@@ -33,10 +36,12 @@
33 <File Id="pandocCOPYING" Name="COPYING.rtf"
36 <File Id="pandocCOPYING" Name="COPYING.rtf"
34 Source="..\COPYING.rtf" />
37 Source="..\COPYING.rtf" />
35 <Environment Id="UpdatePath" Name="PATH" Action="set"
38 <Environment Id="UpdatePath" Name="PATH" Action="set"
36− Part="last" System="yes" Value="[INSTALLDIR]" />
39+ Part="last" Value="[INSTALLDIR]" />
37 </Component>
40 </Component>
38 <Component Id="Documentation"
41 <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"/>
40 <File Id="pandocREADME" Name="Pandoc User's Guide.html"
45 <File Id="pandocREADME" Name="Pandoc User's Guide.html"
41 Source="..\README.html" />
46 Source="..\README.html" />
42 </Component>
47 </Component>
@@ -51,7 +56,8 @@
51 Target="[INSTALLDIR]Pandoc User's Guide.html"
56 Target="[INSTALLDIR]Pandoc User's Guide.html"
52 WorkingDirectory="INSTALLDIR" />
57 WorkingDirectory="INSTALLDIR" />
53 <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
58 <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"/>
55 </Component>
61 </Component>
56 </DirectoryRef>
62 </DirectoryRef>
57 <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="INSTALLDIR">
63 <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="INSTALLDIR">