diff options
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/nsis/uninstall.nsi | 1 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 7 | ||||
-rw-r--r-- | packaging/wix/ComponentGroups.wxi | 16 | ||||
-rw-r--r-- | packaging/wix/Features.wxi | 3 |
4 files changed, 26 insertions, 1 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index b0df3b8eef..9b932817ea 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -140,6 +140,7 @@ Push "randpktdump" Push "reordercap" Push "capinfos" Push "rawshark" +Push "dftest" Pop $EXECUTABLE ${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER} diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 4d9c4eab80..9e54415e60 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1092,6 +1092,12 @@ SetOutPath $INSTDIR File "${STAGING_DIR}\reordercap.exe" SectionEnd +Section "DFTest" SecDFTest +;------------------------------------------- +SetOutPath $INSTDIR +File "${STAGING_DIR}\dftest.exe" +SectionEnd + Section "Capinfos" SecCapinfos ;------------------------------------------- SetOutPath $INSTDIR @@ -1194,6 +1200,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Read an ASCII hex dump and write the data into a libpcap-style capture file." !insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Combine multiple saved capture files into a single output file" !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} "Pring information about capture files." !insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Raw packet filter." diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index ce690e9e40..4cb167bef3 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -379,7 +379,21 @@ </Fragment> <Fragment> <ComponentGroup Id="CG.Tools.Reordercap"> - <ComponentRef Id="cmpMergecap_exe" /> + <ComponentRef Id="cmpReordercap_exe" /> + </ComponentGroup> + </Fragment> + + <!-- DFTest --> + <Fragment> + <DirectoryRef Id="INSTALLFOLDER"> + <Component Id="cmpDFTest_exe" Guid="*"> + <File Id="filDFTest_exe" KeyPath="yes" Source="$(var.Staging.Dir)\dftest.exe" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Tools.DFTest"> + <ComponentRef Id="cmpDFTest_exe" /> </ComponentGroup> </Fragment> diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi index 606f5eefee..891d689b5e 100644 --- a/packaging/wix/Features.wxi +++ b/packaging/wix/Features.wxi @@ -72,6 +72,9 @@ <Feature Id="Fe.Tools.Reordercap" Title="Reordercap" Level="1" AllowAdvertise="yes" Display="expand" Description="Copy packets to a new file, sorted by time."> <ComponentGroupRef Id="CG.Tools.Reordercap" /> </Feature> + <Feature Id="Fe.Tools.DFTest" Title="DFTest" Level="1" AllowAdvertise="yes" Display="expand" Description="Shows display filter byte-code, for debugging dfilter routines."> + <ComponentGroupRef Id="CG.Tools.DFTest" /> + </Feature> <Feature Id="Fe.Tools.Capinfos" Title="Capinfos" Level="1" AllowAdvertise="yes" Display="expand" Description="Print information about capture files."> <ComponentGroupRef Id="CG.Tools.Capinfos" /> </Feature> |