aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Eric Janouch <p@janouch.name>2023-06-26 12:24:09 +0200
committerPřemysl Eric Janouch <p@janouch.name>2023-06-26 12:39:12 +0200
commit88234f8283de71e34a9bca427ed5fbc94839e6a4 (patch)
tree5e9ee5c091494d1d404b09d71bd0f86cf27a43be
parent49ee551b9bff0bace277e416a4c4e2d1cd445036 (diff)
downloadfiv-88234f8283de71e34a9bca427ed5fbc94839e6a4.tar.gz
fiv-88234f8283de71e34a9bca427ed5fbc94839e6a4.tar.xz
fiv-88234f8283de71e34a9bca427ed5fbc94839e6a4.zip
Clean up the WiX XML a bit
-rw-r--r--fiv.wxs.in40
1 files changed, 21 insertions, 19 deletions
diff --git a/fiv.wxs.in b/fiv.wxs.in
index c81fcbb..7c34878 100644
--- a/fiv.wxs.in
+++ b/fiv.wxs.in
@@ -35,32 +35,34 @@
-->
<Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='$(var.ProgramFilesFolder)' Name='Files'>
+ <Directory Id='$(var.ProgramFilesFolder)'>
<Directory Id='INSTALLDIR' Name='$(var.FullName)' />
</Directory>
- <Directory Id='ProgramMenuFolder' Name='Programs'>
- <Directory Id='ProgramMenuDir' Name='$(var.FullName)'>
- <Component Id='ProgramMenuDir' Guid='*'>
- <Shortcut Id='ProgramsMenuShortcut'
- Name='@ProjectName@'
- Target='[INSTALLDIR]\fiv.exe'
- WorkingDirectory='INSTALLDIR'
- Arguments='"%USERPROFILE%"'
- Icon='fiv.ico' />
- <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
- <RegistryValue Root='HKCU'
- Key='Software\[Manufacturer]\[ProductName]'
- Type='string'
- Value=''
- KeyPath='yes' />
- </Component>
- </Directory>
+ <Directory Id='ProgramMenuFolder'>
+ <Directory Id='ProgramMenuDir' Name='$(var.FullName)' />
</Directory>
- <Directory Id='DesktopFolder' Name='Desktop' />
+ <Directory Id='DesktopFolder' />
</Directory>
+ <DirectoryRef Id='ProgramMenuDir'>
+ <Component Id='ProgramMenuDir' Guid='*'>
+ <Shortcut Id='ProgramsMenuShortcut'
+ Name='@ProjectName@'
+ Target='[INSTALLDIR]\fiv.exe'
+ WorkingDirectory='INSTALLDIR'
+ Arguments='"%USERPROFILE%"'
+ Icon='fiv.ico' />
+ <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
+ <RegistryValue Root='HKCU'
+ Key='Software\[Manufacturer]\[ProductName]'
+ Type='string'
+ Value=''
+ KeyPath='yes' />
+ </Component>
+ </DirectoryRef>
+
<Feature Id='Complete' Level='1'>
<ComponentGroupRef Id='CG.fiv' />
<ComponentRef Id='ProgramMenuDir' />