aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-07-13 13:03:13 -0700
committerAnders Broman <a.broman58@gmail.com>2017-07-15 06:20:34 +0000
commit76efb096d492d999db10fa4a498d474c1e717ed5 (patch)
tree175f17b5a6537c64b71e4ffd89d6aa89f0d2811a /packaging
parentb992e69c19a4fac968ef7a95d0c439638687a72d (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')
-rwxr-xr-xpackaging/nsis/uninstall.nsi1
-rw-r--r--packaging/nsis/wireshark.nsi3
-rw-r--r--packaging/wix/ComponentGroups.wxi4
3 files changed, 8 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index 9b93281..1d80a16 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 9e54415..c7e19f0 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:
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 4cb167b..127efdf 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -117,6 +117,9 @@
<Component Id="cmpDfilters" Guid="*">
<File Id="filDfilters" KeyPath="yes" Source="$(var.Staging.Dir)\dfilters" />
</Component>
+ <Component Id="cmpEnterprisesTsv" Guid="*">
+ <File Id="filEnterprisesTsv" KeyPath="yes" Source="$(var.Staging.Dir)\enterprises.tsv" />
+ </Component>
<Component Id="cmpSmi_modules" Guid="*">
<File Id="filSmi_modules" KeyPath="yes" Source="$(var.Staging.Dir)\smi_modules" />
</Component>
@@ -127,6 +130,7 @@
<ComponentRef Id="cmpCfilters" />
<ComponentRef Id="cmpColorfilters" />
<ComponentRef Id="cmpDfilters" />
+ <ComponentRef Id="cmpEnterprisesTsv" />
<ComponentRef Id="cmpSmi_modules" />
</ComponentGroup>
</Fragment>