osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Try to fix building the GTK flavor OS X app. 

svn path=/trunk/; revision=52442
This commit is contained in:
Gerald Combs 2013-10-07 19:37:22 +00:00
parent df1b8d3d96
commit 9f45bac313
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packaging/macosx/osx-app.sh
View File

@ -208,6 +208,9 @@ resdir=`pwd`
pkgexec="$package/Contents/MacOS"
pkgres="$package/Contents/Resources"
pkgbin="$pkgexec"
if [ "$ui_toolkit" = "gtk" ] ; then
pkgbin="$pkgres/bin"
fi
# Should pkglib be Contents/Frameworks instead?
#pkglib="$pkgres/lib"
pkglib="$package/Contents/Frameworks"
@ -247,14 +250,16 @@ echo -e "\nFilling app bundle and utility directory...\n"
# Wireshark executables
if [ "$ui_toolkit" = "gtk" ] ; then
cp -v utility-launcher "$cli_dir/$binary"
for binary in wireshark $binary_list ; do
for binary in $binary_list wireshark ; do
# Copy the binary to its destination
dest_path="$pkgbin/$binary-bin"
cp -v "$binary_path/$binary" "$dest_path"
# TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not
ln -sv ./wireshark "$pkgbin/$binary"
ln -sv ./wireshark "$cli_dir/$binary"
if [ "$binary" != "wireshark" ] ; then
ln -sv ./wireshark "$pkgbin/$binary"
ln -sv ./wireshark "$cli_dir/$binary"
fi
done
elif [ "$ui_toolkit" = "qt" ] ; then
for binary in $binary_list ; do