osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

We have a usable tag now. There's no need to fake a version number. 

Change-Id: Ic6a704013b38e9be130be40098e9293e9196bfec
This commit is contained in:
Gerald Combs 2014-01-29 11:53:04 -08:00
parent 5982c6179b
commit 82c5bfd6f1
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make-version.pl
View File

@ -183,15 +183,9 @@ sub read_repo_info {
$repo_path = basename($line);
}
# XXX After the SVN->git migration we'll create tags for 1.11.x.
# Until then we'll fake it.
#chomp($line = qx{git describe --tags --dirty});
chomp($line = qx{git rev-parse --short HEAD});
chomp($line = qx{git describe --dirty --match "v*"});
if (defined($line)) {
#$git_description = $line;
$git_description = "wireshark-1.11." . $version_pref{"version_minor"} .
"-$revision-g$line";
$git_description = "wireshark-" . substr($line, 1);
}
1;