Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Commit 83ff4f0

Browse files
committed
Switch to WixUI_Advanced
This allows to choose install scope (permachine/peruser) and directory
1 parent 61f17d4 commit 83ff4f0

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

msi/rust.wxs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
Compressed="yes" />
1313

1414
<Icon Id="rust.ico" SourceFile="rust-logo.ico" />
15+
<Property Id="ApplicationFolderName" Value="Rust-$(env.CFG_CHANNEL)" />
16+
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
1517
<Property Id="ARPPRODUCTICON" Value="rust.ico" />
1618
<!-- txt format is not supported -->
1719
<WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" />
@@ -26,7 +28,7 @@
2628
<!-- Installation directory and files are defined in Files.wxs -->
2729
<Directory Id="TARGETDIR" Name="SourceDir">
2830
<Directory Id="ProgramFilesFolder">
29-
<Directory Id="INSTALLDIR" Name="Rust">
31+
<Directory Id="APPLICATIONFOLDER" Name="Rust-$(env.CFG_CHANNEL)">
3032
<!-- Root directories for every feature should have different IDs for correct work of heat.exe -->
3133
<Directory Id="Rustc" Name="." />
3234
<Directory Id="Gcc" Name="." />
@@ -36,9 +38,9 @@
3638
</Directory>
3739

3840
<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" />
4244
</Component>
4345

4446
</Directory>
@@ -88,6 +90,6 @@
8890
directly from the license agreement dialog to the feature
8991
customization dialog.
9092
-->
91-
<UIRef Id="WixUI_FeatureTree" />
93+
<UIRef Id="WixUI_Advanced" />
9294
</Product>
9395
</Wix>

0 commit comments

Comments
 (0)