add dxver to these routines

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index bf419cec07452ce674993085f99cc72acb2bce69..99ae22a90960dec138e9339f3f9c60bae7310d0d 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -124,11 +124,9 @@ $count = 0;
                  inqueue => '9,Input Queue,parray',
                 );
 
+
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 # object destruction
 sub DESTROY

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 3701c085d39823fe8ec622ec1f24f1ceb8f3812a..6fbe90482f23dcaae9b34db21c97f877c15e5618 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -55,10 +55,7 @@ $cmdimportdir = "$main::root/cmd_import"; # the base directory for importing com
                                          #
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 #
 # obtain a new connection this is derived from dxchannel

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index 07038433d440a3161dc6aa4c597ceefd9ea60c41..44abd5b6a6a73acf0798b969fae6ca21d0adec69 100644 (file)
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -39,10 +39,7 @@ use Carp;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 use vars qw($log);
 

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index e961b02b82231cefe4e7ec6dbed02e4f32723a5e..df2957a18e5b5c699be7b2e6c042b0cab4cd2e86 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -37,6 +37,9 @@ use RouteDB;
 
 use strict;
 
+use vars qw($VERSION $BRANCH);
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
                        $last_hour $last10 %eph  %pings %rcmds $ann_to_talk
                        $pingint $obscount %pc19list $chatdupeage $chatimportfn

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 6b06fb13440d615f40f9cba4d16702bc7be8000b..3904c772c6ae266900df20131e70371c1a957864 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -20,10 +20,7 @@ use DXDebug;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 use vars qw($sentencelth);
 

diff --git a/perl/Msg.pm b/perl/Msg.pm
index e13be8f31d90f00329ff08a628c66fa79ac5cffb..5ac71b428e44d793bc74f49e1dfb569bc4f04311 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -12,11 +12,10 @@ package Msg;
 
 use strict;
 
+use DXUtil;
+
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 use IO::Select;
 use IO::Socket;

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index d1b0b1647fd304ff048ab4b7e150d64fa48e6e2d..bde0a74476ac51819a4a27817d43db39ab41a852 100644 (file)
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -11,14 +11,12 @@ package Route::Node;
 use DXDebug;
 use Route;
 use Route::User;
+use DXUtil;
 
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver( q$Revision$);
 
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index 46ee36d0128567985146a07428743083ecdafa1f..cc1e2d7e7bbe9953cf31ed967ccb93802a90898e 100644 (file)
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -10,14 +10,12 @@ package Route::User;
 
 use DXDebug;
 use Route;
+use DXUtil;
 
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 79bca2649becc379f9977628e6ad23443c9e6e71..8cb4dffbec2efa0cceab249b90bfb3baa372fe10 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -131,11 +131,8 @@ $allowdxby = 0;                                    # 1 = allow "dx by <othercall>", 0 - don't allow it
 
 
 use vars qw($VERSION $BRANCH $build $branch);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-$main::build -= 3;                             # fudge (put back for now)
+($VERSION, $BRANCH) = dxver( q$Revision$);
+$main::build -= 2;                             # fudge (put back for now)