diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-10-13 15:54:14 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-19 09:44:01 +0000 |
| commit | 1c322a121431dfa27bcba5dcfc5915d9720a882f (patch) | |
| tree | 2451ac4ee07b67d0ac7f9f8833c36886cccff7a7 /make-version.pl | |
| parent | b98ebbc0b3c6c6a89cbf13061857de497a5fd5f7 (diff) | |
| download | wireshark-1c322a121431dfa27bcba5dcfc5915d9720a882f.tar.gz | |
Don't fallback to thinking we have SVN; say Git if we didn't find a VCS.
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>
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/make-version.pl b/make-version.pl index ad32647298..bbb580be63 100755 --- a/make-version.pl +++ b/make-version.pl @@ -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)"; |