From 5df1294de2069a54343e535ceeeb3ce61ea5f355 Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal@wireshark.org>
Date: Wed, 12 Jun 2019 00:12:27 +0200
Subject: [PATCH] wix: fix packaging of various plugins

Change-Id: I4ae23792abe2409ab833802b9d7dffc076234db5
Reviewed-on: https://code.wireshark.org/review/33563
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
---
 packaging/wix/Features.wxi |  9 +++++++++
 packaging/wix/Plugins.wxi  | 14 ++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi
index 8f441fda24..eb37b11f95 100644
--- a/packaging/wix/Features.wxi
+++ b/packaging/wix/Features.wxi
@@ -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" />
diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi
index 5de46486d2..f6f729be2e 100644
--- a/packaging/wix/Plugins.wxi
+++ b/packaging/wix/Plugins.wxi
@@ -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>