diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-06-21 18:02:27 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-06-22 01:06:25 +0000 |
commit | c46329c27b8c31729d2d51dc4f69da9b3923de04 (patch) | |
tree | 196522550c36225b4248bc8c6ed2fb86d5b0ddab /version_info.c | |
parent | a70dea195625f32a026d10d937345d177f81aead (diff) |
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@alum.mit.edu>
Diffstat (limited to 'version_info.c')
-rw-r--r-- | version_info.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/version_info.c b/version_info.c index 7ed06c511a..63adc39991 100644 --- a/version_info.c +++ b/version_info.c @@ -38,18 +38,10 @@ #include <wsutil/cpu_info.h> #include <wsutil/mem_info.h> -#include "version.h" - #ifdef HAVE_LIBCAP # include <sys/capability.h> #endif -#ifdef GITVERSION - const char *wireshark_gitversion = " (" GITVERSION " from " GITBRANCH ")"; -#else - const char *wireshark_gitversion = ""; -#endif - /* * If the string doesn't end with a newline, append one. * Then word-wrap it to 80 columns. |