X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fissue.pl;h=fd09e8594e3b2a983cbc9c368151e9d4a288f8f6;hb=refs%2Fheads%2Fstaging;hp=10887c8ca966ad702b8c8448108df30d38690921;hpb=624fab70a1d3994e74f7121c449b67c174afef29;p=spider.git diff --git a/perl/issue.pl b/perl/issue.pl index 10887c8c..fd09e859 100755 --- a/perl/issue.pl +++ b/perl/issue.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # create a version and build id for the project using git ids # @@ -18,9 +18,8 @@ use strict; use vars qw($root); my $fn = "$root/perl/Version.pm"; -my $desc = `git-describe --long`; -my ($v, $s, $b) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-/; -$s ||= '0'; # account for missing subversion +my $desc = `git describe --long`; +my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/; $b++; # to account for the commit that is about to happen open F, ">$fn" or die "issue.pl: can't open $fn $!\n"; @@ -33,11 +32,13 @@ print F qq(# package main; -use vars qw(\$version \$subversion \$build); +use vars qw(\$version \$build \$gitversion); \$version = '$v'; -\$subversion = '$s'; \$build = '$b'; +\$gitversion = '$g\[i]'; 1; ); + +exit(0);