diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-17 20:22:13 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-18 03:22:46 +0000 |
| commit | 8241b8760ce12a7b827530a609506abcca33cec7 (patch) | |
| tree | be71ba488d7d8253a8cd2286ff1f11676cd8a969 /packaging/macosx | |
| parent | a61ebef1a5d84e95aa642f18146cb299494a44b9 (diff) | |
Get rid of the Python stuff, as we've gotten rid of Python plugin support.
Also, update a comment to more accurately describe what a loop is doing,
and get rid of an unused variable.
Change-Id: I948fc4ad758152b483450bf74f653087c892ad3a
Reviewed-on: https://code.wireshark.org/review/2360
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging/macosx')
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 556e712c0a..684456c234 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -6,7 +6,6 @@ # This script attempts to build an Wireshark.app bundle for OS X, resolving # dynamic libraries, etc. # It strips the executable and libraries if '-s' is given. -# It adds python modules if the '-py option' is given # The Info.plist file can be found in the base wireshark directory once # configure has been run. # @@ -207,9 +206,7 @@ pkgexec="$bundle/Contents/MacOS" pkgres="$bundle/Contents/Resources" pkgbin="$pkgexec" pkglib="$bundle/Contents/Frameworks" -pkgqtplugin="$bundle/Contents/PlugIns" pkgplugin="$bundle/Contents/PlugIns/wireshark" -pkgpython="$pkglib/wireshark/python" # # For Qt, the Wireshark binary is the main binary of the app bundle. @@ -223,9 +220,7 @@ fi mkdir -p "$pkgexec" mkdir -p "$pkgbin" -mkdir -p "$pkgqtplugin" mkdir -p "$pkgplugin" -mkdir -p "$pkgpython" if [ "$ui_toolkit" = "qt" ] ; then cp "$binary_path/$wireshark_bin_name" "$pkgexec/Wireshark" @@ -277,14 +272,11 @@ rsync -av \ rsync -av $binary_path/../lib/*.dylib "$pkglib/" -# Remove the version number from the plugin path +# 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 \ -exec cp -fv "{}" "$pkgplugin/" \; -# Remove the version number from the python path -find "$binary_path/../lib/wireshark/python" -type f \ - -exec cp -fv "{}" "$pkgpython/" \; - cp "$plist" "$bundle/Contents/Info.plist" # Icons and the rest of the script framework |