diff options
| -rw-r--r-- | CMakeLists.txt | 46 | ||||
| -rw-r--r-- | CMakeOptions.txt | 35 | ||||
| -rw-r--r-- | Makefile.am | 55 | ||||
| -rw-r--r-- | Makefile.nmake | 26 | ||||
| -rw-r--r-- | config.nmake | 1 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | debian/control | 20 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | debian/wireshark-gtk.docs (renamed from debian/wireshark.docs) | 0 | ||||
| -rw-r--r-- | debian/wireshark-gtk.install (renamed from debian/wireshark.install) | 2 | ||||
| -rw-r--r-- | debian/wireshark-qt.install | 2 | ||||
| -rw-r--r-- | doc/README.qt | 2 | ||||
| -rw-r--r-- | image/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 6 | ||||
| -rwxr-xr-x | packaging/nsis/common.nsh | 8 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 3 | ||||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 114 | ||||
| -rwxr-xr-x | test/config.sh | 2 | ||||
| -rwxr-xr-x | test/suite-capture.sh | 6 | ||||
| -rwxr-xr-x | test/suite-io.sh | 6 | ||||
| -rwxr-xr-x | test/test.sh | 2 | ||||
| -rw-r--r-- | ui/qt/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | ui/qt/Makefile.am | 2 | ||||
| -rw-r--r-- | ui/qt/Makefile.common | 26 | ||||
| -rw-r--r-- | ui/qt/Wireshark.pro (renamed from ui/qt/QtShark.pro) | 22 | ||||
| -rw-r--r-- | ui/qt/i18n.qrc | 18 | ||||
| -rw-r--r-- | ui/qt/wireshark_de.qm (renamed from ui/qt/qtshark_de.qm) | bin | 1383 -> 1383 bytes | |||
| -rw-r--r-- | ui/qt/wireshark_de.ts (renamed from ui/qt/qtshark_de.ts) | 0 | ||||
| -rw-r--r-- | ui/qt/wireshark_en.qm (renamed from ui/qt/qtshark_en.qm) | bin | 725 -> 725 bytes | |||
| -rw-r--r-- | ui/qt/wireshark_en.ts (renamed from ui/qt/qtshark_en.ts) | 0 | ||||
| -rw-r--r-- | ui/qt/wireshark_fr.qm (renamed from ui/qt/qtshark_fr.qm) | bin | 140018 -> 140018 bytes | |||
| -rw-r--r-- | ui/qt/wireshark_fr.ts (renamed from ui/qt/qtshark_fr.ts) | 0 | ||||
| -rw-r--r-- | ui/qt/wireshark_ja_JP.qm (renamed from ui/qt/qtshark_ja_JP.qm) | bin | 19047 -> 19047 bytes | |||
| -rw-r--r-- | ui/qt/wireshark_ja_JP.ts (renamed from ui/qt/qtshark_ja_JP.ts) | 0 | ||||
| -rw-r--r-- | ui/qt/wireshark_pl.qm (renamed from ui/qt/qtshark_pl.qm) | bin | 31 -> 31 bytes | |||
| -rw-r--r-- | ui/qt/wireshark_pl.ts (renamed from ui/qt/qtshark_pl.ts) | 0 | ||||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.qm (renamed from ui/qt/qtshark_zh_CN.qm) | bin | 47918 -> 47918 bytes | |||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.ts (renamed from ui/qt/qtshark_zh_CN.ts) | 0 |
39 files changed, 229 insertions, 211 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7276e5eec4..adad595099 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC") # -D_ALLOW_KEYWORD_MACROS For VS2012 onwards the, C++ STL does not permit macro redefinitions of keywords # (see http://msdn.microsoft.com/en-us/library/bb531344(v=vs.110).aspx) # This definition prevents the complaint about the redefinition of inline by WinPCap - # in pcap-stdinc.h when compiling CPP files, e.g. the QT UI + # in pcap-stdinc.h when compiling CPP files, e.g. the Qt UI /DPSAPI_VERSION=1 /DBUILD_WINDOWS /D_ALLOW_KEYWORD_MACROS @@ -496,7 +496,7 @@ if(ENABLE_AIRPCAP) endif() # Build the GTK-GUI? -if(BUILD_wireshark) +if(BUILD_wireshark_gtk) if(ENABLE_GTK3) set(PACKAGELIST ${PACKAGELIST} GTK3) else() @@ -508,7 +508,7 @@ if(BUILD_wireshark) endif() # Build the Qt GUI? -if(BUILD_qtshark) +if(BUILD_wireshark) if(ENABLE_QT5) # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten # somewhere. The if WIN32 in this place is annoying as well. @@ -555,7 +555,7 @@ if(ENABLE_KERBEROS) endif() # Portable audio -if(ENABLE_PORTAUDIO AND BUILD_wireshark) +if(ENABLE_PORTAUDIO AND BUILD_wireshark_gtk) set(PACKAGELIST ${PACKAGELIST} PORTAUDIO) endif() @@ -829,11 +829,11 @@ if(ENABLE_ECHLD) add_subdirectory( echld ) endif() -if(BUILD_wireshark AND GTK_FOUND) +if(BUILD_wireshark_gtk AND GTK_FOUND) add_subdirectory( ui/gtk ) endif() -if(BUILD_qtshark AND QT_FOUND) +if(BUILD_wireshark AND QT_FOUND) add_subdirectory( ui/qt ) endif() @@ -1077,7 +1077,7 @@ set(LIBEPAN_LIBS ${WINSPARKLE_LIBRARIES} ) -if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) ) +if( (BUILD_wireshark_gtk AND GTK_FOUND) OR (BUILD_wireshark AND QT_FOUND) ) set(WIRESHARK_SRC capture_info.c capture_opts.c @@ -1094,8 +1094,8 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) ) ) endif() -if(BUILD_wireshark AND GTK_FOUND) - set(wireshark_LIBS +if(BUILD_wireshark_gtk AND GTK_FOUND) + set(wireshark_gtk_LIBS gtkui ui capchild @@ -1112,17 +1112,17 @@ if(BUILD_wireshark AND GTK_FOUND) ${NL_LIBRARIES} ${WIN_COMCTL32_LIBRARY} ) - # qtshark and wireshark share wireshark_FILES + # wireshark and wireshark-gtk share wireshark_FILES - add_executable(wireshark ${wireshark_FILES}) - set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") - set_target_properties(wireshark PROPERTIES FOLDER "Executables") - target_link_libraries(wireshark ${wireshark_LIBS}) - install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + add_executable(wireshark-gtk ${wireshark_FILES}) + set_target_properties(wireshark-gtk PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(wireshark-gtk PROPERTIES FOLDER "Executables") + target_link_libraries(wireshark-gtk ${wireshark_gtk_LIBS}) + install(TARGETS wireshark-gtk RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() -if(BUILD_qtshark AND QT_FOUND) - set(qtshark_LIBS +if(BUILD_wireshark AND QT_FOUND) + set(wireshark_LIBS qtui ui capchild @@ -1136,18 +1136,18 @@ if(BUILD_qtshark AND QT_FOUND) ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} ${NL_LIBRARIES} ) - # qtshark and wireshark share wireshark_FILES + # wireshark and wireshark-gtk share wireshark_FILES # Policy since 2.8.11 if (POLICY CMP0020) cmake_policy(SET CMP0020 OLD) endif() - add_executable(qtshark ${wireshark_FILES}) - set_target_properties(qtshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") - set_target_properties(qtshark PROPERTIES FOLDER "Executables") - target_link_libraries(qtshark ${qtshark_LIBS}) - install(TARGETS qtshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + add_executable(wireshark ${wireshark_FILES}) + set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(wireshark PROPERTIES FOLDER "Executables") + target_link_libraries(wireshark ${wireshark_LIBS}) + install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() register_tap_files(tshark-tap-register.c diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 079ff9f17d..00209b15f4 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -1,21 +1,21 @@ # Build options for use by CMake -option(BUILD_wireshark "Build the GTK+-GUI version of Wireshark" ON) -option(BUILD_qtshark "Build the Qt-GUI version of Wireshark" ON) -option(BUILD_tshark "Build tshark" ON) -option(BUILD_tfshark "Build tfshark" ON) -option(BUILD_rawshark "Build rawshark" ON) -option(BUILD_dumpcap "Build dumpcap" ON) -option(BUILD_text2pcap "Build text2pcap" ON) -option(BUILD_mergecap "Build mergecap" ON) -option(BUILD_reordercap "Build reordercap" ON) -option(BUILD_editcap "Build editcap" ON) -option(BUILD_capinfos "Build capinfos" ON) -option(BUILD_captype "Build captype" ON) -option(BUILD_randpkt "Build randpkt" ON) -option(BUILD_dftest "Build dftest" ON) -option(AUTOGEN_dcerpc "Autogenerate DCE RPC dissectors" OFF) -option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) +option(BUILD_wireshark "Build Wireshark" ON) +option(BUILD_wireshark_gtk "Build Wireshark (GTK+ UI)" ON) +option(BUILD_tshark "Build tshark" ON) +option(BUILD_tfshark "Build tfshark" ON) +option(BUILD_rawshark "Build rawshark" ON) +option(BUILD_dumpcap "Build dumpcap" ON) +option(BUILD_text2pcap "Build text2pcap" ON) +option(BUILD_mergecap "Build mergecap" ON) +option(BUILD_reordercap "Build reordercap" ON) +option(BUILD_editcap "Build editcap" ON) +option(BUILD_capinfos "Build capinfos" ON) +option(BUILD_captype "Build captype" ON) +option(BUILD_randpkt "Build randpkt" ON) +option(BUILD_dftest "Build dftest" ON) +option(AUTOGEN_dcerpc "Autogenerate DCE RPC dissectors" OFF) +option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) option(DISABLE_WERROR "Do not treat warnings as errors" OFF) option(ENABLE_EXTRA_COMPILER_WARNINGS "Do additional compiler warnings (disables -Werror)" OFF) @@ -27,7 +27,7 @@ if(WIN32) else() option(ENABLE_GTK3 "Use GTK3 instead of GTK2 to build wireshark" ON) endif() -option(ENABLE_QT5 "Use Qt5 instead of Qt4 to build qtshark" ON) +option(ENABLE_QT5 "Use Qt5 instead of Qt4 to build wireshark" ON) option(ENABLE_PCAP "Enable libpcap support (required for capturing)" ON) option(WANT_PACKET_EDITOR "Enable packet editor (experimental)" ON) # @@ -74,4 +74,3 @@ option(ENABLE_SBC "Build with SBC Codec support in RTP Player" ON) set(DUMPCAP_INSTALL_OPTION "normal" CACHE STRING "Permissions to install") set(DUMPCAP_INST_VALS "normal" "suid" "capabilities") set_property(CACHE DUMPCAP_INSTALL_OPTION PROPERTY STRINGS ${DUMPCAP_INST_VALS}) - diff --git a/Makefile.am b/Makefile.am index dfa3fbaa05..397a51c9fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,7 @@ bin_PROGRAMS = \ @rawshark_bin@ \ @echld_test_bin@ -EXTRA_PROGRAMS = wireshark wireshark-qt tshark tfshark capinfos captype editcap \ +EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype editcap \ mergecap dftest randpkt text2pcap dumpcap reordercap rawshark \ wireshark_cxx echld_test @@ -308,17 +308,17 @@ include Makefile.common if ENABLE_STATIC if HAVE_GTK -wireshark_LDFLAGS = -Wl,-static -all-static +wireshark_gtk_LDFLAGS = -Wl,-static -all-static endif if HAVE_Qt -wireshark_qt_LDFLAGS = -Wl,-static -all-static +wireshark_LDFLAGS = -Wl,-static -all-static endif else if HAVE_GTK -wireshark_LDFLAGS = -export-dynamic +wireshark_gtk_LDFLAGS = -export-dynamic endif if HAVE_Qt -wireshark_qt_LDFLAGS = -export-dynamic +wireshark_LDFLAGS = -export-dynamic endif endif @@ -344,7 +344,7 @@ endif # although it's also possible that -lgmodule is in GTK_LIBS but not # GLIB_LIBS (that's the case on my machine right now, for example). # -wireshark_ldadd = \ +wireshark_common_ldadd = \ capchild/libcapchild.a \ caputils/libcaputils.a \ ui/libui.a \ @@ -365,35 +365,35 @@ wireshark_ldadd = \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ \ - @PORTAUDIO_LIBS@ \ @GLIB_LIBS@ \ -lm if HAVE_Qt -wireshark_qt_SOURCES = $(WIRESHARK_COMMON_SRC) -wireshark_qt_INCLUDES = $(WIRESHARK_COMMON_INCLUDES) -wireshark_qt_CFLAGS = $(AM_CLEAN_CFLAGS) -wireshark_qt_LDADD = \ +wireshark_SOURCES = $(WIRESHARK_COMMON_SRC) +wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES) +wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) +wireshark_LDADD = \ ui/qt/libqtui.a \ - $(wireshark_ldadd) \ + $(wireshark_common_ldadd) \ @Qt_LIBS@ # -# XXX - this makes wireshark_qt_LDFLAGS not work; we should figure out -# another way to get wireshark-qt linked as a C++ program, perhaps by +# XXX - this makes wireshark_LDFLAGS not work; we should figure out +# another way to get wireshark linked as a C++ program, perhaps by # having a top-level wireshark-qt.cpp file that contains main() and -# hthat calls the UI code from ui/qt. +# that calls the UI code from ui/qt. # -wireshark_qt_LINK = $(CXXLINK) +wireshark_LINK = $(CXXLINK) endif if HAVE_GTK -wireshark_SOURCES = $(WIRESHARK_COMMON_SRC) -wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES) -wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) -wireshark_LDADD = \ +wireshark_gtk_SOURCES = $(WIRESHARK_COMMON_SRC) +wireshark_gtk_INCLUDES = $(WIRESHARK_COMMON_INCLUDES) +wireshark_gtk_CFLAGS = $(AM_CLEAN_CFLAGS) +wireshark_gtk_LDADD = \ ui/gtk/libgtkui.a \ - $(wireshark_ldadd) \ + $(wireshark_common_ldadd) \ + @PORTAUDIO_LIBS@ \ @GTK_LIBS@ endif @@ -775,12 +775,12 @@ EXTRA_DIST = \ debian/wireshark-dev.manpages \ debian/wireshark-dev.prerm \ debian/wireshark-doc.docs \ - debian/wireshark-qt.docs \ - debian/wireshark-qt.install \ - debian/wireshark.docs \ - debian/wireshark.install \ + debian/wireshark-gtk.docs \ + debian/wireshark-gtk.install \ debian/wireshark.manpages \ debian/wireshark.menu \ + debian/wireshark-qt.docs \ + debian/wireshark-qt.install \ dfilters \ doxygen_global.cfg \ doxygen.cfg.in \ @@ -1297,8 +1297,8 @@ checkapi_local: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -build \ -sourcedir=$(srcdir) \ $(TSHARK_TAP_SRC) \ - $(wireshark_SOURCES) -# $(EXTRA_wireshark_SOURCES) + $(wireshark_gtk_SOURCES) +# $(EXTRA_wireshark_gtk_SOURCES) checkapi: checkapi_local cd wiretap && $(MAKE) checkapi @@ -1331,4 +1331,3 @@ if HAVE_DOXYGEN rm -f wsar_html.zip zip -rq wsar_html.zip wsar_html endif - diff --git a/Makefile.nmake b/Makefile.nmake index 47af7e7028..4d28ec86f9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -51,7 +51,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) include Makefile.common -wireshark_OBJECTS = $(WIRESHARK_COMMON_SRC:.c=.obj) +wireshark_gtk_OBJECTS = $(WIRESHARK_COMMON_SRC:.c=.obj) tshark_OBJECTS = $(tshark_SOURCES:.c=.obj) tfshark_OBJECTS = $(tfshark_SOURCES:.c=.obj) rawshark_OBJECTS = $(rawshark_SOURCES:.c=.obj) @@ -73,7 +73,7 @@ reordercap_OBJECTS = $(reordercap_SOURCES:.c=.obj) # psapi.lib see http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx # -wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ +wireshark_gtk_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib psapi.lib \ $(GTHREAD_LIBS) \ $(HHC_LIBS) \ @@ -206,12 +206,12 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) -EXECUTABLES=wireshark.exe tshark.exe tfshark.exe rawshark.exe \ +EXECUTABLES=wireshark-gtk.exe tshark.exe tfshark.exe rawshark.exe \ capinfos.exe captype.exe editcap.exe mergecap.exe text2pcap.exe \ randpkt.exe reordercap.exe dumpcap.exe dftest.exe !IFDEF QT5_BASE_DIR -EXECUTABLES=$(EXECUTABLES) qtshark.exe +EXECUTABLES=$(EXECUTABLES) $(PROGRAM_NAME).exe !ENDIF RESOURCES=image\wireshark.res image\file_dlg_win32.res \ @@ -314,16 +314,16 @@ $(RESOURCES): image ## (These variables (as well as '$(guilibsdll)' and '$(conlibsdll)') are defined in win32.mak). wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap -wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) capchild caputils codecs epan ui gtk win32 image\wireshark.res image\file_dlg_win32.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\libui.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib plugins +$(PROGRAM_NAME_GTK).exe : $(LIBS_CHECK) config.h $(wireshark_gtk_OBJECTS) capchild caputils codecs epan ui gtk win32 image\wireshark.res image\file_dlg_win32.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\libui.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:$(PROGRAM_NAME).exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE $(wireshark_LIBS) $(GTK_LIBS) capchild\libcapchild.lib caputils\libcaputils.lib codecs\codecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib ui\libui.lib $(wireshark_OBJECTS) image\wireshark.res image\file_dlg_win32.res + /OUT:$(PROGRAM_NAME_GTK).exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE $(wireshark_gtk_LIBS) $(GTK_LIBS) capchild\libcapchild.lib caputils\libcaputils.lib codecs\codecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib ui\libui.lib $(wireshark_gtk_OBJECTS) image\wireshark.res image\file_dlg_win32.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:$(PROGRAM_NAME).exe;1 !ENDIF -qtshark.exe : install-generated-files $(LIBS_CHECK) config.h capchild caputils epan ui qt wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins +$(PROGRAM_NAME).exe : install-generated-files $(LIBS_CHECK) config.h capchild caputils epan ui qt wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) capchild caputils epan ui cli image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins @echo Linking $@ @@ -553,7 +553,7 @@ text2pcap-scanner.obj : text2pcap-scanner.c $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? clean-local: - rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(tfshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \ + rm -f $(wireshark_gtk_OBJECTS) $(tshark_OBJECTS) $(tfshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \ $(EXECUTABLES) *.pdb *.sbr *.exe.manifest \ capinfos.obj capinfos.exp capinfos.lib \ captype.obj captype.exp captype.lib \ @@ -568,7 +568,7 @@ clean-local: libwsutil.dll \ wireshark.bsc rm -rf $(INSTALL_DIR) - rm -rf wireshark-qt-release + rm -rf $(INSTALL_DIR_QT) clean: clean-local cd asn1 @@ -825,7 +825,7 @@ gtk:: help config.h version.h doxygen qt:: help config.h version.h doxygen !IFDEF QT5_BASE_DIR cd ui/qt - $(QT5_BASE_DIR)\bin\qmake CONFIG+=release QtShark.pro + $(QT5_BASE_DIR)\bin\qmake CONFIG+=release Wireshark.pro !IFDEF ENABLE_CODE_ANALYSIS -nmake !ELSE @@ -965,7 +965,7 @@ install_qt: . \ Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws.zip \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" - + # The process_libs target when invoked causes either a --libverify or a --download for all the required libraries. # (The choice is determined by the value of the macro WIN_SETUP_OPT). process_libs: @@ -1161,7 +1161,7 @@ clean_setup: # prepare debugging of Wireshark in INSTALL_DIR -debug-wireshark: wireshark.exe install-generated-files +debug-wireshark: wireshark-gtk.exe install-generated-files # prepare debugging of tshark in INSTALL_DIR debug-tshark: tshark.exe install-generated-files @@ -1194,7 +1194,7 @@ install-generated-files: doc xcopy ".\wsutil\libwsutil.dll" $(INSTALL_DIR) /d if exist ".\wsutil\libwsutil.lib" xcopy ".\wsutil\libwsutil.lib" $(INSTALL_DIR) /d if exist ".\wsutil\libwsutil.pdb" xcopy ".\wsutil\libwsutil.pdb" $(INSTALL_DIR) /d - if exist $(PROGRAM_NAME).exe xcopy $(PROGRAM_NAME).exe $(INSTALL_DIR) /d + if exist $(PROGRAM_NAME)-gtk.exe xcopy $(PROGRAM_NAME)-gtk.exe $(INSTALL_DIR) /d if exist $(PROGRAM_NAME).pdb xcopy $(PROGRAM_NAME).pdb $(INSTALL_DIR) /d if exist $(PROGRAM_NAME).bsc xcopy $(PROGRAM_NAME).bsc $(INSTALL_DIR) /d if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL_DIR) /d diff --git a/config.nmake b/config.nmake index cca598874a..fddc6ff1a9 100644 --- a/config.nmake +++ b/config.nmake @@ -1367,6 +1367,7 @@ GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \ $(GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib GTHREAD_LIBS=$(GTK_DIR)\lib\gthread-$(GLIB_VERSION).lib +PROGRAM_NAME_GTK=$(PROGRAM_NAME)-gtk # 2.18 was no good(Theming problem) !IF "$(GTK_INST_VERSION)" == "2.24" || "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" diff --git a/configure.ac b/configure.ac index ff9c4f7fc5..6cdc6e762c 100644 --- a/configure.ac +++ b/configure.ac @@ -1521,23 +1521,23 @@ AC_SUBST(GLIB_MIN_VERSION) use_glib_cflags="true" if test "$have_gtk" = "yes" -a "$have_qt" = "yes" ; then # We have both GTK and Qt and thus will be building both wireshark - # and wireshark-qt. + # and wireshark-gtk. - wireshark_bin="wireshark\$(EXEEXT) wireshark-qt\$(EXEEXT)" + wireshark_bin="wireshark\$(EXEEXT) wireshark-gtk\$(EXEEXT)" wireshark_man="wireshark.1" wireshark_SUBDIRS="codecs ui/qt ui/gtk" fi if test "$have_gtk" = "no" -a "$have_qt" = "yes" ; then # We don't have GTK+ but we have Qt. - wireshark_bin="wireshark-qt\$(EXEEXT)" + wireshark_bin="wireshark\$(EXEEXT)" wireshark_man="wireshark.1" wireshark_SUBDIRS="codecs ui/qt" fi if test "$have_gtk" = "yes" -a "$have_qt" = "no" ; then # We have GTK+ but not Qt. - wireshark_bin="wireshark\$(EXEEXT)" + wireshark_bin="wireshark-gtk\$(EXEEXT)" wireshark_man="wireshark.1" wireshark_SUBDIRS="codecs ui/gtk" use_glib_cflags="false" @@ -3001,9 +3001,9 @@ if test "x$have_gtk" = "xyes"; then fi if test "x$have_qt" = "xyes" ; then - enable_qtshark="yes" + enable_wireshark_qt="yes" else - enable_qtshark="no" + enable_wireshark_qt="no" fi if test "x$enable_setcap_install" = "xyes" ; then @@ -3084,8 +3084,8 @@ fi echo "" echo "The Wireshark package has been configured with the following options." -echo " Build wireshark (Gtk+) : $have_gtk""$gtk_lib_message" -echo " Build wireshark-qt : $enable_qtshark" +echo " Build wireshark : $enable_wireshark_qt" +echo " Build wireshark-gtk : $have_gtk""$gtk_lib_message" echo " Build tshark : $enable_tshark" echo " Build tfshark : $enable_tfshark" echo " Build capinfos : $enable_capinfos" diff --git a/debian/control b/debian/control index 009bdbf1bc..1db850ba86 100644 --- a/debian/control +++ b/debian/control @@ -42,15 +42,15 @@ Description: network traffic analyzer - common files Package: wireshark Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, wireshark-common (= ${binary:Version}), xdg-utils +Depends: wireshark-qt Replaces: ethereal (<< 1.0.0-3) Conflicts: ethereal (<< 1.0.0-3) -Description: network traffic analyzer - GTK+ version +Description: network traffic analyzer - meta-package Wireshark is a network "sniffer" - a tool that captures and analyzes packets off the wire. Wireshark can decode too many protocols to list here. . - This package provides the GTK+ version of wireshark. + This is a meta-package for Wireshark. Package: wireshark-qt Architecture: any @@ -62,7 +62,19 @@ Description: network traffic analyzer - Qt version packets off the wire. Wireshark can decode too many protocols to list here. . - This package provides the Qt version of wireshark. + This package provides the Qt version of Wireshark. + +Package: wireshark-gtk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, wireshark-common (= ${binary:Version}), xdg-utils +Replaces: ethereal (<< 1.0.0-3) +Conflicts: ethereal (<< 1.0.0-3) +Description: network traffic analyzer - GTK+ version + Wireshark is a network "sniffer" - a tool that captures and analyzes + packets off the wire. Wireshark can decode too many protocols to list + here. + . + This package provides the GTK+ version of Wireshark. Package: tshark Architecture: any diff --git a/debian/rules b/debian/rules index 50842c52e3..a3511f1468 100755 --- a/debian/rules +++ b/debian/rules @@ -40,8 +40,8 @@ override_dh_auto_install: $(CURDIR)/debian/tmp/usr/share/mime/packages/ install -m 644 image/wsicon.svg $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps/wireshark.svg install -m 644 wireshark-mime-package.xml $(CURDIR)/debian/tmp/usr/share/mime/packages/wireshark.xml - # upstream uses qtshark for binary's name - mv $(CURDIR)/debian/tmp/usr/bin/qtshark $(CURDIR)/debian/tmp/usr/bin/wireshark-qt + # upstream uses wireshark for binary's name + # mv $(CURDIR)/debian/tmp/usr/bin/wireshark $(CURDIR)/debian/tmp/usr/bin/wireshark-qt mkdir -p $(CURDIR)/debian/tmp/etc/wireshark/ mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \ $(CURDIR)/debian/tmp/etc/wireshark/ diff --git a/debian/wireshark.docs b/debian/wireshark-gtk.docs index e174728f54..e174728f54 100644 --- a/debian/wireshark.docs +++ b/debian/wireshark-gtk.docs diff --git a/debian/wireshark.install b/debian/wireshark-gtk.install index b47eab9df5..895676e445 100644 --- a/debian/wireshark.install +++ b/debian/wireshark-gtk.install @@ -1,4 +1,4 @@ -usr/bin/wireshark +usr/bin/wireshark-gtk wireshark.desktop usr/share/applications/ image/wsicon32.xpm usr/share/pixmaps/ usr/share/icons/ diff --git a/debian/wireshark-qt.install b/debian/wireshark-qt.install index 39ef302505..d407ff3384 100644 --- a/debian/wireshark-qt.install +++ b/debian/wireshark-qt.install @@ -1 +1 @@ -usr/bin/wireshark-qt
\ No newline at end of file +usr/bin/wireshark
\ No newline at end of file diff --git a/doc/README.qt b/doc/README.qt index 1d530f452d..b864cb8ef4 100644 --- a/doc/README.qt +++ b/doc/README.qt @@ -28,7 +28,7 @@ There are several ways of building qtshark: 2) CMake: - Qt (BUILD_qtshark) is enabled by default. Use the "cmake" command to + Qt (BUILD_wireshark) is enabled by default. Use the "cmake" command to configure a normal out-of-tree or in-tree build, e.g. mkdir cmakebuild diff --git a/image/Makefile.nmake b/image/Makefile.nmake index 0cb78774f2..de5c615b16 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -7,6 +7,7 @@ include ..\config.nmake ALL_RC=wireshark.rc libwireshark.rc tshark.rc tfshark.rc rawshark.rc capinfos.rc captype.rc editcap.rc text2pcap.rc mergecap.rc reordercap.rc wiretap.rc dumpcap.rc libwsutil.rc wireshark.exe.manifest all : $(ALL_RC) +# wireshark.exe.manifest and wireshark.rc are used for both Qt and GTK+ executables. wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake sed -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \ -e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \ diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 0e44a15ecb..0b158f28f7 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -14,7 +14,7 @@ STAGING_DIR=..\..\$(INSTALL_DIR) EXE=../../tshark.exe ../../editcap.exe \ !IFDEF GTK_DIR - ../../wireshark.exe \ + ../../wireshark-gtk.exe \ !ENDIF ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(WINPCAP_VERSION).exe DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll @@ -226,7 +226,7 @@ NSIS_FLAGS=\ !IFDEF HHC_DIR /DHHC_DIR="$(HHC_DIR)" \ !ENDIF -!IF EXIST("..\..\wireshark-qt-release\qtshark.exe") +!IF EXIST("..\..\wireshark-qt-release\wireshark.exe") /DQT_DIR="..\..\wireshark-qt-release" \ !ENDIF @@ -236,7 +236,7 @@ qt-dll-manifest.nsh: windeployqt-to-nsis.ps1 Makefile.nmake set PATH=%PATH%;$(QT5_BASE_DIR)\bin !ENDIF $(POWERSHELL) windeployqt-to-nsis.ps1 \ - -Executable ..\..\wireshark-qt-release\qtshark.exe \ + -Executable ..\..\wireshark-qt-release\wireshark.exe \ -FilePath $@ $(STAGING_DIR)\uninstall.exe : $(NSI) diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh index 9d25ebf93d..ebfaa92965 100755 --- a/packaging/nsis/common.nsh +++ b/packaging/nsis/common.nsh @@ -16,8 +16,8 @@ Name "${DISPLAY_NAME}" !define PROGRAM_NAME_GTK "${PROGRAM_NAME} 1" !define PROGRAM_FULL_NAME_QT "The ${PROGRAM_NAME} Network Protocol Analyzer" !define PROGRAM_FULL_NAME_GTK "The ${PROGRAM_NAME} Network Protocol Analyzer (classic UI)" -!define PROGRAM_NAME_PATH_QT "qtshark.exe" -!define PROGRAM_NAME_PATH_GTK "${PROGRAM_NAME}.exe" +!define PROGRAM_NAME_PATH_QT "${PROGRAM_NAME}.exe" +!define PROGRAM_NAME_PATH_GTK "${PROGRAM_NAME}-gtk.exe" !define UNINSTALLER_NAME "uninstall.exe" @@ -48,9 +48,9 @@ XPStyle on Push $R0 Push $R1 Push $R2 - + !define UPDATEICONS_UNIQUE ${__LINE__} - + IfFileExists "$SYSDIR\shell32.dll" UpdateIcons.ok_shell32_${UPDATEICONS_UNIQUE} UpdateIcons.error_shell32_${UPDATEICONS_UNIQUE} UpdateIcons.ok_shell32_${UPDATEICONS_UNIQUE}: System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 0782013426..5911503957 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -819,7 +819,7 @@ SectionEnd ; "Required" !ifdef QT_DIR Section "${PROGRAM_NAME}" SecWiresharkQt ;------------------------------------------- -; by default, QtShark is installed but file is always associate with Wireshark GTK+ +; by default, Wireshark is installed but file is always associate with Wireshark GTK+ SetOutPath $INSTDIR File "${QT_DIR}\${PROGRAM_NAME_PATH_QT}" !include qt-dll-manifest.nsh diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index a930d41a32..60dee968ba 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -16,7 +16,6 @@ NSIS_PLUGINS = nsis-plugins FINDPROCDLL = $(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)\FindProcDLL.dll TOPDIR = ..\..\.. -U3DIST = ..\..\u3\win32 COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y @@ -25,7 +24,7 @@ WIN32_SETUP_OPT = --download !ENDIF # XXX This should be defined in config.nmake. -!IF EXIST("..\..\wireshark-qt-release\qtshark.exe") +!IF EXIST("..\..\wireshark-qt-release\wireshark.exe") QT_DIR = "..\..\wireshark-qt-release" !ENDIF !IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 751f1fcb59..a397cd0b35 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -2,9 +2,9 @@ # @configure_input@ # configure options: @CONFIG_ARGS@ +%bcond_with qt %bcond_without gtk2 %bcond_with gtk3 -%bcond_with qt # Set these to 1 if you want to ensure your package includes support for them: %global with_adns 0 @@ -29,10 +29,10 @@ Version: @VERSION@ Release: 1 License: GPL+ Group: Applications/Internet -Source: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 +Source: https://wireshark.org/download/src/%{name}-%{version}.tar.bz2 # Or this URL for automated builds: -#Source: http://wireshark.org/download/automated/src/%{name}-%{version}.tar.bz2 -URL: http://www.wireshark.org/ +#Source: https://wireshark.org/download/automated/src/%{name}-%{version}.tar.bz2 +URL: https://www.wireshark.org/ Packager: Gerald Combs <gerald[AT]wireshark.org> # Some distributions create a wireshark-devel package; get rid of it Obsoletes: wireshark-devel @@ -114,7 +114,35 @@ features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. This package contains command-line utilities, plugins, and documentation for -Wireshark. A GTK+ and a Qt graphical user interface are packaged separately. +Wireshark. A Qt and GTK+ graphical user interface are packaged separately. + +%if %{with qt} +%package qt +Summary: Qt GUI for Wireshark +Group: Applications/Internet +%if 0%{?suse_version} +Requires: libqt4 >= @QT_MIN_VERSION@ +BuildRequires: libqt4-devel >= @QT_MIN_VERSION@ +%else +Requires: qt >= @QT_MIN_VERSION@ +BuildRequires: qt-devel >= @QT_MIN_VERSION@ +%endif +Requires: %{name} = %{version}-%{release} +Requires: xdg-utils +Requires: hicolor-icon-theme +BuildRequires: desktop-file-utils +Requires(post): desktop-file-utils +Requires(post): /usr/sbin/update-alternatives +Requires(postun): /usr/sbin/update-alternatives +BuildRequires: gcc-c++ +%if 0%{?suse_version} +# Need this for SuSE's suse_update_desktop_file macro +BuildRequires: update-desktop-files +%endif + +%description qt +Contains the Qt Wireshark GUI and desktop integration files. +%endif %if %{with gtk2} || %{with gtk3} %package gnome @@ -155,34 +183,6 @@ Requires: portaudio Contains the Gnome (GTK+) Wireshark GUI and desktop integration files. %endif -%if %{with qt} -%package qt -Summary: Qt GUI for Wireshark -Group: Applications/Internet -%if 0%{?suse_version} -Requires: libqt4 >= @QT_MIN_VERSION@ -BuildRequires: libqt4-devel >= @QT_MIN_VERSION@ -%else -Requires: qt >= @QT_MIN_VERSION@ -BuildRequires: qt-devel >= @QT_MIN_VERSION@ -%endif -Requires: %{name} = %{version}-%{release} -Requires: xdg-utils -Requires: hicolor-icon-theme -BuildRequires: desktop-file-utils -Requires(post): desktop-file-utils -Requires(post): /usr/sbin/update-alternatives -Requires(postun): /usr/sbin/update-alternatives -BuildRequires: gcc-c++ -%if 0%{?suse_version} -# Need this for SuSE's suse_update_desktop_file macro -BuildRequires: update-desktop-files -%endif - -%description qt -Contains the Qt Wireshark GUI and desktop integration files. -%endif - %prep %setup -q -n %{name}-%{version} @@ -205,9 +205,9 @@ Contains the Qt Wireshark GUI and desktop integration files. %if %{with_portaudio} --with-portaudio \ %endif + %{?_with_qt} \ %{?_with_gtk2} \ %{?_with_gtk3} \ - %{?_with_qt} \ --disable-warnings-as-errors # Remove rpath. It's prohibited in Fedora[1] and anyway we don't need it (and @@ -223,11 +223,15 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -%if %{with gtk3} || %{with gtk2} +# %if %{with gtk3} || %{with gtk2} +# # Change the program name for 'alternatives' +# mv %{buildroot}%{_bindir}/wireshark %{buildroot}%{_bindir}/wireshark-gtk +# %endif +%if %{with qt} # Change the program name for 'alternatives' -mv %{buildroot}%{_bindir}/wireshark %{buildroot}%{_bindir}/wireshark-gtk +mv %{buildroot}%{_bindir}/wireshark %{buildroot}%{_bindir}/wireshark-qt %endif -%if %{with gtk2} || %{with gtk3} || %{with qt} +%if %{with qt} || %{with gtk2} || %{with gtk3} # Create the 'alternative' file touch %{buildroot}%{_bindir}/wireshark make DESTDIR=$RPM_BUILD_ROOT install_desktop_files @@ -261,39 +265,39 @@ fi %postun -p /sbin/ldconfig -%if %{with gtk2} || %{with gtk3} -%post gnome +%if %{with qt} +%post qt update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : touch --no-create /usr/share/icons/hicolor &>/dev/null || : /usr/sbin/update-alternatives --install %{_bindir}/wireshark \ - %{name} %{_bindir}/wireshark-gtk 50 + %{name} %{_bindir}/wireshark-qt 50 -%postun gnome +%postun qt update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create /usr/share/icons/hicolor &>/dev/null || : gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : - /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk + /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-qt fi %endif -%if %{with qt} -%post qt +%if %{with gtk2} || %{with gtk3} +%post gnome update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : touch --no-create /usr/share/icons/hicolor &>/dev/null || : /usr/sbin/update-alternatives --install %{_bindir}/wireshark \ - %{name} %{_bindir}/wireshark-qt 10 + %{name} %{_bindir}/wireshark-gtk 10 -%postun qt +%postun gnome update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create /usr/share/icons/hicolor &>/dev/null || : gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : - /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-qt + /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk fi %endif @@ -346,31 +350,35 @@ gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : %{_mandir}/man4/* %{_datadir}/wireshark -%if %{with gtk2} || %{with gtk3} -%files gnome +%if %{with qt} +%files qt %defattr(-,root,root) /usr/share/applications/wireshark.desktop /usr/share/icons/hicolor/*/apps/* /usr/share/icons/hicolor/*/mimetypes/* /usr/share/mime/packages/wireshark.xml -%{_bindir}/wireshark-gtk +%{_bindir}/wireshark-qt %{_mandir}/man1/wireshark.* %ghost %{_bindir}/wireshark %endif -%if %{with qt} -%files qt +%if %{with gtk2} || %{with gtk3} +%files gnome %defattr(-,root,root) /usr/share/applications/wireshark.desktop /usr/share/icons/hicolor/*/apps/* /usr/share/icons/hicolor/*/mimetypes/* /usr/share/mime/packages/wireshark.xml -%{_bindir}/wireshark-qt +%{_bindir}/wireshark-gtk %{_mandir}/man1/wireshark.* %ghost %{_bindir}/wireshark %endif %changelog +* Fri Aug 29 2014 Gerald Combs +- The Qt UI is now the default. Update logic and prioritization to + reflect this. + * Mon Aug 4 2014 Jeff Morriss - Fix RPM builds with a prefix other than /usr: The location of update-alternatives does not depend on Wireshark's installation prefix: 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 diff --git a/test/suite-capture.sh b/test/suite-capture.sh index b4b0fba926..71dec1a26e 100755 --- a/test/suite-capture.sh +++ b/test/suite-capture.sh @@ -27,7 +27,7 @@ EXIT_OK=0 EXIT_COMMAND_LINE=1 EXIT_ERROR=2 -WIRESHARK_CMD="$WIRESHARK -o gui.update.enabled:FALSE -k" +WIRESHARK_GTK_CMD="$WIRESHARK_GTK -o gui.update.enabled:FALSE -k" capture_test_output_print() { wait @@ -202,7 +202,7 @@ capture_step_fifo() { # capture packets via a fifo capture_step_stdin() { CONSOLE_LOG_ARGS="" - if [ "$DUT" == "$WIRESHARK_CMD" -a "$WS_SYSTEM" == "Windows" ] ; then + if [ "$DUT" == "$WIRESHARK_GTK_CMD" -a "$WS_SYSTEM" == "Windows" ] ; then CONSOLE_LOG_ARGS="-o console.log.level:127" fi @@ -428,7 +428,7 @@ wireshark_capture_suite() { return fi - DUT="$WIRESHARK_CMD" + DUT="$WIRESHARK_GTK_CMD" test_step_add "Capture 10 packets" capture_step_10packets # piping to stdout doesn't work with Wireshark and capturing! #test_step_add "Capture 10 packets using stdout: -w -" capture_step_10packets_stdout diff --git a/test/suite-io.sh b/test/suite-io.sh index c8f471b106..3245a61edb 100755 --- a/test/suite-io.sh +++ b/test/suite-io.sh @@ -143,9 +143,9 @@ io_step_rawshark_pcap_stdin() { } -wireshark_io_suite() { +wireshark_gtk_io_suite() { # Q: quit after cap, k: start capture immediately - DUT="$WIRESHARK" + DUT="$WIRESHARK_GTK" test_step_add "Input file" io_step_input_file } @@ -179,7 +179,7 @@ io_suite() { test_step_set_pre io_cleanup_step test_step_set_post io_cleanup_step test_suite_add "TShark file I/O" tshark_io_suite - #test_suite_add "Wireshark file I/O" wireshark_io_suite + #test_suite_add "Wireshark file I/O" wireshark_gtk_io_suite #test_suite_add "Dumpcap file I/O" dumpcap_io_suite test_suite_add "Rawshark file I/O" rawshark_io_suite } diff --git a/test/test.sh b/test/test.sh index 6ed3f0e3a3..a676b1f122 100755 --- a/test/test.sh +++ b/test/test.sh @@ -114,7 +114,7 @@ trap test_cleanup EXIT test_step_prerequisites() { NOTFOUND=0 - for i in "$WIRESHARK" "$TSHARK" "$CAPINFOS" "$DUMPCAP" ; do + for i in "$WIRESHARK_GTK" "$TSHARK" "$CAPINFOS" "$DUMPCAP" ; do if [ ! -x $i ]; then echo "Couldn't find $i" NOTFOUND=1 diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index a4292e7d08..ef24563d23 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -266,12 +266,12 @@ set(WIRESHARK_QT_QRC ) set(WIRESHARK_QT_TS - qtshark_de.ts - qtshark_en.ts # lupdate -pluralonly - qtshark_fr.ts - qtshark_ja_JP.ts - qtshark_pl.ts - qtshark_zh_CN.ts + wireshark_de.ts + wireshark_en.ts # lupdate -pluralonly + wireshark_fr.ts + wireshark_ja_JP.ts + wireshark_pl.ts + wireshark_zh_CN.ts ) include_directories( @@ -336,4 +336,3 @@ add_library(qtui STATIC ) set_target_properties(qtui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(qtui PROPERTIES FOLDER "UI") - diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index 3ea7b5444c..668bcb3e67 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -269,6 +269,6 @@ EXTRA_DIST = \ main.cpp \ Makefile.common \ Makefile_custom.common \ - QtShark.pro \ + Wireshark.pro \ display_filter_16.svg \ gpl-template.txt diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 1a50700b4d..d5a3bfc712 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -267,27 +267,27 @@ QRC_FILES = \ # # .ts files. -# qtshark_en should be pluralonly. +# wireshark_en should be pluralonly. # TS_FILES = \ - qtshark_de.ts \ - qtshark_en.ts \ - qtshark_fr.ts \ - qtshark_ja_JP.ts \ - qtshark_pl.ts \ - qtshark_zh_CN.ts + wireshark_de.ts \ + wireshark_en.ts \ + wireshark_fr.ts \ + wireshark_ja_JP.ts \ + wireshark_pl.ts \ + wireshark_zh_CN.ts # # .qm files. # # Should be auto-generated ? QM_FILES = \ - qtshark_de.qm \ - qtshark_en.qm \ - qtshark_fr.qm \ - qtshark_ja_JP.qm \ - qtshark_pl.qm \ - qtshark_zh_CN.qm + wireshark_de.qm \ + wireshark_en.qm \ + wireshark_fr.qm \ + wireshark_ja_JP.qm \ + wireshark_pl.qm \ + wireshark_zh_CN.qm # # The .rcc.cpp files generated from them. diff --git a/ui/qt/QtShark.pro b/ui/qt/Wireshark.pro index 93dd797c97..9d142d91e0 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/Wireshark.pro @@ -33,10 +33,10 @@ isEqual(QT_MAJOR_VERSION, 5): greaterThan(QT_MINOR_VERSION, 1): win32 { QT += winextras } -macx { +win32|macx { TARGET = Wireshark } else { - TARGET = qtshark + TARGET = wireshark } TEMPLATE = app @@ -133,7 +133,7 @@ win32 { # of the Qt libraries themselves requires that Wireshark first be built with /MDd. # Presumably doing source-level Qt library debugging shoyuld rarely be needed. - # We want to build only the QtShark linked with the QT "release" libraries + # We want to build only the Wireshark linked with the Qt "release" libraries # so disable debug & etc. ## CONFIG -= release CONFIG -= debug @@ -487,7 +487,7 @@ win32 { # Currently the QT bin dir has to be on the path for windeployqt to work isEqual(QT_MAJOR_VERSION, 5):isEqual(QT_MINOR_VERSION, 3) { QMAKE_POST_LINK +=$$quote(set PATH=%PATH%;$${QT5_BASE_DIR}\\bin$$escape_expand(\\n\\t)) - QMAKE_POST_LINK +=$$quote(windeployqt --release $(DESTDIR)qtshark.exe)$$escape_expand(\\n\\t)) + QMAKE_POST_LINK +=$$quote(windeployqt --release $(DESTDIR)wireshark.exe)$$escape_expand(\\n\\t)) } } @@ -501,14 +501,14 @@ RESOURCES += \ welcome.qrc \ -# qtshark_en should be pluralonly. +# wireshark_en should be pluralonly. TRANSLATIONS = \ - qtshark_de.ts \ - qtshark_en.ts \ - qtshark_fr.ts \ - qtshark_ja_JP.ts \ - qtshark_pl.ts \ - qtshark_zh_CN.ts + wireshark_de.ts \ + wireshark_en.ts \ + wireshark_fr.ts \ + wireshark_ja_JP.ts \ + wireshark_pl.ts \ + wireshark_zh_CN.ts ICON = ../../packaging/macosx/Resources/Wireshark.icns diff --git a/ui/qt/i18n.qrc b/ui/qt/i18n.qrc index 51aadfc5e4..ac7872ea9c 100644 --- a/ui/qt/i18n.qrc +++ b/ui/qt/i18n.qrc @@ -2,28 +2,28 @@ Wireshark - Network traffic analyzer By Gerald Combs <gerald@wireshark.org> Copyright 1998 Gerald Combs - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <RCC> <qresource prefix="/i18n"> - <file>qtshark_de.qm</file> - <file>qtshark_en.qm</file> - <file>qtshark_fr.qm</file> - <file>qtshark_ja_JP.qm</file> - <file>qtshark_pl.qm</file> - <file>qtshark_zh_CN.qm</file> + <file>wireshark_de.qm</file> + <file>wireshark_en.qm</file> + <file>wireshark_fr.qm</file> + <file>wireshark_ja_JP.qm</file> + <file>wireshark_pl.qm</file> + <file>wireshark_zh_CN.qm</file> </qresource> </RCC> diff --git a/ui/qt/qtshark_de.qm b/ui/qt/wireshark_de.qm Binary files differindex 758ce73d5f..758ce73d5f 100644 --- a/ui/qt/qtshark_de.qm +++ b/ui/qt/wireshark_de.qm diff --git a/ui/qt/qtshark_de.ts b/ui/qt/wireshark_de.ts index 59f7ccd584..59f7ccd584 100644 --- a/ui/qt/qtshark_de.ts +++ b/ui/qt/wireshark_de.ts diff --git a/ui/qt/qtshark_en.qm b/ui/qt/wireshark_en.qm Binary files differindex 52c5b6c3a2..52c5b6c3a2 100644 --- a/ui/qt/qtshark_en.qm +++ b/ui/qt/wireshark_en.qm diff --git a/ui/qt/qtshark_en.ts b/ui/qt/wireshark_en.ts index 901c19c684..901c19c684 100644 --- a/ui/qt/qtshark_en.ts +++ b/ui/qt/wireshark_en.ts diff --git a/ui/qt/qtshark_fr.qm b/ui/qt/wireshark_fr.qm Binary files differindex 69ecc75663..69ecc75663 100644 --- a/ui/qt/qtshark_fr.qm +++ b/ui/qt/wireshark_fr.qm diff --git a/ui/qt/qtshark_fr.ts b/ui/qt/wireshark_fr.ts index d9dc696e33..d9dc696e33 100644 --- a/ui/qt/qtshark_fr.ts +++ b/ui/qt/wireshark_fr.ts diff --git a/ui/qt/qtshark_ja_JP.qm b/ui/qt/wireshark_ja_JP.qm Binary files differindex 8ebdf49e99..8ebdf49e99 100644 --- a/ui/qt/qtshark_ja_JP.qm +++ b/ui/qt/wireshark_ja_JP.qm diff --git a/ui/qt/qtshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index b57ab81c3c..b57ab81c3c 100644 --- a/ui/qt/qtshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts diff --git a/ui/qt/qtshark_pl.qm b/ui/qt/wireshark_pl.qm Binary files differindex aaeed198f2..aaeed198f2 100644 --- a/ui/qt/qtshark_pl.qm +++ b/ui/qt/wireshark_pl.qm diff --git a/ui/qt/qtshark_pl.ts b/ui/qt/wireshark_pl.ts index bee4254da9..bee4254da9 100644 --- a/ui/qt/qtshark_pl.ts +++ b/ui/qt/wireshark_pl.ts diff --git a/ui/qt/qtshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm Binary files differindex 3b89bc6fb8..3b89bc6fb8 100644 --- a/ui/qt/qtshark_zh_CN.qm +++ b/ui/qt/wireshark_zh_CN.qm diff --git a/ui/qt/qtshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 03a8217b34..03a8217b34 100644 --- a/ui/qt/qtshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts |