diff options
| -rw-r--r-- | packaging/wix/DirectoryStructure.wxi | 4 | ||||
| -rw-r--r-- | packaging/wix/Plugins.wxi | 28 |
2 files changed, 31 insertions, 1 deletions
diff --git a/packaging/wix/DirectoryStructure.wxi b/packaging/wix/DirectoryStructure.wxi index 2e17841ec8..34dcaf8403 100644 --- a/packaging/wix/DirectoryStructure.wxi +++ b/packaging/wix/DirectoryStructure.wxi @@ -30,6 +30,8 @@ <Directory Id="dirPlugins" Name="plugins"> <Directory Id="dirPluginsVersion" Name="$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)"> <Directory Id="dirPluginsVersionEpan" Name="epan"/> + <Directory Id="dirPluginsVersionWtap" Name="wiretap"/> + <Directory Id="dirPluginsVersionCodecs" Name="codecs"/> </Directory> </Directory> <Directory Id="dirProfiles" Name="profiles"/> @@ -57,4 +59,4 @@ </Directory> </Fragment> -</Include>
\ No newline at end of file +</Include> diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi index 0c59565055..7ef294f653 100644 --- a/packaging/wix/Plugins.wxi +++ b/packaging/wix/Plugins.wxi @@ -91,4 +91,32 @@ </ComponentGroup> </Fragment> + <!-- wiretap --> + <Fragment> + <DirectoryRef Id="dirPluginsVersionWtap"> + <Component Id="cmpUsbdump_dll" Guid="*"> + <File Id="filUsbdump_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\wiretap\usbdump.dll" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Plugins.Usbdump"> + <ComponentRef Id="cmpUsbdump_dll" /> + </ComponentGroup> + </Fragment> + + <!-- codecs --> + <Fragment> + <DirectoryRef Id="dirPluginsVersionCodecs"> + <Component Id="cmpL16mono_dll" Guid="*"> + <File Id="filL16mono_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\l16mono.dll" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Plugins.L16mono"> + <ComponentRef Id="cmpL16mono_dll" /> + </ComponentGroup> + </Fragment> + </Include> |