diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-16 20:59:06 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-17 11:48:42 +0000 |
| commit | 2832f4e97d77324b4e46aac40dae0ce898ae559d (patch) | |
| tree | bcb85efafd4dce54ebc2977f734e76b844cd9994 /packaging | |
| parent | 2c33f74bc68c0356eb44a11918d690ac8f26ab63 (diff) | |
| download | wireshark-2832f4e97d77324b4e46aac40dae0ce898ae559d.tar.gz | |
NSIS: add UDPdump to installer
Change-Id: Ic340d7de5de2573bf1e4ee97c8f7ef9af822d225
Reviewed-on: https://code.wireshark.org/review/17746
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 0d87165130..b0df3b8eef 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -128,6 +128,7 @@ Push "${EXECUTABLE_MARKER}" Push "androiddump" Push "ciscodump" Push "sshdump" +Push "udpdump" Push "dumpcap" Push "${PROGRAM_NAME}" Push "tshark" @@ -183,6 +184,7 @@ Delete "$INSTDIR\extcap\androiddump.*" Delete "$INSTDIR\extcap\randpktdump.*" Delete "$INSTDIR\extcap\sshdump.*" Delete "$INSTDIR\extcap\ciscodump.*" +Delete "$INSTDIR\extcap\udpdump.*" Delete "$INSTDIR\help\*.*" Delete "$INSTDIR\iconengines\*.*" Delete "$INSTDIR\imageformats\*.*" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 4b75246f1e..cf216bfc17 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1111,6 +1111,14 @@ File "${STAGING_DIR}\extcap\sshdump.exe" File "${STAGING_DIR}\extcap\ciscodump.exe" SectionEnd +Section /o "UDPdump" SecUDPdumpinfos +;------------------------------------------- +SetOutPath $INSTDIR +File "${STAGING_DIR}\udpdump.html" +SetOutPath $INSTDIR\extcap +File "${STAGING_DIR}\extcap\udpdump.exe" +SectionEnd + Section /o "Randpktdump" SecRandpktdumpinfos ;------------------------------------------- SetOutPath $INSTDIR @@ -1166,6 +1174,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecToolsGroup} "Additional command line based tools." !insertmacro MUI_DESCRIPTION_TEXT ${SecAndroiddumpinfos} "Provide capture interfaces from Android devices" !insertmacro MUI_DESCRIPTION_TEXT ${SecSSHdumpinfos} "Provide remote capture through SSH" + !insertmacro MUI_DESCRIPTION_TEXT ${SecUDPdumpinfos} "Provide capture interface that gets UDP packets from network devices" !insertmacro MUI_DESCRIPTION_TEXT ${SecRandpktdumpinfos} "Provide random packet generator" !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Copy packets to a new file, optionally trimmming packets, omitting them, or saving to a different format." !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Read an ASCII hex dump and write the data into a libpcap-style capture file." |