diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-07-20 02:32:40 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-07-23 17:14:19 +0000 |
commit | 14d94e174a230e66d7d75c774435d77f3d8aa22e (patch) | |
tree | 68087af26e19e7ab649185406893482e4627b970 /packaging | |
parent | 88fbc26175d8f32b01fac69828b7549a5ec53166 (diff) |
Put the well-known addresses into a separate file from OUIs
Having two distinct logical concepts (OUI and Well Known Address)
concatenated to a single "manuf" file is needlessly obfuscating
the WKA feature.
Have a distinct "wka" file instead and just skip the cat.
Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8
Reviewed-on: https://code.wireshark.org/review/22742
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/nsis/uninstall.nsi | 1 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 1 | ||||
-rw-r--r-- | packaging/wix/ComponentGroups.wxi | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 1d80a167c3..1a8565c846 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -222,6 +222,7 @@ Delete "$INSTDIR\AUTHORS-SHORT-FORMAT" Delete "$INSTDIR\README*" Delete "$INSTDIR\NEWS.txt" Delete "$INSTDIR\manuf" +Delete "$INSTDIR\wka" Delete "$INSTDIR\services" Delete "$INSTDIR\pdml2html.xsl" Delete "$INSTDIR\pcrepattern.3.txt" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index c7e19f049a..fa7379fe57 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -431,6 +431,7 @@ File "${STAGING_DIR}\README.txt" File "${STAGING_DIR}\README.windows.txt" File "${STAGING_DIR}\AUTHORS-SHORT" File "${STAGING_DIR}\manuf" +File "${STAGING_DIR}\wka" File "${STAGING_DIR}\services" File "${STAGING_DIR}\pdml2html.xsl" File "${STAGING_DIR}\ws.css" diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 127efdfd7d..3220eb3fee 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -50,6 +50,9 @@ <Component Id="cmpManuf" Guid="*"> <File Id="filManuf" KeyPath="yes" Source="$(var.Staging.Dir)\manuf" /> </Component> + <Component Id="cmpWka" Guid="*"> + <File Id="filWka" KeyPath="yes" Source="$(var.Staging.Dir)\wka" /> + </Component> <Component Id="cmpServices" Guid="*"> <File Id="filServices" KeyPath="yes" Source="$(var.Staging.Dir)\services" /> </Component> @@ -93,6 +96,7 @@ <ComponentRef Id="cmpREADME_windows_txt" /> <ComponentRef Id="cmpAUTHORS_SHORT" /> <ComponentRef Id="cmpManuf" /> + <ComponentRef Id="cmpWka" /> <ComponentRef Id="cmpServices" /> <ComponentRef Id="cmpPdml2html_xsl" /> <ComponentRef Id="cmpWs_css" /> |