From 316a74dd2225b10f62d2b18ab2385d6906b9ae62 Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Sat, 14 Sep 2013 22:15:06 +0100 Subject: [PATCH] remove all references to ${main::}subversion --- cmd/show/version.pl | 2 +- perl/DXProt.pm | 2 +- perl/DXProtout.pm | 2 +- perl/Messages | 12 ++++++------ perl/Version.pm | 7 +++---- perl/cluster.pl | 4 ++-- perl/issue.pl | 4 +--- 7 files changed, 15 insertions(+), 18 deletions(-) diff --git a/cmd/show/version.pl b/cmd/show/version.pl index 7107570d..b57dd36c 100644 --- a/cmd/show/version.pl +++ b/cmd/show/version.pl @@ -9,7 +9,7 @@ my @out; my ($year) = (gmtime($main::systime))[5]; $year += 1900; -push @out, "DX Spider Cluster version $main::version (build $main::subversion.$main::build git: $main::gitversion) on \u$^O"; +push @out, "DX Spider Cluster version $main::version (build $main::build git: $main::gitversion) on \u$^O"; push @out, "Copyright (c) 1998-$year Dirk Koopman G1TLH"; return (1, @out); diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 59deac9d..91736470 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -246,7 +246,7 @@ sub init $main::me->{pingave} = 0; $main::me->{registered} = 1; $main::me->{version} = $main::version; - $main::me->{build} = "$main::subversion.$main::build"; + $main::me->{build} = $main::build; $main::me->{do_pc9x} = 1; $main::me->update_pc92_next($pc92_short_update_period); $main::me->update_pc92_keepalive; diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index fc116f8e..088d82e5 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -130,7 +130,7 @@ sub pc17 sub pc18 { my $flags = shift; - return "PC18^DXSpider Version: $main::version Build: $main::subversion.$main::build Git: $main::gitversion$flags^$DXProt::myprot_version^"; + return "PC18^DXSpider Version: $main::version Build: $main::build Git: $main::gitversion$flags^$DXProt::myprot_version^"; } # diff --git a/perl/Messages b/perl/Messages index 71218892..78ad3164 100644 --- a/perl/Messages +++ b/perl/Messages @@ -159,7 +159,7 @@ package DXM; isow => '$_[0] is isolated; unset/isolate $_[0] first', join => 'joining group $_[0]', l1 => 'Sorry $_[0], you are already logged on on another channel', - l2 => 'Hello $_[0], this is $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$main::build', + l2 => 'Hello $_[0], this is $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::build', lang => 'Language is now English', lange1 => 'set/language where is one of ($_[0])', lange2 => 'failed to set language on $_[0]', @@ -584,7 +584,7 @@ package DXM; isow => '$_[0] est isolé; utilisez d\'abord unset/isolate $_[0]', join => 'Affiliation au groupe $_[0]', l1 => 'Désolé $_[0], vous êtes déjà connecté sur un autre canal', - l2 => 'Bonjour $_[0], bienvenue sur $main::mycall à $main::myqth\nServeur DXSpider V$main::version ($main::subversion.$main::build)', + l2 => 'Bonjour $_[0], bienvenue sur $main::mycall à $main::myqth\nServeur DXSpider V$main::version ($main::build)', lang => 'Je parle maintenant français', lange1 => 'Syntaxe : set/language , où est à choisir parmi ($_[0])', lange2 => 'Impossible de fixer la langue à $_[0]', @@ -1228,7 +1228,7 @@ package DXM; isow => '$_[0] ist isoliert; unset/isolate $_[0] zuerst', join => 'Trete Gespraechsgruppe $_[0] bei', l1 => 'Sorry $_[0], Du bist bereits auf einem anderen Kanal eingeloggt', - l2 => 'Moin $_[0], hier ist $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$main::build', + l2 => 'Moin $_[0], hier ist $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::build', lang => 'Sprache ist jetzt Deutsch', lange1 => 'set/language wobei ist eine von ($_[0])', lange2 => 'Fehler beim Setzen der Sprache auf $_[0]', @@ -1496,7 +1496,7 @@ package DXM; isoaro => 'c\'e\' una filtro sulla rotta in uscita per $_[0]; eliminala con clear/route $_[0] prima', isow => '$_[0] e\' isolato; unset/isolate $_[0] prima', l1 => 'Spiacente $_[0], sei già collegato sun un altro canale', - l2 => 'Benvenuto $_[0] sul Cluster $main::mycall a $main::myqth\nsoftware in uso DXSpider V$main::version build $main::subversion.$main::build', + l2 => 'Benvenuto $_[0] sul Cluster $main::mycall a $main::myqth\nsoftware in uso DXSpider V$main::version build $main::build', lang => 'La lingua selezionata e\' adesso Italiano', lange1 => 'set/language dove e\' una tra ($_[0])', lange2 => 'impostazione lingua fallita per $_[0]', @@ -1773,7 +1773,7 @@ package DXM; isoaro => 'vystupni route filtr pro $_[0] uz existuje; zadej nejprve clear/route $_[0]', isow => '$_[0] je izolovan; zadej nejprve unset/isolate $_[0]', l1 => 'Lituji $_[0], uz jsi zalogovan na jinem kanalu', - l2 => 'Ahoj $_[0], toto je $main::mycall, $main::myqth\npouzivajici DXSpider V$main::version build $main::subversion.$main::build', + l2 => 'Ahoj $_[0], toto je $main::mycall, $main::myqth\npouzivajici DXSpider V$main::version build $main::build', lang => 'Jazyk je nyni nastaven na Cestinu (napoveda zatim v procesu)', lange1 => 'set/language kde je jedno z ($_[0])', lange2 => 'selhalo nastaveni jazyka na $_[0]', @@ -2068,7 +2068,7 @@ package DXM; isow => '$_[0] est isolado; unset/isolate $_[0] primeiro', join => 'a juntar ao grupo $_[0]', l1 => 'Desculpe $_[0], voc est ligado noutro canal', - l2 => 'Ol $_[0], isto $main::mycall em $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$main::build', + l2 => 'Ol $_[0], isto $main::mycall em $main::myqth\nrunning DXSpider V$main::version build $main::build', lang => 'Linguagem agora o Portugus', lange1 => 'set/language aonde uma de ($_[0])', lange2 => 'falha ao definir uma lngua em $_[0]', diff --git a/perl/Version.pm b/perl/Version.pm index f7145cf7..6db53a72 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -7,11 +7,10 @@ package main; -use vars qw($version $subversion $build $gitversion); +use vars qw($version $build $gitversion); $version = '1.57'; -$subversion = '0'; -$build = '2'; -$gitversion = '61e7e87'; +$build = '3'; +$gitversion = '16c9326'; 1; diff --git a/perl/cluster.pl b/perl/cluster.pl index ddcf7214..39c65c02 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -301,7 +301,7 @@ sub cease $l->close_server; } - LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) ended"); + LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) ended"); dbg("bye bye everyone - bye bye"); dbgclose(); Logclose(); @@ -445,7 +445,7 @@ DXXml::init(); # banner my ($year) = (gmtime)[5]; $year += 1900; -LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) started"); +LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) started"); dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH"); # load Prefixes diff --git a/perl/issue.pl b/perl/issue.pl index 065c9abd..ea0c083f 100755 --- a/perl/issue.pl +++ b/perl/issue.pl @@ -20,7 +20,6 @@ use vars qw($root); my $fn = "$root/perl/Version.pm"; 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 open F, ">$fn" or die "issue.pl: can't open $fn $!\n"; @@ -33,10 +32,9 @@ print F qq(# package main; -use vars qw(\$version \$subversion \$build \$gitversion); +use vars qw(\$version \$build \$gitversion); \$version = '$v'; -\$subversion = '$s'; \$build = '$b'; \$gitversion = '$g'; -- 2.43.0