Add dftest to Windows installer.
Bug: 13825 Change-Id: Ibda27599739a26a388e1c66ae813ff5c2c8339be Reviewed-on: https://code.wireshark.org/review/22367 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
7d1049d326
commit
635b3720b5
|
@ -140,6 +140,7 @@ Push "randpktdump"
|
||||||
Push "reordercap"
|
Push "reordercap"
|
||||||
Push "capinfos"
|
Push "capinfos"
|
||||||
Push "rawshark"
|
Push "rawshark"
|
||||||
|
Push "dftest"
|
||||||
|
|
||||||
Pop $EXECUTABLE
|
Pop $EXECUTABLE
|
||||||
${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER}
|
${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER}
|
||||||
|
|
|
@ -1092,6 +1092,12 @@ SetOutPath $INSTDIR
|
||||||
File "${STAGING_DIR}\reordercap.exe"
|
File "${STAGING_DIR}\reordercap.exe"
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
Section "DFTest" SecDFTest
|
||||||
|
;-------------------------------------------
|
||||||
|
SetOutPath $INSTDIR
|
||||||
|
File "${STAGING_DIR}\dftest.exe"
|
||||||
|
SectionEnd
|
||||||
|
|
||||||
Section "Capinfos" SecCapinfos
|
Section "Capinfos" SecCapinfos
|
||||||
;-------------------------------------------
|
;-------------------------------------------
|
||||||
SetOutPath $INSTDIR
|
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 ${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 ${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 ${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 ${SecCapinfos} "Pring information about capture files."
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Raw packet filter."
|
!insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Raw packet filter."
|
||||||
|
|
||||||
|
|
|
@ -379,7 +379,21 @@
|
||||||
</Fragment>
|
</Fragment>
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<ComponentGroup Id="CG.Tools.Reordercap">
|
<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>
|
</ComponentGroup>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
|
|
||||||
|
|
|
@ -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.">
|
<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" />
|
<ComponentGroupRef Id="CG.Tools.Reordercap" />
|
||||||
</Feature>
|
</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.">
|
<Feature Id="Fe.Tools.Capinfos" Title="Capinfos" Level="1" AllowAdvertise="yes" Display="expand" Description="Print information about capture files.">
|
||||||
<ComponentGroupRef Id="CG.Tools.Capinfos" />
|
<ComponentGroupRef Id="CG.Tools.Capinfos" />
|
||||||
</Feature>
|
</Feature>
|
||||||
|
|
Loading…
Reference in New Issue