diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-10-17 18:56:58 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-10-21 16:16:56 +0000 |
| commit | 86386243cd5062c7b1701d505efade4774b2dfd7 (patch) | |
| tree | ed69ad023f941ddfe6a2cd3c3e18995ed1da03b5 /packaging | |
| parent | 39b631da4dcd2b8a27054865040e5a1ebc28df34 (diff) | |
Make the "-qt" option the default in the OS X packaging scripts.
Change-Id: I1e404c342d06381be71735ff6fbc47e9b2b13899
Reviewed-on: https://code.wireshark.org/review/4895
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 12 | ||||
| -rwxr-xr-x | packaging/macosx/osx-dmg.sh.in | 20 |
2 files changed, 22 insertions, 10 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 715cd1851f..c641d197fb 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -41,9 +41,9 @@ exclude_prefixes="/System/|/Library/|/usr/lib/|/usr/X11/|/opt/X11/|@rpath|@execu # "qt" or "gtk" -ui_toolkit="gtk" +ui_toolkit="qt" # Name of the Wireshark executable -wireshark_bin_name="wireshark-gtk" +wireshark_bin_name="wireshark" binary_list=" capinfos @@ -95,7 +95,9 @@ OPTIONS -sdkroot specify the root of the SDK to use -qt,--qt-flavor - use the Qt flavor + Use the Qt flavor. This is the default. + -gtk,--gtk-flavor + Use the GTK+ flavor. EXAMPLE $0 -s -l /opt/local -bp ../../Build/bin -p Info.plist -sdkroot /Developer/SDKs/MacOSX10.5.sdk @@ -123,6 +125,10 @@ do ui_toolkit="qt" wireshark_bin_name="wireshark" ;; + -gtk|--gtk-flavor) + ui_toolkit="gtk" + wireshark_bin_name="wireshark-gtk" + ;; -h|--help) help exit 0 ;; diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in index 636f6651de..8625fb0e7f 100755 --- a/packaging/macosx/osx-dmg.sh.in +++ b/packaging/macosx/osx-dmg.sh.in @@ -42,8 +42,8 @@ rw_name="RWwireshark.dmg" volume_name="Wireshark" tmp_dir="/tmp/dmg-$$" auto_open_opt= -ws_bin="$app_bundle/Contents/Resources/bin/wireshark-bin" -readme_name="Read_me_first_gtk.rtf" +ws_bin="$app_bundle/Contents/Resources/bin/Wireshark" +readme_name="Read_me_first_qt.rtf" if [ -d /Applications/Xcode.app/Developer ] then @@ -69,14 +69,16 @@ USAGE OPTIONS -h,--help - display this help message + Display this help message. -s - set a new apperance (do not actually create a bundle) + Set a new apperance (do not actually create a bundle). -b,--app-bundle - set the path to the Wireshark.app that should be copied - in the dmg + Set the path to the Wireshark.app that should be copied + in the dmg. -qt,--qt-flavor - use the Qt flavor + Use the Qt flavor. This is the default. + -gtk,--gtk-flavor + Use the GTK+ flavor. " } @@ -96,6 +98,10 @@ do readme_name="Read_me_first_qt.rtf" ws_bin="$app_bundle/Contents/MacOS/Wireshark" ;; + -gtk|--gtk-flavor) + readme_name="Read_me_first_gtk.rtf" + ws_bin="$app_bundle/Contents/MacOS/wireshark-bin" + ;; *) echo "Invalid command line option" exit 2 ;; |