diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-01-11 13:13:48 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-01-11 21:55:12 +0000 |
| commit | 7cbe9636ebe4678b12286c98fa0908b596cbcbd7 (patch) | |
| tree | 97d529a259e082913af3217304385c2236f7e361 | |
| parent | 265518a4348b898ea62266c63c78ae8970213be4 (diff) | |
Add randpkt to the Windows installers.
Bug: 15395
Change-Id: Ic0c28b42a5e70edc5eb6441f71b6b614deae9d9f
Reviewed-on: https://code.wireshark.org/review/31497
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | packaging/nsis/uninstall.nsi | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 | ||||
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 18 |
3 files changed, 27 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index b33f082865..b0dd5d7643 100644 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -133,6 +133,7 @@ Push "dftest" Push "dumpcap" Push "editcap" Push "mergecap" +Push "randpkt" Push "randpktdump" Push "rawshark" Push "reordercap" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index d52d1aa564..bd667c8ed4 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1106,6 +1106,13 @@ File "${STAGING_DIR}\rawshark.exe" File "${STAGING_DIR}\rawshark.html" SectionEnd +Section /o "Randpkt" SecRandpkt +;------------------------------------------- +SetOutPath $INSTDIR +File "${STAGING_DIR}\randpktdump.exe" +File "${STAGING_DIR}\randpktdump.html" +SectionEnd + !ifdef MMDBRESOLVE_EXE Section "MMDBResolve" SecMMDBResolve ;------------------------------------------- @@ -1205,6 +1212,7 @@ SectionEnd !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 ${SecRawshark} "Raw packet filter." + !insertmacro MUI_DESCRIPTION_TEXT ${SecRandpkt} "Random packet generator." !insertmacro MUI_DESCRIPTION_TEXT ${SecMMDBResolve} "MaxMind Database resolution tool" !ifdef USER_GUIDE_DIR diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index bc9b258bdc..ba4709fc59 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -431,6 +431,24 @@ </ComponentGroup> </Fragment> + <!-- Randpkt --> + <Fragment> + <DirectoryRef Id="INSTALLFOLDER"> + <Component Id="cmpRandpkt_exe" Guid="*"> + <File Id="filRandpkt_exe" KeyPath="yes" Source="$(var.Staging.Dir)\randpkt.exe" /> + </Component> + <Component Id="cmpRandpkt_html" Guid="*"> + <File Id="filRandpkt_html" KeyPath="yes" Source="$(var.Staging.Dir)\randpkt.html" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Tools.Randpkt"> + <ComponentRef Id="cmpRandpkt_exe" /> + <ComponentRef Id="cmpRandpkt_html" /> + </ComponentGroup> + </Fragment> + <!-- MMDBResolve --> <?ifdef MMDBRESOLVE_EXE?> <Fragment> |