From f966980937abd4899a9c43329041bb00798ab18e Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 7 Feb 2014 11:14:52 -0800 Subject: Replace "svn" with "git" all over the place. Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs --- tfshark.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tfshark.c') diff --git a/tfshark.c b/tfshark.c index 6e80fb3445..5ed82a8d20 100644 --- a/tfshark.c +++ b/tfshark.c @@ -203,7 +203,7 @@ print_usage(gboolean print_ver) "See http://www.wireshark.org for more information.\n" "\n" "%s", - wireshark_svnversion, get_copyright_info()); + wireshark_gitversion, get_copyright_info()); } else { output = stderr; } @@ -271,7 +271,7 @@ glossary_option_help(void) output = stdout; - fprintf(output, "TFShark " VERSION "%s\n", wireshark_svnversion); + fprintf(output, "TFShark " VERSION "%s\n", wireshark_gitversion); fprintf(output, "\n"); fprintf(output, "Usage: tfshark -G [report]\n"); @@ -749,7 +749,7 @@ show_version(GString *comp_info_str, GString *runtime_info_str) "%s" "\n" "%s", - wireshark_svnversion, get_copyright_info(), comp_info_str->str, + wireshark_gitversion, get_copyright_info(), comp_info_str->str, runtime_info_str->str); } @@ -802,7 +802,7 @@ main(int argc, char *argv[]) "%s" "\n" "%s", - wireshark_svnversion, comp_info_str->str, runtime_info_str->str); + wireshark_gitversion, comp_info_str->str, runtime_info_str->str); #ifdef _WIN32 arg_list_utf_16to8(argc, argv); @@ -2101,7 +2101,7 @@ write_preamble(capture_file *cf) switch (output_action) { case WRITE_TEXT: - return print_preamble(print_stream, cf ? cf->filename : NULL, wireshark_svnversion); + return print_preamble(print_stream, cf ? cf->filename : NULL, wireshark_gitversion); case WRITE_XML: if (print_details) -- cgit v1.2.1