X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fissue.pl;h=c6926148a4ecc61073165fe8ea9305eddfb57b75;hb=2d6de0d041a38f0c89948d756b944747326ca1ed;hp=6d2bfd34a9856fa1d8691659c464ded3ff919631;hpb=776d7bb9277c9d24708e297f240395b51b0aaa93;p=spider.git diff --git a/perl/issue.pl b/perl/issue.pl index 6d2bfd34..c6926148 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 # @@ -19,7 +19,8 @@ use strict; use vars qw($root); my $fn = "$root/perl/Version.pm"; my $desc = `git-describe`; -my ($v, $b) = $desc =~ /^([\d.]+)-(\d+)-/; +my ($v, $s, $b) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-/; +$s ||= '0'; # account for missing subversion $b++; # to account for the commit that is about to happen open F, ">$fn" or die "issue.pl: can't open $fn $!\n"; @@ -32,9 +33,10 @@ print F qq(# package main; -use vars qw(\$version \$build); +use vars qw(\$version \$subversion \$build); \$version = '$v'; +\$subversion = '$s'; \$build = '$b'; 1;