change build number calculation to be more accurate

diff --git a/Changes b/Changes
index cf8907bd25d8d63e9886bed211bbe9de3fff18d6..b77d74c05a280ccf116805c0bf49b382635285b6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+01Sep01=======================================================================
+1. Change build number calc (hopefully for the last time)
 27Aug01=======================================================================
 1. make rej/wwv and rej/wcy work
 26Aug01=======================================================================

diff --git a/perl/AGWMsg.pm b/perl/AGWMsg.pm
index 2e74da7be3005c48fd22b4cf2ed43121ec801436..dbb8d8d2dfeeb4410a54aa73d4a42446f5b8de32 100644 (file)
--- a/perl/AGWMsg.pm
+++ b/perl/AGWMsg.pm
@@ -44,6 +44,12 @@ $ypolltime = 10 unless defined $ypolltime;
 $hpolltime = 300 unless defined $hpolltime;
 %circuit = ();
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub init
 {
        return unless $enable;

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index f9fd7828513382c8d2807cc48c44b0103845d264..77f80fe29bc8c2308495d7405455f294efbdd55b 100644 (file)
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -36,6 +36,11 @@ $filterdef = bless ([
                          ['origin_itu', 'n', 12],
                         ], 'Filter::Cmd');
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
 
 # enter the spot for dup checking and return true if it is already a dup
 sub dup

diff --git a/perl/BBS.pm b/perl/BBS.pm
index a014ecfe225f7c92e9d6b9819f795f901108c9fd..a39b41a538ac8dc78857a850fae374669f43af62 100644 (file)
--- a/perl/BBS.pm
+++ b/perl/BBS.pm
@@ -26,6 +26,12 @@ $lastbidclean = time;                        # the last time the bid file was cleaned
 $bidcleanint = 86400;                  # the time between bid cleaning intervals
 $maxbidage = 60;                               # the maximum age of a stored bid
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub init
 {
        tie %hash, 'DB_File', $bidfn;
@@ -139,3 +145,5 @@ sub process
 
 }
 
+1;
+

diff --git a/perl/BadWords.pm b/perl/BadWords.pm
index ff9dd04c8b4e3b70a634828862420fcac1ccaa8a..2336bb0468e22b1b95e3b517f5750c6397dd9fc2 100644 (file)
--- a/perl/BadWords.pm
+++ b/perl/BadWords.pm
@@ -19,6 +19,12 @@ use vars qw(%badwords $fn);
 $fn = "$main::data/badwords";
 %badwords = ();
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # load the badwords file
 sub load
 {

diff --git a/perl/Bands.pm b/perl/Bands.pm
index d40d4c823d1dfe032579a39b7009dbb4dc86b2f8..6384887d998c7a08e7bb82c504cd7f16fa21d38d 100644 (file)
--- a/perl/Bands.pm
+++ b/perl/Bands.pm
@@ -35,6 +35,12 @@ $bandsfn = "$main::data/bands.pl";
                  band => '0,BAND,parraypairs',
                 );
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # load the band data
 sub load
 {

diff --git a/perl/Buck.pm b/perl/Buck.pm
index abcb083a6ae6703d067adacef5fc6571941195e6..f7723d0af01c180cf139f5c0ead54a58adc78264 100644 (file)
--- a/perl/Buck.pm
+++ b/perl/Buck.pm
@@ -8,6 +8,12 @@ use DXUtil;
 
 @ISA = qw( HTML::Parser );
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use strict;
 
 sub new

diff --git a/perl/CmdAlias.pm b/perl/CmdAlias.pm
index 39136bd1b333fd7f5e293e31d656a8108eb16ee8..3ee067a413fd88710286fe342ba2cd6da6b616ae 100644 (file)
--- a/perl/CmdAlias.pm
+++ b/perl/CmdAlias.pm
@@ -32,6 +32,12 @@ use vars qw(%alias %newalias $fn $localfn);
 $fn = "$main::cmd/Aliases";
 $localfn = "$main::localcmd/Aliases";
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub load
 {
        my $ref = shift;
@@ -117,4 +123,6 @@ sub get_hlp
        return undef;
 }
 
+1;
+
 

diff --git a/perl/DB0SDX.pm b/perl/DB0SDX.pm
index eef5ed66a7ad30be6ccdda99f7c1bcd33d2478ec..eaac4d0048ad83b3efd0e2c67a869fb0b31552fc 100644 (file)
--- a/perl/DB0SDX.pm
+++ b/perl/DB0SDX.pm
@@ -9,6 +9,12 @@ use Data::Dumper;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub new
 {
     my $pkg = shift;

diff --git a/perl/DXBearing.pm b/perl/DXBearing.pm
index acf90fa3323dfee9666dbf1a47f237d67541e99c..e2c45e30cad82cb6358b34df06e23fa2f62a0bc3 100644 (file)
--- a/perl/DXBearing.pm
+++ b/perl/DXBearing.pm
@@ -21,6 +21,12 @@ use vars qw($pi);
 
 $pi = 3.14159265358979;
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # convert a qra locator into lat/long in DEGREES
 sub qratoll
 {

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index be5feee32b2915308464961f9884c5b4e9dee218..30a7897092e20a61f50fddf8807bf268075a6c7e 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -103,6 +103,12 @@ $count = 0;
                  senddbg => '8,Sending Debug,yesno',
                 );
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # object destruction
 sub DESTROY
 {

diff --git a/perl/DXCluster.pm b/perl/DXCluster.pm
index 36d1d20f9db5e20e5d09a75a5dabbde5d078342c..8338cccb5a511c3da8e0d1096a5679d6520424fe 100644 (file)
--- a/perl/DXCluster.pm
+++ b/perl/DXCluster.pm
@@ -33,6 +33,12 @@ use vars qw(%cluster %valid);
                  users => '0,No of Users',
                 );
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub alloc
 {
        my ($pkg, $dxchan, $call, $confmode, $here) = @_;

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 6258acb4a104b8186efd36935ed3de0cb390f7f2..f00163297e43d367abf0d8ef249d25a3e8278129 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -41,6 +41,12 @@ $errstr = ();                                        # error string from eval
 $scriptbase = "$main::root/scripts"; # the place where all users start scripts go
 $maxerrors = 20;                               # the maximum number of concurrent errors allowed before disconnection
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 #
 # obtain a new connection this is derived from dxchannel
 #

diff --git a/perl/DXConnect.pm b/perl/DXConnect.pm
index a98c0c82f345f0c942be1a7f7c0afe52116302b9..4a6bbf109c899234ebe264c2437530445dbbfa10 100644 (file)
--- a/perl/DXConnect.pm
+++ b/perl/DXConnect.pm
@@ -16,6 +16,12 @@ 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub init
 {
 

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 870c395e217ea156269ef668bc33c3c3a4c71e53..785a1ad93774260a048098ce002d8c687c77219d 100644 (file)
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -26,6 +26,12 @@ $lastmin = 0;
 my $fn = "$main::cmd/crontab";
 my $localfn = "$main::localcmd/crontab";
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # cron initialisation / reading in cronjobs
 sub init
 {

diff --git a/perl/DXDb.pm b/perl/DXDb.pm
index 6ccb9105c3307426b5c430a60fa438c5bda0ec39..6ee8f939de92e235ebd0144350c79c79550fbd47 100644 (file)
--- a/perl/DXDb.pm
+++ b/perl/DXDb.pm
@@ -48,6 +48,12 @@ $lastprocesstime = time;
 $nextstream = 0;
 %stream = ();
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # allocate a new stream for this request
 sub newstream
 {

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 40cb3a257e1128651683a59dfe6fe0830d3334e3..821c41b44ea40791ccea40620adb642367a4d529 100644 (file)
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -26,6 +26,12 @@ $callback = undef;
 $keepdays = 10;
 $cleandays = 100;
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # Avoid generating "subroutine redefined" warnings with the following
 # hack (from CGI::Carp):
 if (!defined $DB::VERSION) {

diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index 3dd245b2122497dd7c3986088933cd8f0ea41e41..5a01bee99a6acdfa1e6e39c204e623a2d1c46ba4 100644 (file)
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -19,6 +19,12 @@ $default = 48*24*60*60;
 $lasttime = 0;
 $fn = "$main::data/dupefile";
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub init
 {
        $dbm = tie (%d, 'DB_File', $fn) or confess "can't open dupe file: $fn ($!)";

diff --git a/perl/DXHash.pm b/perl/DXHash.pm
index 870ac9cc4dedd17d01bbea823f840121b8bb95c0..54faad9bf4d586b0ddb79e63793f6cbe96c978f4 100644 (file)
--- a/perl/DXHash.pm
+++ b/perl/DXHash.pm
@@ -25,6 +25,12 @@ 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub new
 {
        my ($pkg, $name) = @_;

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index 748df39c782990d8216583f4c39782e1da3d6beb..c13e26c1d8ffac4b8c641802c1af75f1ede6643f 100644 (file)
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -37,6 +37,13 @@ use Julian;
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($log);
 
 $log = new('log', 'dat', 'm');

diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index 153f8f06e4941772729cba258bb968b979cede1a..ad0b1970017d639ae60f8e7c2e5aba1e10e2947a 100644 (file)
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -17,6 +17,12 @@ use Julian;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 #
 # print some items from the log backwards in time
 #

diff --git a/perl/DXM.pm b/perl/DXM.pm
index fe1bca7db2af02b5e4c41bb8136c0fbe191108f3..bb6fb597d919e3ea6dff2d784af5c98033b2bc34 100644 (file)
--- a/perl/DXM.pm
+++ b/perl/DXM.pm
@@ -16,12 +16,22 @@
 
 package DXM;
 
+use strict;
+ 
 use DXVars;
 use DXDebug;
 
 my $localfn = "$main::root/local/Messages";
 my $fn = "$main::root/perl/Messages";
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+use vars qw(%msgs);
+
 sub msg
 {
        my $lang = shift;
@@ -57,3 +67,5 @@ sub init
 {
        load();
 }
+
+1;

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index c87fd2e4ec5b316433e9749f28aa525a0098cb8d..b4470f66c8f3866485dfb9ebfd816ac16a0294ff 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -27,6 +27,13 @@ use IO::File;
 use Fcntl;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
                        @badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
                    $queueinterval $lastq $importfn $minchunk $maxchunk $bulltopriv);

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6332b8bd7ff19f1a2eade9c8c6e972231b481002..310a3e87b94b61ecc17c43cb32d13123ca570b6a 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -34,6 +34,13 @@ use Route;
 use Route::Node;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($me $pc11_max_age $pc23_max_age
                        $last_hour $last10 %eph  %pings %rcmds
                        %nodehops $baddx $badspotter $badnode $censorpc

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 95c1981359262202c5e255752327453540f640a7..8edc0831eb327df41a1f81ea1655953b48142dee 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -19,6 +19,12 @@ 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 #
 # All the PCxx generation routines
 #

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 52b7819d4ace901067280cd6396f164281621c7e..419156d3ac6dc75ecf2b6b1491e9b1ae5d5f307c 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -16,6 +16,13 @@ use IO::File;
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime);
 
 %u = ();

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 56e36d4220ba05bc43a6bd3195c4efa672a19b81..9a911b70e4f6dccc2c7968bc9e4523d0ce4734f1 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -12,6 +12,16 @@ use Date::Parse;
 use IO::File;
 use Data::Dumper;
 
+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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+use vars qw(@month %patmap @ISA @EXPORT);
+
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(atime ztime cldate cldatetime slat slong yesno promptf 
@@ -20,6 +30,7 @@ require Exporter;
                         is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
             );
 
+
 @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 %patmap = (
                   '*' => '.*',

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 2f12d4262f87e2f6c68759ce76c80dace71368bb..146604169096a658270ec2e2681024f04911c00e 100644 (file)
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -21,6 +21,12 @@ use IO::File;
 use IO::Socket;
 use IPC::Open3;
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(@ISA $deftimeout);
 
 @ISA = qw(Msg);

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 031ec92669a6cd200729d40ddef70d9e58d92e15..f9fa611a8ef37ad4d931d4d1a4a862d8fc4fa1a7 100644 (file)
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -33,6 +33,12 @@ use Data::Dumper;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw ($filterbasefn $in);
 
 $filterbasefn = "$main::root/filter";

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index e00dbd9e47a268b40f694ad0f6276c1c8f51b40c..dc003638209c70b3095875e63042c40f27bc8633 100644 (file)
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -19,6 +19,13 @@ use DXDebug;
 use DXDupe;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from 
             $dirprefix $param
             $duplth $dupage $filterdef);

diff --git a/perl/IntMsg.pm b/perl/IntMsg.pm
index e3360fdbf566cf6990dda643c41a78953a3a65bd..510a1f9a661ab03162ba9370c68ab5e3f4a56730 100644 (file)
--- a/perl/IntMsg.pm
+++ b/perl/IntMsg.pm
@@ -10,6 +10,13 @@
 package IntMsg;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use Msg;
 
 use vars qw(@ISA);

diff --git a/perl/Julian.pm b/perl/Julian.pm
index 2307e08a9d651a6b6a238b90d8af0f8945aabc1e..a86c11e2dc8e128510f0b50fda7698516b17bb01 100644 (file)
--- a/perl/Julian.pm
+++ b/perl/Julian.pm
@@ -10,6 +10,14 @@ use strict;
 
 package Julian;
 
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+
 sub alloc($$$)
 {
        my ($pkg, $year, $thing) = @_;

diff --git a/perl/K4UTE.pm b/perl/K4UTE.pm
index eef5ed66a7ad30be6ccdda99f7c1bcd33d2478ec..eaac4d0048ad83b3efd0e2c67a869fb0b31552fc 100644 (file)
--- a/perl/K4UTE.pm
+++ b/perl/K4UTE.pm
@@ -9,6 +9,12 @@ use Data::Dumper;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub new
 {
     my $pkg = shift;

diff --git a/perl/Keps.pm b/perl/Keps.pm
index 3060990712c16bf277ce98ab25afe218b2b40a24..937c272fdd8ab00cffc070a92d6989abc306ae36 100644 (file)
--- a/perl/Keps.pm
+++ b/perl/Keps.pm
@@ -6,6 +6,7 @@
 
 package Sun;
 
+
 %keps = (
   'AO-21' => {
     orbit => '49639',

diff --git a/perl/Minimuf.pm b/perl/Minimuf.pm
index e5ab130f20f1f9e6664f867cacc0e9f32598d5e2..88d2be64c6c7ebdf65c771a5576545d8737b2e7c 100644 (file)
--- a/perl/Minimuf.pm
+++ b/perl/Minimuf.pm
@@ -45,6 +45,13 @@ require Exporter;
             $noise);
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($pi $d2r $r2d $halfpi $pi2 $VOFL $R $hE $hF $GAMMA $LN10
                    $MINBETA $BOLTZ $NTEMP $DELTAF $MPATH $GLOSS $SLOSS
             $noise);

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 94f19e6fbadcc3b0df9d0ca172585ac12bf5ec30..3f52e39dfe8057d4fb202f364be81eb36567ceb3 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -11,6 +11,13 @@
 package Msg;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use IO::Select;
 use IO::Socket;
 use DXDebug;

diff --git a/perl/PC.pm b/perl/PC.pm
index 7ec71e543a24d0a0866c3481eb5832110387541c..6458d2a1d4b00138580d086b9df2f52595dd4352 100644 (file)
--- a/perl/PC.pm
+++ b/perl/PC.pm
@@ -8,6 +8,13 @@
 # protocol entities
 #
 
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 package PC10;
 
 @ISA = qw(Prot);

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 34f581d0e79d224db018d01557fca1a1bf373156..954490fcf41e2798ad39ba6c6951b89002922dd5 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -15,6 +15,13 @@ use Data::Dumper;
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($db  %prefix_loc %pre);
 
 $db = undef;                                   # the DB_File handle

diff --git a/perl/Prot.pm b/perl/Prot.pm
index 67741752c0b495f094bc7a5dbf898857cb0136f4..7435ae963e7c95566057c745c5f862288a0d3b73 100644 (file)
--- a/perl/Prot.pm
+++ b/perl/Prot.pm
@@ -6,6 +6,13 @@ package Prot;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use DXUtil;
 use DXDebug;
 use vars qw(%valid);

diff --git a/perl/QRZ.pm b/perl/QRZ.pm
index 9723229abdf51b4867350cbb3b715b4f62c9d509..f04181a1304908956e5124c9435d380bee58e837 100644 (file)
--- a/perl/QRZ.pm
+++ b/perl/QRZ.pm
@@ -9,6 +9,13 @@ use Data::Dumper;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub new
 {
     my $pkg = shift;

diff --git a/perl/Route.pm b/perl/Route.pm
index 61d07249917a889028eba36f8f9c694e8ad9a0ab..6a4f96f60c6f9101e7dd6cae66f0b8d42b7ce1ee 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -20,6 +20,13 @@ use Prefix;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(%list %valid $filterdef);
 
 %valid = (

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index e29fe3caefb1eeb393dd1322ff21f99ee3428888..6a2e2eaabe990ea600bd7ac6453252618d39723d 100644 (file)
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -14,6 +14,12 @@ use Route::User;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index d492c27bf7769050d20878c7279f9ef4f7d90512..bc28dbef511053f809ce75171775d88a8e20feb9 100644 (file)
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -13,6 +13,12 @@ use Route;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 

diff --git a/perl/Spot.pm b/perl/Spot.pm
index f8925d3d51b33d2bcf63bfe2fffc120c5c7816bd..78d2eda566c7536a0127ecb3a4f4eb2ae14f8e31 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -19,6 +19,13 @@ use DXDupe;
 use Data::Dumper;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef);
 
 $fp = undef;

diff --git a/perl/Sun.pm b/perl/Sun.pm
index 09ebdbac32248e2969ea4335ade79749c628416b..13f7d20cdc1bc7cb60cca01cae1466bfd20bf144 100644 (file)
--- a/perl/Sun.pm
+++ b/perl/Sun.pm
@@ -28,6 +28,13 @@ require Exporter;
 @EXPORT = qw($pi $d2r $r2d );
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($pi $d2r $r2d);
  
 $pi = 3.141592653589;

diff --git a/perl/Timer.pm b/perl/Timer.pm
index 683497d2d328f889f6d1ac6f1aaf9538587b3a4a..98132dec6578345a4b955b02af7eae67e5296377 100644 (file)
--- a/perl/Timer.pm
+++ b/perl/Timer.pm
@@ -16,6 +16,12 @@ use DXDebug;
 @timerchain = ();
 $notimers = 0;
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 sub new
 {
     my ($pkg, $time, $proc, $recur) = @_;

diff --git a/perl/WCY.pm b/perl/WCY.pm
index 7f19ccfd1263c007fb2157d44ec55a1dd4d2c9a5..bccf815b92f82556e07873471754a138d73c9039 100644 (file)
--- a/perl/WCY.pm
+++ b/perl/WCY.pm
@@ -18,6 +18,13 @@ use DXDebug;
 use Data::Dumper;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($date $sfi $k $expk $a $r $sa $gmf $au  @allowed @denied $fp $node $from 
             $dirprefix $param
             $duplth $dupage $filterdef);

diff --git a/perl/cluster.pl b/perl/cluster.pl
index f96b6173a5550ce590203fce3c3461ec09817b23..e7f386977baad7a5137884f74e5d2adb13655274 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -97,7 +97,7 @@ package main;
 use strict;
 use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
                        $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
-                       $clusterport $mycall $decease $build $is_win $routeroot 
+                       $clusterport $mycall $decease $is_win $routeroot 
                   );
 
 @inqueue = ();                                 # the main input queue, an array of hashes
@@ -107,6 +107,13 @@ $starttime = 0;                 # the starting time of the cluster
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();                               # list of listeners
 
+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;
+$main::build += 15;                            # add an offset to make it bigger than last system
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
       
 # send a message to call on conn and disconnect
 sub already_conn
@@ -324,29 +331,8 @@ foreach (@debug) {
 STDOUT->autoflush(1);
 
 # calculate build number
-$build = $main::version;
-
-my @fn;
-open(CL, "$main::root/perl/cluster.pl") or die "Cannot open cluster.pl $!";
-while (<CL>) {
-       next unless /^use\s+([\w:_]+)/;
-       push @fn, $1;
-}
-close CL;
-my $subbuild;
-foreach my $fn (@fn) {
-       $fn =~ s|::|/|g;
-       open(CL, "$main::root/perl/${fn}.pm") or next;
-       while (<CL>) {
-               if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)\.?(\d+.\d+)?/ ) {
-                       $build += $1;
-                       $subbuild += $2 if $2;
-                       last;
-               }
-       }
-       close CL;
-}
-$build = "$build.$subbuild" if $subbuild;
+$build += $main::version;
+$build = "$build.$branch" if $branch;
 
 Log('cluster', "DXSpider V$version, build $build started");