Don't fallback to thinking we have SVN; say Git if we didn't find a VCS.
authorJeff Morriss <jeff.morriss.ws@gmail.com>
Tue, 13 Oct 2015 19:54:14 +0000 (15:54 -0400)
committerMichael Mann <mmann78@netscape.net>
Mon, 19 Oct 2015 09:44:01 +0000 (09:44 +0000)
The 2.0.0rc0 Gtk+ GUI, when built from a source tarball, currently puts the
version in the title bar with the string "SVN Rev Unknown".  This changes it
to say "Git Rev Unknown".

(I think there's a Better Way but that will come later.)

Change-Id: I04c903f20554cf681bac09a51a3ef46bb41696f1
Reviewed-on: https://code.wireshark.org/review/10984
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
make-version.pl

index ad32647298677f4241348e866a2bbee4d2e8cfa9..bbb580be638bf9f46ce178459bd049264c7953d6 100755 (executable)
@@ -45,7 +45,8 @@
 # Default configuration:
 #
 # enable: 1
-# svn_client: 1
+# git_client: 0
+# svn_client: 0
 # tortoise_svn: 0
 # format: git %Y%m%d%H%M%S
 # pkg_enable: 1
@@ -87,7 +88,7 @@ my %version_pref = (
 
        "enable"        => 1,
        "git_client"    => 0,   # set if .git found and .git/svn not found
-       "svn_client"    => 1,
+       "svn_client"    => 0,   # set if .svn found
        "tortoise_svn"  => 0,
        "format"        => "git %Y%m%d%H%M%S",
 
@@ -130,6 +131,7 @@ sub read_repo_info {
        } elsif (-d "$srcdir/.svn" or -d "$srcdir/../.svn") {
                $info_source = "Command line (svn info)";
                $info_cmd = "svn info $srcdir";
+               $version_pref{"svn_client"} = 1;
        } elsif (-d "$srcdir/.git/svn") {
                $info_source = "Command line (git-svn)";
                $info_cmd = "(cd $srcdir; git svn info)";