X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fissue.pl;h=802c12e60a1a3a97e126afa8ea1f17a3fdf51e9c;hb=5a9cdeef2a8f38736d9b51f96e121c1fe63aeeff;hp=67417127cb3f4862a92b7cc9524841c5dc5c16aa;hpb=281bb0799ecf66390c48719f76ca5d9f83fe4c73;p=spider.git diff --git a/perl/issue.pl b/perl/issue.pl index 67417127..802c12e6 100755 --- a/perl/issue.pl +++ b/perl/issue.pl @@ -2,7 +2,7 @@ # # create a version and build id for the project using git ids # -# $Id$ +# # # Copyright (c) 2007 Dirk Koopman, G1TLH # @@ -18,8 +18,8 @@ use strict; use vars qw($root); my $fn = "$root/perl/Version.pm"; -my $desc = `git-describe`; -my ($v, $s, $b) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-/; +my $desc = `git describe --long`; +my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/; $s ||= '0'; # account for missing subversion $b++; # to account for the commit that is about to happen @@ -33,11 +33,12 @@ print F qq(# package main; -use vars qw(\$version \$subversion \$build); +use vars qw(\$version \$subversion \$build \$gitversion); \$version = '$v'; \$subversion = '$s'; \$build = '$b'; +\$gitversion = '$g\[i]'; 1; );