|
12 | 12 | Compressed="yes" />
|
13 | 13 |
|
14 | 14 | <Icon Id="rust.ico" SourceFile="rust-logo.ico" />
|
| 15 | + <Property Id="ApplicationFolderName" Value="Rust-$(env.CFG_CHANNEL)" /> |
| 16 | + <Property Id="WixAppFolder" Value="WixPerMachineFolder" /> |
15 | 17 | <Property Id="ARPPRODUCTICON" Value="rust.ico" />
|
16 | 18 | <!-- txt format is not supported -->
|
17 | 19 | <WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" />
|
|
26 | 28 | <!-- Installation directory and files are defined in Files.wxs -->
|
27 | 29 | <Directory Id="TARGETDIR" Name="SourceDir">
|
28 | 30 | <Directory Id="ProgramFilesFolder">
|
29 |
| - <Directory Id="INSTALLDIR" Name="Rust"> |
| 31 | + <Directory Id="APPLICATIONFOLDER" Name="Rust-$(env.CFG_CHANNEL)"> |
30 | 32 | <!-- Root directories for every feature should have different IDs for correct work of heat.exe -->
|
31 | 33 | <Directory Id="Rustc" Name="." />
|
32 | 34 | <Directory Id="Gcc" Name="." />
|
|
36 | 38 | </Directory>
|
37 | 39 |
|
38 | 40 | <Component Id="PathEnv" Guid="*">
|
39 |
| - <RegistryValue Root="HKLM" Key="Software\[Manufacturer]\[ProductName]" Name="InstallDir" Type="string" Value="[INSTALLDIR]" KeyPath="yes" /> |
40 |
| - <!-- [INSTALLDIR] contains trailing backslash --> |
41 |
| - <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]bin" Permanent="no" Part="last" Action="set" System="yes" /> |
| 41 | + <RegistryValue Root="HKLM" Key="Software\[Manufacturer]\[ProductName]" Name="InstallDir" Type="string" Value="[APPLICATIONFOLDER]" KeyPath="yes" /> |
| 42 | + <!-- [APPLICATIONFOLDER] contains trailing backslash --> |
| 43 | + <Environment Id="PATH" Name="PATH" Value="[APPLICATIONFOLDER]bin" Permanent="no" Part="last" Action="set" System="yes" /> |
42 | 44 | </Component>
|
43 | 45 |
|
44 | 46 | </Directory>
|
|
88 | 90 | directly from the license agreement dialog to the feature
|
89 | 91 | customization dialog.
|
90 | 92 | -->
|
91 |
| - <UIRef Id="WixUI_FeatureTree" /> |
| 93 | + <UIRef Id="WixUI_Advanced" /> |
92 | 94 | </Product>
|
93 | 95 | </Wix>
|
0 commit comments