osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Windows: package codec plugins 

Change-Id: Id0e43d0272cb62e171e74b5cf957fadfe0bd7a24
Reviewed-on: https://code.wireshark.org/review/33562
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-06-11 23:48:12 +02:00
parent 53014b9a63
commit 8a1a63d7c9
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packaging/nsis/wireshark.nsi
View File

@ -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

30
packaging/wix/Plugins.wxi
View File

@ -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>