From b7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 28 Aug 2014 16:48:53 -0700 Subject: =?UTF-8?q?Qt=20=E2=86=92=20wireshark.=20GTK+=20=E2=86=92=20wiresh?= =?UTF-8?q?ark-gtk.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs --- test/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/config.sh') diff --git a/test/config.sh b/test/config.sh index 693a6c12a0..a33cbd9e4f 100755 --- a/test/config.sh +++ b/test/config.sh @@ -57,7 +57,7 @@ fi WS_BIN_PATH=${WS_BIN_PATH:-$SOURCE_DIR} # Tweak the following to your liking. -WIRESHARK=$WS_BIN_PATH/wireshark +WIRESHARK_GTK=$WS_BIN_PATH/wireshark-gtk TSHARK=$WS_BIN_PATH/tshark RAWSHARK=$WS_BIN_PATH/rawshark CAPINFOS=$WS_BIN_PATH/capinfos -- cgit v1.2.1