URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c46329c27b8c31729d2d51dc4f69da9b3923de04
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
c46329c by Guy Harris (guy@xxxxxxxxxxxx):
Add a routine to return a version string including VCS information.
Add a routine get_ws_vcs_version_info() that, for builds from a tree
checked out from Wireshark's version control system, returns a string
that includes both the Wireshark version number and an indication of
what particular VCS version was checked out, and just returns
Wireshark's version number for other builds.
Use that routine rather than manually gluing VERSION and the Git version
number together.
("vcs", not "git", just in case we do something bizarre or mercurial
some day. :-))
Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d
Reviewed-on: https://code.wireshark.org/review/2529
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from a70dea1 Move get_os_major_version() to wsutil and rename it to get_windows_major_version().
adds c46329c Add a routine to return a version string including VCS information.
Summary of changes:
dumpcap.c | 17 ++++++------
echld/dispatcher.c | 4 +--
epan/print.c | 2 +-
file.c | 5 ++--
rawshark.c | 14 +++++-----
tshark.c | 19 ++++++-------
ui/gtk/about_dlg.c | 6 ++---
ui/gtk/file_import_dlg.c | 4 +--
ui/gtk/follow_stream.c | 5 ++--
ui/gtk/main.c | 13 ++++-----
ui/gtk/main_titlebar.c | 4 +--
ui/gtk/main_welcome.c | 6 ++---
ui/gtk/summary_dlg.c | 5 ++--
ui/qt/about_dialog.cpp | 6 ++---
ui/qt/main.cpp | 13 ++++-----
ui/qt/summary_dialog.cpp | 4 ++-
ui/qt/summary_dialog.h | 2 --
ui/tap_export_pdu.c | 4 +--
version_info.c | 8 ------
version_info.h | 5 ----
wsutil/CMakeLists.txt | 1 +
wsutil/Makefile.common | 7 ++---
wsutil/{mem_info.c => ws_version_info.c} | 33 +++++++++++------------
wsutil/{os_version_info.h => ws_version_info.h} | 24 +++++++----------
24 files changed, 100 insertions(+), 111 deletions(-)
copy wsutil/{mem_info.c => ws_version_info.c} (64%)
copy wsutil/{os_version_info.h => ws_version_info.h} (67%)