projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix outgoing peerhost issues
[spider.git]
/
perl
/
issue.pl
diff --git
a/perl/issue.pl
b/perl/issue.pl
index 6d2bfd34a9856fa1d8691659c464ded3ff919631..ea0c083fcf8a43efc426be75049083c7b5acb7b2 100755
(executable)
--- a/
perl/issue.pl
+++ b/
perl/issue.pl
@@
-2,7
+2,7
@@
#
# create a version and build id for the project using git ids
#
#
# create a version and build id for the project using git ids
#
-#
$Id$
+#
#
# Copyright (c) 2007 Dirk Koopman, G1TLH
#
#
# Copyright (c) 2007 Dirk Koopman, G1TLH
#
@@
-18,8
+18,8
@@
use strict;
use vars qw($root);
my $fn = "$root/perl/Version.pm";
use vars qw($root);
my $fn = "$root/perl/Version.pm";
-my $desc = `git
-describe
`;
-my ($v, $
b) = $desc =~ /^([\d.]+)-(\d+)-
/;
+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";
$b++; # to account for the commit that is about to happen
open F, ">$fn" or die "issue.pl: can't open $fn $!\n";
@@
-32,10
+32,11
@@
print F qq(#
package main;
package main;
-use vars qw(\$version \$build);
+use vars qw(\$version \$build
\$gitversion
);
\$version = '$v';
\$build = '$b';
\$version = '$v';
\$build = '$b';
+\$gitversion = '$g';
1;
);
1;
);