aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-12-12 21:42:14 +0100
committerPascal Quantin <pascal.quantin@gmail.com>2016-12-13 08:50:27 +0000
commit693dcd276e556033b1176d16f4ea257ae3e68ea5 (patch)
tree9eea1e83a8e0086c5f5f4d1fc00c4e692c40335e /packaging
parent862905da1b84e1997e2b2a5d4ae8bbaaedb804de (diff)
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>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/wireshark.nsi8
-rw-r--r--packaging/wix/Plugins.wxi14
2 files changed, 22 insertions, 0 deletions
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>