From: minima Date: Sat, 1 Sep 2001 12:15:09 +0000 (+0000) Subject: change build number calculation to be more accurate X-Git-Tag: R_1_48~75 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git change build number calculation to be more accurate --- diff --git a/Changes b/Changes index cf8907bd..b77d74c0 100644 --- 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 2e74da7b..dbb8d8d2 100644 --- 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 f9fd7828..77f80fe2 100644 --- 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 a014ecfe..a39b41a5 100644 --- 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 ff9dd04c..2336bb04 100644 --- 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 d40d4c82..6384887d 100644 --- 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 abcb083a..f7723d0a 100644 --- 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 39136bd1..3ee067a4 100644 --- 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 eef5ed66..eaac4d00 100644 --- 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 acf90fa3..e2c45e30 100644 --- 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 be5feee3..30a78970 100644 --- 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 36d1d20f..8338cccb 100644 --- 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 6258acb4..f0016329 100644 --- 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 a98c0c82..4a6bbf10 100644 --- 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 870c395e..785a1ad9 100644 --- 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 6ccb9105..6ee8f939 100644 --- 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 40cb3a25..821c41b4 100644 --- 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 3dd245b2..5a01bee9 100644 --- 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 870ac9cc..54faad9b 100644 --- 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 748df39c..c13e26c1 100644 --- 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 153f8f06..ad0b1970 100644 --- 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 fe1bca7d..bb6fb597 100644 --- 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 c87fd2e4..b4470f66 100644 --- 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 6332b8bd..310a3e87 100644 --- 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 95c19813..8edc0831 100644 --- 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 52b7819d..419156d3 100644 --- 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 56e36d42..9a911b70 100644 --- 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 2f12d426..14660416 100644 --- 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 031ec926..f9fa611a 100644 --- 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 e00dbd9e..dc003638 100644 --- 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 e3360fdb..510a1f9a 100644 --- 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 2307e08a..a86c11e2 100644 --- 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 eef5ed66..eaac4d00 100644 --- 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 30609907..937c272f 100644 --- 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 e5ab130f..88d2be64 100644 --- 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 94f19e6f..3f52e39d 100644 --- 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 7ec71e54..6458d2a1 100644 --- 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 34f581d0..954490fc 100644 --- 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 67741752..7435ae96 100644 --- 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 9723229a..f04181a1 100644 --- 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 61d07249..6a4f96f6 100644 --- 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 e29fe3ca..6a2e2eaa 100644 --- 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 d492c27b..bc28dbef 100644 --- 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 f8925d3d..78d2eda5 100644 --- 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 09ebdbac..13f7d20c 100644 --- 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 683497d2..98132dec 100644 --- 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 7f19ccfd..bccf815b 100644 --- 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 f96b6173..e7f38697 100755 --- 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 () { - 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 () { - 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");