diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 7b9d72705d..5e650522fe 100644 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -129,6 +129,7 @@ Push "${EXECUTABLE_MARKER}" Push "${PROGRAM_NAME}" Push "androiddump" Push "capinfos" +Push "captype" Push "ciscodump" Push "dftest" Push "dumpcap" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 5f98869427..04cf01a094 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1141,6 +1141,13 @@ File "${STAGING_DIR}\capinfos.exe" File "${STAGING_DIR}\capinfos.html" SectionEnd +Section "Captype" SecCaptype +;------------------------------------------- +SetOutPath $INSTDIR +File "${STAGING_DIR}\captype.exe" +File "${STAGING_DIR}\captype.html" +SectionEnd + Section "Rawshark" SecRawshark ;------------------------------------------- SetOutPath $INSTDIR @@ -1255,6 +1262,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecReordercap} "Copy packets to a new file, sorted by time." !insertmacro MUI_DESCRIPTION_TEXT ${SecDFTest} "Shows display filter byte-code, for debugging dfilter routines" !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Print information about capture files." + !insertmacro MUI_DESCRIPTION_TEXT ${SecCaptype} "Print the types capture files." !insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Raw packet filter." !insertmacro MUI_DESCRIPTION_TEXT ${SecRandpkt} "Random packet generator." !insertmacro MUI_DESCRIPTION_TEXT ${SecMMDBResolve} "MaxMind Database resolution tool" diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 8516e65209..5b924d4d48 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -389,6 +389,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi index 35aefc60de..536fbfde6f 100644 --- a/packaging/wix/Features.wxi +++ b/packaging/wix/Features.wxi @@ -76,6 +76,9 @@ + + +