add xml and stats_tree plugin to the installer.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13657 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index c5f9c694093c95868c9b4ce4e6f39f1ebd5506ae..8a3f739d6e3f6b1aed9d79c95e9fb44c01b63f0c 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -83,7 +83,9 @@ PLUGINS=../../plugins/acn/acn.dll \
        ../../plugins/rlm/rlm.dll \
        ../../plugins/rtnet/rtnet.dll \
        ../../plugins/rudp/rudp.dll \
-       ../../plugins/v5ua/v5ua.dll
+       ../../plugins/stats_tree/stats_tree.dll \
+       ../../plugins/v5ua/v5ua.dll \
+       ../../plugins/xml/xml.dll
 
 DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS)
 

diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index 868b7b43255bd573ad2a3e7680872ff303daad4a..460b39fe0c7f6ee8a1138dbb393e007c9a369631 100644 (file)
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -412,7 +412,7 @@ File "..\..\doc\capinfos.html"
 SectionEnd
 
 
-Section "Plugins" SecPlugins
+Section "Dissector Plugins" SecPlugins
 ;-------------------------------------------
 !ifdef GTK1_DIR & GTK2_DIR
 SectionIn 1 2
@@ -439,6 +439,16 @@ File "..\..\plugins\rlm\rlm.dll"
 File "..\..\plugins\rtnet\rtnet.dll"
 File "..\..\plugins\rudp\rudp.dll"
 File "..\..\plugins\v5ua\v5ua.dll"
+File "..\..\plugins\xml\xml.dll"
+SectionEnd
+
+Section "Tree Statistics Plugin (currently only for http)" SecStatsTree
+;-------------------------------------------
+!ifdef GTK1_DIR & GTK2_DIR
+SectionIn 1 2
+!endif
+SetOutPath $INSTDIR\plugins\${VERSION}
+File "..\..\plugins\stats_tree\stats_tree.dll"
 SectionEnd
 
 Section "Mate - Meta Analysis and Tracing Engine (Experimental)" SecMate
@@ -698,6 +708,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Mergecap is a program that combines multiple saved capture files into a single output file."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Capinfos is a program that provides information on capture files."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Plugins with some extended dissections."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Plugin for some extended statistics."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMate} "Plugin - Meta Analysis and Tracing Engine (Experimental)."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Start menu shortcuts."