diff options
| author | Fyodor Sheremetyev <sheremetyev@gmail.com> | 2013-03-15 14:25:40 +0000 |
|---|---|---|
| committer | Fyodor Sheremetyev <sheremetyev@gmail.com> | 2013-03-15 14:25:40 +0000 |
| commit | e6f32806fdbf4efacc316942131143370695e709 (patch) | |
| tree | d81a9e9ac6e3699f9cc778ef966f80af923efb4c | |
| parent | cd4ad4bc96f864450b374f34f3ae8b0bf4952d87 (diff) | |
| download | pandoc-e6f32806fdbf4efacc316942131143370695e709.tar.gz | |
WiX: Refactoring: Place all components inside single directory structure.
For the sake of simplicity.
| -rw-r--r-- | windows/pandoc.wxs | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs index 2d6cfada3..60a62995a 100644 --- a/windows/pandoc.wxs +++ b/windows/pandoc.wxs @@ -25,9 +25,7 @@ <Property Id="WixAppFolder" Value="WixPerUserFolder" />
<Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramMenuFolder">
- <Directory Id="ApplicationProgramsFolder" Name="Pandoc"/>
- </Directory>
+
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="Pandoc">
<Component Id="MainExecutable"
@@ -53,20 +51,23 @@ </Component>
</Directory>
</Directory>
- </Directory>
- <DirectoryRef Id="ApplicationProgramsFolder">
- <Component Id="ApplicationShortcut" Guid="7F807DD5-CC54-474A-B571-89630893F563">
- <Shortcut Id="ApplicationStartMenuShortcut"
- Name="Pandoc User's Guide"
- Description="Pandoc User's Guide"
- Target="[INSTALLDIR]Pandoc User's Guide.html"
- WorkingDirectory="INSTALLDIR" />
- <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
- <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
- Name="ShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
- </Component>
- </DirectoryRef>
+ <Directory Id="ProgramMenuFolder">
+ <Directory Id="ApplicationProgramsFolder" Name="Pandoc">
+ <Component Id="ApplicationShortcut" Guid="7F807DD5-CC54-474A-B571-89630893F563">
+ <Shortcut Id="ApplicationStartMenuShortcut"
+ Name="Pandoc User's Guide"
+ Description="Pandoc User's Guide"
+ Target="[INSTALLDIR]Pandoc User's Guide.html"
+ WorkingDirectory="INSTALLDIR" />
+ <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+ <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
+ Name="ShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+ </Component>
+ </Directory>
+ </Directory>
+
+ </Directory>
<Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="INSTALLDIR">
<Feature Id="MainProgram" Title="Program" Description="The main executable." Level="1">
|