osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

NSIS+WiX: Install sharkd 

Install sharkd. As noted in #19562, we don't yet have a man page.

Fixes #19556
This commit is contained in:
Gerald Combs 2024-01-02 15:31:21 -08:00 committed by AndersBroman
parent 69c9e06dae
commit bcb0d02568
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/nsis/wireshark.nsi
View File

@ -1134,6 +1134,9 @@ File "${STAGING_DIR}\rawshark.html"
File "${STAGING_DIR}\reordercap.exe"
File "${STAGING_DIR}\reordercap.html"
File "${STAGING_DIR}\sharkd.exe"
;File "${STAGING_DIR}\sharkd.html"
File "${STAGING_DIR}\text2pcap.exe"
File "${STAGING_DIR}\text2pcap.html"
@ -1296,6 +1299,7 @@ Push "mergecap"
Push "randpkt"
Push "rawshark"
Push "reordercap"
Push "sharkd"
Push "text2pcap"
Push "tshark"

22
packaging/wix/ComponentGroups.wxi
View File

@ -413,6 +413,28 @@
</ComponentGroup>
</Fragment>
<!-- Sharkd -->
<Fragment>
<DirectoryRef Id="INSTALLFOLDER">
<Component Id="cmpSharkd_exe" Guid="*">
<File Id="filSharkd_exe" KeyPath="yes" Source="$(var.Staging.Dir)\sharkd.exe" />
</Component>
<!--
<Component Id="cmpSharkd_html" Guid="*">
<File Id="filSharkd_html" KeyPath="yes" Source="$(var.Staging.Dir)\sharkd.html" />
</Component>
-->
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="CG.Tools.Sharkd">
<ComponentRef Id="cmpSharkd_exe" />
<!--
<ComponentRef Id="cmpSharkd_html" />
-->
</ComponentGroup>
</Fragment>
<!-- MMDBResolve -->
<?ifdef MMDBRESOLVE_EXE?>
<Fragment>

3
packaging/wix/Features.wxi
View File

@ -79,6 +79,9 @@
<Feature Id="Fe.Tools.Rawshark" Title="Rawshark" Level="1" AllowAdvertise="yes" Display="expand" Description="Raw packet filter.">
<ComponentGroupRef Id="CG.Tools.Rawshark" />
</Feature>
<Feature Id="Fe.Tools.Sharkd" Title="Sharkd" Level="1" AllowAdvertise="yes" Display="expand" Description="Packet dissection daemon.">
<ComponentGroupRef Id="CG.Tools.Sharkd" />
</Feature>
<?ifdef MMDBRESOLVE_EXE?>
<Feature Id="Fe.Tools.MMDBResolve" Title="MMDBResolve" Level="1" AllowAdvertise="yes" Display="expand" Description="IP geolocation database resolution.">
<ComponentGroupRef Id="CG.Tools.MMDBResolve" />