diff options
| author | Chuck Craft <bubbasnmp@gmail.com> | 2022-04-06 20:04:31 -0500 |
|---|---|---|
| committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-04-07 22:09:02 +0000 |
| commit | 0c316ec1a96fac865eb97f8d39edbb8ed31736e4 (patch) | |
| tree | b14ecf0acc2d5bc25811dd000bffaa7270cf6b01 | |
| parent | 54553de59d24175ede07d3b423080cb9824c3360 (diff) | |
NSIS/Wix: missing preferences file for Bluetooth profile
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 1 | ||||
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 74432b8342..1429e3dc03 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1078,6 +1078,7 @@ Section "Configuration Profiles" SecProfiles ; This should be a function or macro SetOutPath '$INSTDIR\profiles\Bluetooth' File "${STAGING_DIR}\profiles\Bluetooth\colorfilters" +File "${STAGING_DIR}\profiles\Bluetooth\preferences" SetOutPath '$INSTDIR\profiles\Classic' File "${STAGING_DIR}\profiles\Classic\colorfilters" SetOutPath '$INSTDIR\profiles\No Reassembly' diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index e499f7d2bc..8816dc7c97 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -260,6 +260,9 @@ <Component Id="cmpBluetooth_colorfilters" Guid="*"> <File Id="filBluetooth_colorfilters" KeyPath="yes" Source="$(var.Profiles.Dir)\Bluetooth\colorfilters" /> </Component> + <Component Id="cmpBluetooth_preferences" Guid="*"> + <File Id="filBluetooth_preferences" KeyPath="yes" Source="$(var.Profiles.Dir)\Bluetooth\preferences" /> + </Component> </Directory> <Directory Id="dirClassic" Name="Classic"> <Component Id="cmpClassic_colorfilters" Guid="*"> @@ -276,6 +279,7 @@ <Fragment> <ComponentGroup Id="CG.Plugins.ConfigurationProfiles"> <ComponentRef Id="cmpBluetooth_colorfilters" /> + <ComponentRef Id="cmpBluetooth_preferences" /> <ComponentRef Id="cmpClassic_colorfilters" /> <ComponentRef Id="cmpNoReassembly_preferences" /> </ComponentGroup> |