add a subversion derived from tags to all builds

[spider.git] / perl / issue.pl

diff --git a/perl/issue.pl b/perl/issue.pl
index 6d2bfd34a9856fa1d8691659c464ded3ff919631..67417127cb3f4862a92b7cc9524841c5dc5c16aa 100755 (executable)
--- a/perl/issue.pl
+++ b/perl/issue.pl
@@ -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;