From 1867a5e9a5b8e91139d2a4db3b5419bd6fdfded8 Mon Sep 17 00:00:00 2001 From: Olivier Biot Date: Wed, 28 Jul 2004 23:09:12 +0000 Subject: [PATCH] Add capinfo to the Windows installer. svn path=/trunk/; revision=11558 --- packaging/nsis/Makefile.nmake | 3 ++- packaging/nsis/ethereal.nsi | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 2b49dcd2bc..eb1bba79f4 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -40,7 +40,7 @@ EXE=../../tethereal.exe ../../editcap.exe \ !IFDEF GTK2_DIR ../../ethereal-gtk2.exe \ !ENDIF - ../../text2pcap.exe ../../mergecap.exe + ../../text2pcap.exe ../../mergecap.exe ../../capinfo.exe DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll DOC=../../doc/ethereal.html \ ../../doc/tethereal.html \ @@ -48,6 +48,7 @@ DOC=../../doc/ethereal.html \ ../../doc/editcap.html \ ../../doc/text2pcap.html \ ../../doc/mergecap.html \ + ../../doc/capinfo.html \ ../../FAQ \ ../../README \ ../../README.win32 diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index ed16407b04..57c251faec 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -357,6 +357,16 @@ File "..\..\mergecap.exe" File "..\..\doc\mergecap.html" SectionEnd +Section "Capinfo" SecCapinfo +;------------------------------------------- +!ifdef GTK1_DIR & GTK2_DIR +SectionIn 1 2 +!endif +SetOutPath $INSTDIR +File "..\..\capinfo.exe" +File "..\..\doc\capinfo.html" +SectionEnd + Section "Plugins" SecPlugins ;------------------------------------------- @@ -628,6 +638,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Editcap is a program that reads a capture file and writes some or all of the packets into another capture file." !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Text2pcap is a program that reads in an ASCII hex dump and writes the data into a libpcap-style capture file." !insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Mergecap is a program that combines multiple saved capture files into a single output file." + !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfo} "Capinfo is a program that provides information on capture files." !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Plugins with some extended dissections." !insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection." !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Start menu shortcuts."