osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Jaap Keuter 2018-02-28 13:36:55 +01:00 committed by Anders Broman
parent 302fa68817
commit 432166de1e
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/wix/DirectoryStructure.wxi
View File

@ -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>
</Include>

28
packaging/wix/Plugins.wxi
View File

@ -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>