diff options
author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2018-02-28 13:36:55 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-03-03 10:12:35 +0000 |
commit | 432166de1e115df93b606378372855cee4ba8ffc (patch) | |
tree | 8076afce98b0a37840fed8c936449853925a033c /packaging/wix | |
parent | 302fa6881751e5a8f9c8c197ab0008ee336e821a (diff) |
WiX: install the other plugin types as well
The WiX toolset configuration files have to be extended to handle the
new plugin directory structure as well. Apart from the EPAN plugins
the wiretap and codec plugins have to be included as well.
Change-Id: I173e6b87a88e4ef8aa3283a308e2b5207f0d6ba2
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/26176
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/wix')
-rw-r--r-- | packaging/wix/DirectoryStructure.wxi | 4 | ||||
-rw-r--r-- | packaging/wix/Plugins.wxi | 28 |
2 files changed, 31 insertions, 1 deletions
diff --git a/packaging/wix/DirectoryStructure.wxi b/packaging/wix/DirectoryStructure.wxi index 2e17841ec8..34dcaf8403 100644 --- a/packaging/wix/DirectoryStructure.wxi +++ b/packaging/wix/DirectoryStructure.wxi @@ -30,6 +30,8 @@ <Directory Id="dirPlugins" Name="plugins"> <Directory Id="dirPluginsVersion" Name="$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)"> <Directory Id="dirPluginsVersionEpan" Name="epan"/> + <Directory Id="dirPluginsVersionWtap" Name="wiretap"/> + <Directory Id="dirPluginsVersionCodecs" Name="codecs"/> </Directory> </Directory> <Directory Id="dirProfiles" Name="profiles"/> @@ -57,4 +59,4 @@ </Directory> </Fragment> -</Include>
\ No newline at end of file +</Include> diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi index 0c59565055..7ef294f653 100644 --- a/packaging/wix/Plugins.wxi +++ b/packaging/wix/Plugins.wxi @@ -91,4 +91,32 @@ </ComponentGroup> </Fragment> + <!-- wiretap --> + <Fragment> + <DirectoryRef Id="dirPluginsVersionWtap"> + <Component Id="cmpUsbdump_dll" Guid="*"> + <File Id="filUsbdump_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\wiretap\usbdump.dll" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Plugins.Usbdump"> + <ComponentRef Id="cmpUsbdump_dll" /> + </ComponentGroup> + </Fragment> + + <!-- codecs --> + <Fragment> + <DirectoryRef Id="dirPluginsVersionCodecs"> + <Component Id="cmpL16mono_dll" Guid="*"> + <File Id="filL16mono_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\l16mono.dll" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Plugins.L16mono"> + <ComponentRef Id="cmpL16mono_dll" /> + </ComponentGroup> + </Fragment> + </Include> |