diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-07-13 13:03:13 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-07-15 06:20:34 +0000 |
| commit | 76efb096d492d999db10fa4a498d474c1e717ed5 (patch) | |
| tree | 175f17b5a6537c64b71e4ffd89d6aa89f0d2811a /packaging/nsis | |
| parent | b992e69c19a4fac968ef7a95d0c439638687a72d (diff) | |
Rename enterprises to enterprises.tsv and ship it.
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more
obvious and so that double-clicking the file might do something useful.
Add it to the Windows packages.
Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463
Reviewed-on: https://code.wireshark.org/review/22616
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/nsis')
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 9b932817ea..1d80a167c3 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -318,6 +318,7 @@ SectionIn 1 2 Delete "$INSTDIR\cfilters" Delete "$INSTDIR\colorfilters" Delete "$INSTDIR\dfilters" +Delete "$INSTDIR\enterprises.tsv" Delete "$INSTDIR\init.lua" Delete "$INSTDIR\console.lua" Delete "$INSTDIR\dtd_gen.lua" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 9e54415e60..c7e19f049a 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -487,6 +487,9 @@ File "${STAGING_DIR}\colorfilters" ;IfFileExists dfilters dont_overwrite_dfilters File "${STAGING_DIR}\dfilters" ;dont_overwrite_dfilters: +;IfFileExists enterprises.tsv dont_overwrite_enterprises_tsv +File "${STAGING_DIR}\enterprises.tsv" +;dont_overwrite_dfilters: ;IfFileExists smi_modules dont_overwrite_smi_modules File "${STAGING_DIR}\smi_modules" ;dont_overwrite_smi_modules: |