projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix correct url for sh/425
[spider.git]
/
perl
/
issue.pl
diff --git
a/perl/issue.pl
b/perl/issue.pl
index 67417127cb3f4862a92b7cc9524841c5dc5c16aa..802c12e60a1a3a97e126afa8ea1f17a3fdf51e9c 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, $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
$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;
package main;
-use vars qw(\$version \$subversion \$build);
+use vars qw(\$version \$subversion \$build
\$gitversion
);
\$version = '$v';
\$subversion = '$s';
\$build = '$b';
\$version = '$v';
\$subversion = '$s';
\$build = '$b';
+\$gitversion = '$g\[i]';
1;
);
1;
);