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

Include the reordercap and dftest documentation in Windows packages. 

We package the documentation for other programs we supply, so we should
package the documentation for them as well.

Change-Id: I37854631bad4aa799fb6ebb009bea3f4692fe530
Reviewed-on: https://code.wireshark.org/review/31492
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2019-01-11 12:06:38 -08:00
parent aff37930c5
commit 265518a434
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/nsis/wireshark.nsi
View File

@ -1082,12 +1082,14 @@ Section "Reordercap" SecReordercap
;------------------------------------------- ;-------------------------------------------
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "${STAGING_DIR}\reordercap.exe" File "${STAGING_DIR}\reordercap.exe"
File "${STAGING_DIR}\reordercap.html"
SectionEnd SectionEnd
Section "DFTest" SecDFTest Section "DFTest" SecDFTest
;------------------------------------------- ;-------------------------------------------
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "${STAGING_DIR}\dftest.exe" File "${STAGING_DIR}\dftest.exe"
File "${STAGING_DIR}\dftest.html"
SectionEnd SectionEnd
Section "Capinfos" SecCapinfos Section "Capinfos" SecCapinfos

8
packaging/wix/ComponentGroups.wxi
View File

@ -365,11 +365,15 @@
<Component Id="cmpReordercap_exe" Guid="*"> <Component Id="cmpReordercap_exe" Guid="*">
<File Id="filReordercap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\reordercap.exe" /> <File Id="filReordercap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\reordercap.exe" />
</Component> </Component>
<Component Id="cmpReordercap_html" Guid="*">
<File Id="filReordercap_html" KeyPath="yes" Source="$(var.Staging.Dir)\reordercap.html" />
</Component>
</DirectoryRef> </DirectoryRef>
</Fragment> </Fragment>
<Fragment> <Fragment>
<ComponentGroup Id="CG.Tools.Reordercap"> <ComponentGroup Id="CG.Tools.Reordercap">
<ComponentRef Id="cmpReordercap_exe" /> <ComponentRef Id="cmpReordercap_exe" />
<ComponentRef Id="cmpReordercap_html" />
</ComponentGroup> </ComponentGroup>
</Fragment> </Fragment>
@ -379,11 +383,15 @@
<Component Id="cmpDFTest_exe" Guid="*"> <Component Id="cmpDFTest_exe" Guid="*">
<File Id="filDFTest_exe" KeyPath="yes" Source="$(var.Staging.Dir)\dftest.exe" /> <File Id="filDFTest_exe" KeyPath="yes" Source="$(var.Staging.Dir)\dftest.exe" />
</Component> </Component>
<Component Id="cmpDFTest_html" Guid="*">
<File Id="filDFTest_html" KeyPath="yes" Source="$(var.Staging.Dir)\dftest.html" />
</Component>
</DirectoryRef> </DirectoryRef>
</Fragment> </Fragment>
<Fragment> <Fragment>
<ComponentGroup Id="CG.Tools.DFTest"> <ComponentGroup Id="CG.Tools.DFTest">
<ComponentRef Id="cmpDFTest_exe" /> <ComponentRef Id="cmpDFTest_exe" />
<ComponentRef Id="cmpDFTest_html" />
</ComponentGroup> </ComponentGroup>
</Fragment> </Fragment>