From 693dcd276e556033b1176d16f4ea257ae3e68ea5 Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Mon, 12 Dec 2016 21:42:14 +0100
Subject: Build TRANSUM plugin

Add plugin to autofoo and CMake build systems and fix errors found
Add plugin to Windows installer (optional component activated by default)

Change-Id: Id1b777bdee04e53076b3291f6fb68d5abad6985d
Reviewed-on: https://code.wireshark.org/review/19228
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
---
 packaging/nsis/wireshark.nsi |  8 ++++++++
 packaging/wix/Plugins.wxi    | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

(limited to 'packaging')

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 527e765b55..184c1d9c16 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -1026,6 +1026,13 @@ SetOutPath '$INSTDIR\plugins\${VERSION}'
 File "${STAGING_DIR}\plugins\mate.dll"
 SectionEnd
 
+
+Section "TRANSUM - network and application performance analysis" SecTransum
+;-------------------------------------------
+SetOutPath '$INSTDIR\plugins\${VERSION}'
+File "${STAGING_DIR}\plugins\transum.dll"
+SectionEnd
+
 Section "Configuration Profiles" SecProfiles
 ;-------------------------------------------
 ; This should be a function or macro
@@ -1166,6 +1173,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Additional protocol dissectors."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Extended statistics."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMate} "Plugin - Meta Analysis and Tracing Engine (Experimental)."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecTransum} "TRANSUM plugin - network and application performance analysis."
 
   !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiles} "Configuration profiles"
 
diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi
index 7964e27465..2bf2718fbc 100644
--- a/packaging/wix/Plugins.wxi
+++ b/packaging/wix/Plugins.wxi
@@ -85,4 +85,18 @@
     </ComponentGroup>
   </Fragment>
 
+  <!-- TRANSUM -->
+  <Fragment>
+    <DirectoryRef Id="dirPluginsVersion">
+      <Component Id="cmpTransum_dll" Guid="*">
+        <File Id="filTransum_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\transum.dll" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.Plugins.Transum">
+      <ComponentRef Id="cmpTransum_dll" />
+    </ComponentGroup>
+  </Fragment>
+
 </Include>
-- 
cgit v1.2.3