diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/uninstall.nsi | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 1 | ||||
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index b0dd5d7643..3ce5173587 100644 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -233,6 +233,7 @@ Delete "$INSTDIR\pdml2html.xsl" Delete "$INSTDIR\pcrepattern.3.txt" Delete "$INSTDIR\user-guide.chm" Delete "$INSTDIR\example_snmp_users_file" +Delete "$INSTDIR\ipmap.html" Delete "$INSTDIR\radius\*.*" Delete "$INSTDIR\dtds\*.*" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 88182cfc7e..754e2bccc6 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -503,6 +503,7 @@ File "${STAGING_DIR}\wireshark-filter.html" File "${STAGING_DIR}\dumpcap.exe" File "${STAGING_DIR}\dumpcap.html" File "${STAGING_DIR}\extcap.html" +File "${STAGING_DIR}\ipmap.html" ; C-runtime redistributable ; vcredist_x64.exe or vc_redist_x86.exe - copy and execute the redistributable installer diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 03f4caf851..0532306c01 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -75,6 +75,9 @@ <Component Id="cmpExtcap_html" Guid="*"> <File Id="filExtcap_html" KeyPath="yes" Source="$(var.Staging.Dir)\extcap.html" /> </Component> + <Component Id="cmpIpmap_html" Guid="*"> + <File Id="filIpmap_html" KeyPath="yes" Source="$(var.Staging.Dir)\ipmap.html" /> + </Component> </DirectoryRef> </Fragment> <Fragment> |