diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-02-13 11:47:23 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-02-13 20:15:19 +0000 |
commit | feb8f6b14d7e342db369656ab44c38546b0140bb (patch) | |
tree | be9e003bb3c220f47cbfa8968c61562823ed44a5 /packaging | |
parent | 048c4373e15a401a8700bc57b403282c7830d27e (diff) |
Make the DOCSIS dissector a built-in dissector.
Stuff that calls it is built in, and stuff it calls is built in, so
there's not much point in having it be a plugin; we already have
examples of plugin dissectors.
Change-Id: I512e0fda62faedb5f03f476fbece2e267e1d644f
Reviewed-on: https://code.wireshark.org/review/25775
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/nsis/wireshark.nsi | 1 | ||||
-rw-r--r-- | packaging/wix/Plugins.wxi | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index c1977f10c8..d928107879 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1014,7 +1014,6 @@ SectionGroup "Plugins & Extensions" SecPluginsGroup Section "Dissector Plugins" SecPlugins ;------------------------------------------- SetOutPath '$INSTDIR\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\epan' -File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\epan\docsis.dll" File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\epan\ethercat.dll" File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\epan\gryphon.dll" File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\epan\irda.dll" diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi index fc9f684ad2..0c59565055 100644 --- a/packaging/wix/Plugins.wxi +++ b/packaging/wix/Plugins.wxi @@ -4,9 +4,6 @@ <!-- Plugins --> <Fragment> <DirectoryRef Id="dirPluginsVersionEpan"> - <Component Id="cmpDocsis_dll" Guid="*"> - <File Id="filDocsis_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\epan\docsis.dll" /> - </Component> <Component Id="cmpEthercat_dll" Guid="*"> <File Id="filEthercat_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\epan\ethercat.dll" /> </Component> @@ -39,7 +36,6 @@ </Fragment> <Fragment> <ComponentGroup Id="CG.Plugins.Dissector"> - <ComponentRef Id="cmpDocsis_dll" /> <ComponentRef Id="cmpEthercat_dll" /> <ComponentRef Id="cmpGryphon_dll" /> <ComponentRef Id="cmpIrda_dll" /> |