diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-01-11 12:06:38 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-01-11 20:34:50 +0000 |
| commit | 265518a4348b898ea62266c63c78ae8970213be4 (patch) | |
| tree | 8002e950baff29d225032953f5c8401e80390b95 | |
| parent | aff37930c59e295fdbae2ac17b6c230f9f661766 (diff) | |
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>
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index f1720ba99d..d52d1aa564 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1082,12 +1082,14 @@ Section "Reordercap" SecReordercap ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\reordercap.exe" +File "${STAGING_DIR}\reordercap.html" SectionEnd Section "DFTest" SecDFTest ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\dftest.exe" +File "${STAGING_DIR}\dftest.html" SectionEnd Section "Capinfos" SecCapinfos diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 9ccf058b8a..bc9b258bdc 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -365,11 +365,15 @@ <Component Id="cmpReordercap_exe" Guid="*"> <File Id="filReordercap_exe" KeyPath="yes" Source="$(var.Staging.Dir)\reordercap.exe" /> </Component> + <Component Id="cmpReordercap_html" Guid="*"> + <File Id="filReordercap_html" KeyPath="yes" Source="$(var.Staging.Dir)\reordercap.html" /> + </Component> </DirectoryRef> </Fragment> <Fragment> <ComponentGroup Id="CG.Tools.Reordercap"> <ComponentRef Id="cmpReordercap_exe" /> + <ComponentRef Id="cmpReordercap_html" /> </ComponentGroup> </Fragment> @@ -379,11 +383,15 @@ <Component Id="cmpDFTest_exe" Guid="*"> <File Id="filDFTest_exe" KeyPath="yes" Source="$(var.Staging.Dir)\dftest.exe" /> </Component> + <Component Id="cmpDFTest_html" Guid="*"> + <File Id="filDFTest_html" KeyPath="yes" Source="$(var.Staging.Dir)\dftest.html" /> + </Component> </DirectoryRef> </Fragment> <Fragment> <ComponentGroup Id="CG.Tools.DFTest"> <ComponentRef Id="cmpDFTest_exe" /> + <ComponentRef Id="cmpDFTest_html" /> </ComponentGroup> </Fragment> |