Skip to content

Commit 64dadc8

Browse files
author
tajbender
committed
Do Refactoring: Update WiX-Setup
1 parent 8c090a6 commit 64dadc8

File tree

1 file changed

+60
-56
lines changed

1 file changed

+60
-56
lines changed

‎src/WiX-Setup/electrifier.wxs‎

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,92 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
33
xmlns:ui="http://schemas.microsoft.com/wix/UIExtension">
4-
<Product Name="electrifier" Manufacturer="electrifier.org"
4+
<Product Name="electrifier" Manufacturer="electrifier.org"
55
Id="FEFDADB6-9D7F-45E2-9A0D-21C9F911C1B6"
66
Language="1033" Version="0.1.0"
77
UpgradeCode="5EF00F55-738A-44D1-86A8-470AD761B125">
8-
<Package Id="*" Keywords="Installer" Description="electrifier 0.1.0 Setup"
8+
<Package Id="*" Keywords="Installer" Description="electrifier 0.1.0 Setup"
99
Comments="For more information consult electrifier.org"
1010
Manufacturer="electrifier.org"
1111
Compressed="yes" InstallerVersion="200" InstallScope="perMachine"/>
1212

13-
<MajorUpgrade DowngradeErrorMessage="A newer version of electrifier is already installed." />
13+
<MajorUpgrade DowngradeErrorMessage="A newer version of electrifier is already installed." />
1414

15-
<Media Id='1' Cabinet='electrifier.cab' EmbedCab='yes'/>
15+
<Media Id='1' Cabinet='electrifier.cab' EmbedCab='yes'/>
1616

17-
<!-- Properties controlling the installer GUI including the license agreement -->
18-
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
19-
<UIRef Id="WixUI_InstallDir" />
20-
<WixVariable Id="WixUILicenseRtf" Value="..\..\assets\License.rtf" />
17+
<!-- Properties controlling the installer GUI including the license agreement -->
18+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
19+
<UIRef Id="WixUI_InstallDir" />
20+
<WixVariable Id="WixUILicenseRtf" Value="..\..\assets\License.rtf" />
2121

22-
<Feature Id="ProductFeature" Title="electrifier" Level="1">
23-
<ComponentGroupRef Id="ProductComponents" />
24-
<ComponentGroupRef Id="StartMenuShortcuts" />
25-
</Feature>
26-
</Product>
22+
<Feature Id="ProductFeature" Title="electrifier" Level="1">
23+
<ComponentGroupRef Id="ProductComponents" />
24+
<ComponentGroupRef Id="StartMenuShortcuts" />
25+
</Feature>
26+
</Product>
2727

28-
<Fragment>
29-
<Directory Id="TARGETDIR" Name="SourceDir">
30-
<Directory Id="ProgramFilesFolder">
31-
<Directory Id="INSTALLFOLDER" Name="electrifier"/>
32-
</Directory>
33-
<Directory Id="ProgramMenuFolder">
34-
<Directory Id="ApplicationProgramsFolder" Name="electrifier"/>
35-
</Directory>
36-
</Directory>
37-
</Fragment>
28+
<Fragment>
29+
<Directory Id="TARGETDIR" Name="SourceDir">
30+
<Directory Id="ProgramFilesFolder">
31+
<Directory Id="INSTALLFOLDER" Name="electrifier"/>
32+
</Directory>
33+
<Directory Id="ProgramMenuFolder">
34+
<Directory Id="ApplicationProgramsFolder" Name="electrifier"/>
35+
</Directory>
36+
</Directory>
37+
</Fragment>
3838

39-
<!-- Main product components -->
40-
<Fragment>
41-
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
42-
<Component Id="electrifier.exe" Guid="95DCC755-0591-4D0C-8417-89323377F58A">
43-
<File Id="electrifier.exe"
39+
<!-- Main product components -->
40+
<Fragment>
41+
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
42+
<Component Id="electrifier.exe" Guid="95DCC755-0591-4D0C-8417-89323377F58A">
43+
<File Id="electrifier.exe"
4444
Source="$(var.electrifier.TargetPath)" KeyPath="yes" Checksum="yes"/>
45-
</Component>
46-
<Component Id="electrifier.Core.dll" Guid="C2E08C77-6624-4D12-A1B5-983547AC017C">
47-
<File Id="electrifier.Core.dll"
45+
</Component>
46+
<Component Id="electrifier.Core.dll" Guid="C2E08C77-6624-4D12-A1B5-983547AC017C">
47+
<File Id="electrifier.Core.dll"
4848
Source="$(var.electrifier.Core.TargetPath)" KeyPath="yes" Checksum="yes"/>
49-
</Component>
50-
<Component Id="electrifier.Win32API.dll" Guid="51B7BE3A-A2C1-4331-87AC-0F0F766AB3ED">
51-
<File Id="electrifier.Win32API.dll"
52-
Source="$(var.electrifier.Win32API.TargetPath)" KeyPath="yes" Checksum="yes"/>
53-
</Component>
54-
<Component Id="Ribbon.dll" Guid="E0585B1A-F371-47BB-B2BD-7A9686BB79B0">
55-
<File Id="Ribbon.dll"
49+
</Component>
50+
<Component Id="Ribbon.dll" Guid="E0585B1A-F371-47BB-B2BD-7A9686BB79B0">
51+
<File Id="Ribbon.dll"
5652
Source="$(var.electrifier.Core.TargetDir)\Ribbon.dll" KeyPath="yes" Checksum="yes"/>
57-
</Component>
58-
<Component Id="WeifenLuo.WinFormsUI.Docking.dll" Guid="D1CE63A5-AD52-457C-B296-D8319ADB0907">
59-
<File Id="WeifenLuo.WinFormsUI.Docking.dll"
53+
</Component>
54+
<Component Id="Microsoft.WindowsAPICodePack.dll" Guid="EFC2DC76-8D9D-4121-B75C-77560D54A58D">
55+
<File Id="Microsoft.WindowsAPICodePack.dll"
56+
Source="$(var.electrifier.Core.TargetDir)\Microsoft.WindowsAPICodePack.dll" KeyPath="yes" Checksum="yes"/>
57+
</Component>
58+
<Component Id="Microsoft.WindowsAPICodePack.Shell.dll" Guid="126DE769-B7FC-41CB-B3BB-9C262F9FE8D1">
59+
<File Id="Microsoft.WindowsAPICodePack.Shell.dll"
60+
Source="$(var.electrifier.Core.TargetDir)\Microsoft.WindowsAPICodePack.Shell.dll" KeyPath="yes" Checksum="yes"/>
61+
</Component>
62+
<Component Id="WeifenLuo.WinFormsUI.Docking.dll" Guid="D1CE63A5-AD52-457C-B296-D8319ADB0907">
63+
<File Id="WeifenLuo.WinFormsUI.Docking.dll"
6064
Source="$(var.electrifier.Core.TargetDir)\WeifenLuo.WinFormsUI.Docking.dll" KeyPath="yes" Checksum="yes"/>
61-
</Component>
62-
</ComponentGroup>
63-
</Fragment>
65+
</Component>
66+
</ComponentGroup>
67+
</Fragment>
6468

65-
<!-- Start menu shortcuts -->
66-
<Fragment>
67-
<ComponentGroup Id="StartMenuShortcuts" Directory="ApplicationProgramsFolder">
68-
<Component Id="ApplicationShortcuts" Guid="C7390F72-C8AE-4817-B237-F0A9C61E038A">
69-
<Shortcut Id="Launch_electrifier"
69+
<!-- Start menu shortcuts -->
70+
<Fragment>
71+
<ComponentGroup Id="StartMenuShortcuts" Directory="ApplicationProgramsFolder">
72+
<Component Id="ApplicationShortcuts" Guid="C7390F72-C8AE-4817-B237-F0A9C61E038A">
73+
<Shortcut Id="Launch_electrifier"
7074
Name="electrifier"
71-
Description="electrifier desktop enhancement suite"
75+
Description="Launches electrifier"
7276
Target="[#electrifier.exe]"
7377
WorkingDirectory="ApplicationRootDirectory"/>
7478

75-
<Shortcut Id="Uninstall_Product"
79+
<Shortcut Id="Uninstall_Product"
7680
Name="Uninstall electrifier"
7781
Description="Uninstalls electrifier"
7882
Target="[System64Folder]msiexec.exe"
7983
Arguments="/x [ProductCode]"/>
8084

81-
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
82-
<RegistryValue Root="HKCU"
85+
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
86+
<RegistryValue Root="HKCU"
8387
Key="Software\electrifier.org\electrifier"
8488
Name="Installed" Type="integer" Value="1" KeyPath="yes"/>
85-
</Component>
86-
</ComponentGroup>
87-
</Fragment>
89+
</Component>
90+
</ComponentGroup>
91+
</Fragment>
8892
</Wix>

0 commit comments

Comments
 (0)