path: root/packaging
diff options
authorGerald Combs <gerald@wireshark.org>2014-10-30 13:42:31 -0700
committerGerald Combs <gerald@wireshark.org>2014-10-30 20:54:40 +0000
commit7665ac5fab80d1cbd2297b4fe6fd9b411559a7ce (patch)
treeabf68dc88141b2249790c17da2ccecf189f18ec1 /packaging
parentf5ed47dbbcfe27ace417f5c76d165ddb09cb86ca (diff)
OS X: Don't add libtool control files to the app bundle.
According to https://developer.apple.com/library/mac/technotes/tn2206 the Contents/PlugIns directory should *only* contain executable files. Only copy .so (and in case we need them) .dylib files. Change-Id: I01f077735018733926db92e7576f6f4fecb68862 Reviewed-on: https://code.wireshark.org/review/5008 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 8c4bd79612..8cd6db6fcc 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -295,7 +295,9 @@ create_bundle() {
# Copy the plugins from the "make install" location for them
# to the plugin directory, removing the version number
- find "$binary_path/../lib/wireshark/plugins" -type f \
+ find "$binary_path/../lib/wireshark/plugins"
+ -type f \
+ \( -name "*.so" -o -name "*.dylib" \) \
-exec cp -fv "{}" "$pkgplugin/" \;
cp "$plist" "$bundle/Contents/Info.plist"