diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2018-05-03 11:01:10 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-05-03 10:19:20 +0000 |
| commit | faf5f86e7e7616149ad5ce82c8f7662b89288064 (patch) | |
| tree | 433f94c056c4cddbba757beae112e082e0ec1616 /make-version.pl | |
| parent | ab949e6deb6ce18815c7312b7483e8f3cd1f8f99 (diff) | |
make-version.pl: Make the SVN output more similar to the git one.
Change-Id: I37930178e52ea0b319b62d3ab1f56f6b0d5aadea
Reviewed-on: https://code.wireshark.org/review/27301
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Joakim Karlsson <oakimk@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/make-version.pl b/make-version.pl index f9744e2488..001e52f321 100755 --- a/make-version.pl +++ b/make-version.pl @@ -561,6 +561,7 @@ sub update_versioned_files sub new_version_h { + my $line; if (!$enable_vcsversion) { return "/* #undef VCSVERSION */\n"; } @@ -573,7 +574,12 @@ sub new_version_h } if ($last_change && $num_commits) { - return "#define VCSVERSION \"$vcs_name Rev $num_commits from $repo_branch\"\n"; + $line = sprintf("v%d.%d.%d", + $version_pref{"version_major"}, + $version_pref{"version_minor"}, + $version_pref{"version_micro"}, + ); + return "#define VCSVERSION \"$line-$vcs_name-$num_commits\"\n"; } return "#define VCSVERSION \"$vcs_name Rev Unknown from unknown\"\n"; |