diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2019-06-11 23:48:12 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2019-06-11 22:06:19 +0000 |
| commit | 8a1a63d7c9d7c9661e1bc83973a698c39fd8d926 (patch) | |
| tree | 529b190ae732e51fad03358320c4f60e1fdaebff /packaging | |
| parent | 53014b9a63a872888d8005ef1dc5e22a55bc34ba (diff) | |
Windows: package codec plugins
Change-Id: Id0e43d0272cb62e171e74b5cf957fadfe0bd7a24
Reviewed-on: https://code.wireshark.org/review/33562
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 5 | ||||
| -rw-r--r-- | packaging/wix/Plugins.wxi | 30 |
2 files changed, 35 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 1b846cf16e..8280483afe 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1020,7 +1020,12 @@ SectionEnd Section "Codec plugins" SecCodec ;------------------------------------------- SetOutPath '$INSTDIR\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs' +File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\g711.dll" +File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\g722.dll" +File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\g726.dll" +File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\g729.dll" File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\l16mono.dll" +File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\sbc.dll" SectionEnd Section "Configuration Profiles" SecProfiles diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi index 7ef294f653..5de46486d2 100644 --- a/packaging/wix/Plugins.wxi +++ b/packaging/wix/Plugins.wxi @@ -108,15 +108,45 @@ <!-- codecs --> <Fragment> <DirectoryRef Id="dirPluginsVersionCodecs"> + <Component Id="cmpG711_dll" Guid="*"> + <File Id="filG711_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\g711.dll" /> + </Component> + <Component Id="cmpG722_dll" Guid="*"> + <File Id="filG722_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\g722.dll" /> + </Component> + <Component Id="cmpG726_dll" Guid="*"> + <File Id="filG726_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\g726.dll" /> + </Component> + <Component Id="cmpG729_dll" Guid="*"> + <File Id="filG729_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\g729.dll" /> + </Component> <Component Id="cmpL16mono_dll" Guid="*"> <File Id="filL16mono_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\l16mono.dll" /> </Component> + <Component Id="cmpSBC_dll" Guid="*"> + <File Id="filSBC_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\sbc.dll" /> + </Component> </DirectoryRef> </Fragment> <Fragment> + <ComponentGroup Id="CG.Plugins.G711"> + <ComponentRef Id="cmpG711_dll" /> + </ComponentGroup> + <ComponentGroup Id="CG.Plugins.G722"> + <ComponentRef Id="cmpG722_dll" /> + </ComponentGroup> + <ComponentGroup Id="CG.Plugins.G726"> + <ComponentRef Id="cmpG726_dll" /> + </ComponentGroup> + <ComponentGroup Id="CG.Plugins.G729"> + <ComponentRef Id="cmpG729_dll" /> + </ComponentGroup> <ComponentGroup Id="CG.Plugins.L16mono"> <ComponentRef Id="cmpL16mono_dll" /> </ComponentGroup> + <ComponentGroup Id="CG.Plugins.SBC"> + <ComponentRef Id="cmpSBC_dll" /> + </ComponentGroup> </Fragment> </Include> |