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

Handle separate directories for libwireshark and libwiretap plugins. 

We now have "epan" and "wiretap" subdirectories of the plugin directory,
with the first containing libwireshark plugins and the second containing
libwiretap plugins.  Look for plugins in those directories, rather than
in the top-level plugin directory.

Bug: 14389
Change-Id: Ia3bd4d27e82215207e7a7dcfc8f91042bbc61737
Reviewed-on: https://code.wireshark.org/review/25577
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-02-03 10:38:58 -08:00
parent 2fecc96868
commit d8551c4247
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packaging/macosx/osx-app.sh.in
View File

@ -232,7 +232,7 @@ pkgexec="$bundle/Contents/MacOS"
pkgres="$bundle/Contents/Resources"
pkgbin="$pkgres/bin"
pkglib="$bundle/Contents/Frameworks"
pkgplugin="$bundle/Contents/PlugIns/wireshark/@VERSION_MAJOR@.@VERSION_MINOR@/epan"
pkgplugin="$bundle/Contents/PlugIns/wireshark/@VERSION_MAJOR@.@VERSION_MINOR@"
# Set the 'macosx' directory, usually the current directory.
resdir=`pwd`
@ -468,7 +468,8 @@ rpathify_files () {
#
rpathify_dir "$pkglib" "*.dylib"
rpathify_dir "$pkgexec" "*"
rpathify_dir "$pkgplugin" "*"
rpathify_dir "$pkgplugin/epan" "*"
rpathify_dir "$pkgplugin/wiretap" "*"
rpathify_dir "$pkgexec/extcap" "*"
}
@ -521,7 +522,7 @@ if [ -n "$CODE_SIGN_IDENTITY" ] ; then
done
echo "Signing plugins"
for plugin in $pkgplugin/*.so ; do
for plugin in $pkgplugin/epan/*.so $pkgplugin/wiretap/*.so ; do
codesign_file "$plugin"
done