osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wix: fix packaging of various plugins 

Change-Id: I4ae23792abe2409ab833802b9d7dffc076234db5
Reviewed-on: https://code.wireshark.org/review/33563
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-06-12 00:12:27 +02:00
parent f4c8abdb3e
commit 5df1294de2
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packaging/wix/Features.wxi
View File

@ -37,6 +37,15 @@
<Feature Id="Fe.Plugins.Mate" Title="Mate - Meta Analysis and Tracing Engine" Level="1" AllowAdvertise="yes" Display="expand" Description="Plugin - Meta Analysis and Tracing Engine (Experimental).">
<ComponentGroupRef Id="CG.Plugins.Mate" />
</Feature>
<Feature Id="Fe.Plugins.Transum" Title="TRANSUM - Network and application performance analysis" Level="1" AllowAdvertise="yes" Display="expand" Description="Plugin - Network and application performance analysis (Experimental).">
<ComponentGroupRef Id="CG.Plugins.Transum" />
</Feature>
<Feature Id="Fe.Plugins.Wiretap" Title="Wiretap Plugins" Level="1" AllowAdvertise="yes" Display="expand" Description="Additional file formats support.">
<ComponentGroupRef Id="CG.Plugins.Wiretap" />
</Feature>
<Feature Id="Fe.Plugins.Codecs" Title="Codec Plugins" Level="1" AllowAdvertise="yes" Display="expand" Description="Codecs playback support.">
<ComponentGroupRef Id="CG.Plugins.Codecs" />
</Feature>
<Feature Id="Fe.Plugins.ConfigurationProfiles" Title="Configuration Profiles" Level="1" AllowAdvertise="yes" Display="expand" Description="Configuration Profiles">
<!-- XXX - Cleanup configuration profiles directory on uninstall -->
<ComponentGroupRef Id="CG.Plugins.ConfigurationProfiles" />

14
packaging/wix/Plugins.wxi
View File

@ -100,7 +100,7 @@
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="CG.Plugins.Usbdump">
<ComponentGroup Id="CG.Plugins.Wiretap">
<ComponentRef Id="cmpUsbdump_dll" />
</ComponentGroup>
</Fragment>
@ -129,22 +129,12 @@
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="CG.Plugins.G711">
<ComponentGroup Id="CG.Plugins.Codecs">
<ComponentRef Id="cmpG711_dll" />
</ComponentGroup>
<ComponentGroup Id="CG.Plugins.G722">
<ComponentRef Id="cmpG722_dll" />
</ComponentGroup>
<ComponentGroup Id="CG.Plugins.G726">
<ComponentRef Id="cmpG726_dll" />
</ComponentGroup>
<ComponentGroup Id="CG.Plugins.G729">
<ComponentRef Id="cmpG729_dll" />
</ComponentGroup>
<ComponentGroup Id="CG.Plugins.L16mono">
<ComponentRef Id="cmpL16mono_dll" />
</ComponentGroup>
<ComponentGroup Id="CG.Plugins.SBC">
<ComponentRef Id="cmpSBC_dll" />
</ComponentGroup>
</Fragment>