opensource/pandoc
3
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-24 15:44:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

WiX: Use APPLICATIONFOLDER property name as required by “Advanced” template.

Browse Source 
Followup to cd4ad4bc96.
This commit is contained in:
Fyodor Sheremetyev
2013-03-15 15:40:48 +00:00
parent 842661ee18
commit d7b6da66c4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/pandoc.wxs
+4 -4
View File
@@ -28,12 +28,12 @@
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder"> <Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="Pandoc"> <Directory Id="APPLICATIONFOLDER" Name="Pandoc">
<Component Id="MainExecutable" <Component Id="MainExecutable"
Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7"> Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7">
<RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc" <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc"
Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/> Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
<RemoveFolder Id="INSTALLDIR" On="uninstall"/> <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
<File Id="pandocEXE" Name="pandoc.exe" <File Id="pandocEXE" Name="pandoc.exe"
Source="..\cabal-dev\bin\pandoc.exe" /> Source="..\cabal-dev\bin\pandoc.exe" />
<File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt" <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
@@ -41,7 +41,7 @@
<File Id="pandocCOPYING" Name="COPYING.rtf" <File Id="pandocCOPYING" Name="COPYING.rtf"
Source="..\COPYING.rtf" /> Source="..\COPYING.rtf" />
<Environment Id="UpdatePath" Name="PATH" Action="set" <Environment Id="UpdatePath" Name="PATH" Action="set"
Part="last" Value="[INSTALLDIR]" /> Part="last" Value="[APPLICATIONFOLDER]" />
</Component> </Component>
<Component Id="Documentation" <Component Id="Documentation"
Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3"> Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3">
@@ -66,7 +66,7 @@
</Directory> </Directory>
<Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="INSTALLDIR"> <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="APPLICATIONFOLDER">
<Feature Id="MainProgram" Title="Program" Description="The main executable." Level="1"> <Feature Id="MainProgram" Title="Program" Description="The main executable." Level="1">
<ComponentRef Id="MainExecutable" /> <ComponentRef Id="MainExecutable" />
</Feature> </Feature>