diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-09-30 17:33:59 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-09-30 17:33:59 +0000 |
commit | 2d1b16fb26271f9f3251b8036cdabcf5edddf3cd (patch) | |
tree | 84110f602a52e345d04ba5517d4d2d1a8dbfc680 /packaging | |
parent | 5687b33b4eaaec1df98e07fa9c7f4f597a99971b (diff) |
The Qt executables shouldn't need any wrappers. Just copy them over
as-is.
svn path=/trunk/; revision=52303
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/macosx/osx-app.sh | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index b01d560100..1dee592784 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -207,7 +207,7 @@ resdir=`pwd` #---------------------------------------------------------- pkgexec="$package/Contents/MacOS" pkgres="$package/Contents/Resources" -pkgbin="$pkgres/bin" +pkgbin="$pkgexec" # Should pkglib be Contents/Frameworks instead? #pkglib="$pkgres/lib" pkglib="$package/Contents/Frameworks" @@ -245,16 +245,23 @@ fi echo -e "\nFilling app bundle and utility directory...\n" # Wireshark executables -cp -v utility-launcher "$cli_dir/$binary" -for binary in $binary_list ; 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" -done +if [ "$ui_toolkit" = "gtk" ] ; then + cp -v utility-launcher "$cli_dir/$binary" + for binary in $binary_list ; 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" + done +elif [ "$ui_toolkit" = "qt" ] ; then + for binary in $binary_list ; do + # Copy the binary to its destination + cp -v "$binary_path/$binary" "$pkgexec" + done +fi # ChmodBPF mkdir -p "$chmodbpf_dir" |