use real git version if git is available

diff --git a/perl/Version.pm b/perl/Version.pm
index e4c207fffc7524907b4aa34f7377148892e0c6ea..e43ab22c20b157e7ffff3a16f054aed42567b320 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
 
 $version = '1.55';
 $subversion = '0';
 
 $version = '1.55';
 $subversion = '0';

-$build = '160';
-$gitversion = '56478c6';
+$build = '161';
+$gitversion = '7a39506[i]';

 
 1;
 
 1;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 5b65717e705ebee2634f3c87f3cc6b2e3555d55b..81e23cf874ce35c04561f725f5f8768a382495e4 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -370,7 +370,7 @@ if (DXSql::init($dsn)) {
        $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
 }
 
        $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
 }
 

-# try to load Encode
+# try to load Encode and Git

 {
        local $^W = 0;
        my $w = $SIG{__DIE__};
 {
        local $^W = 0;
        my $w = $SIG{__DIE__};


@@ -380,6 +380,23 @@ if (DXSql::init($dsn)) {
                import Encode;
                $can_encode = 1;
        }
                import Encode;
                $can_encode = 1;
        }

+       eval { require Git; };
+       unless ($@) {
+               import Git;
+               
+               # determine the real version number
+               my $repo = Git->repository(Directory => "$root/.git");
+               if ($repo) {
+                       my $desc = $repo->command_oneline(['describe', '--long'], STDERR => 0);
+                       if ($desc) {
+                               my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+                               $version = $v;
+                               $subversion = $s || 0;
+                               $build = $b || 0;
+                               $gitversion = "$g\[r]";
+                       }
+               }
+       }

        $SIG{__DIE__} = $w;
 }
 
        $SIG{__DIE__} = $w;
 }
 

diff --git a/perl/issue.pl b/perl/issue.pl
index 065c9abdc1971546d8e198d009c9b7e84ba5e13f..802c12e60a1a3a97e126afa8ea1f17a3fdf51e9c 100755 (executable)
--- a/perl/issue.pl
+++ b/perl/issue.pl
@@ -38,7 +38,7 @@ use vars qw(\$version \$subversion \$build \$gitversion);
 \$version = '$v';
 \$subversion = '$s';
 \$build = '$b';
 \$version = '$v';
 \$subversion = '$s';
 \$build = '$b';

-\$gitversion = '$g';
+\$gitversion = '$g\[i]';

 
 1;
 );
 
 1;
 );