From: Dirk Koopman Date: Thu, 21 Jun 2007 18:07:53 +0000 (+0100) Subject: add a subversion derived from tags to all builds X-Git-Tag: 1.55~157 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=281bb0799ecf66390c48719f76ca5d9f83fe4c73;p=spider.git add a subversion derived from tags to all builds --- diff --git a/cmd/show/version.pl b/cmd/show/version.pl index f8066d8b..be5aab84 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::build) on \u$^O"; +push @out, "DX Spider Cluster version $main::version (build $main::subversion.$main::build) 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 68567808..62d56e48 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -221,7 +221,7 @@ sub init $main::me->{pingave} = 0; $main::me->{registered} = 1; $main::me->{version} = $main::version; - $main::me->{build} = $main::build; + $main::me->{build} = "$main::subversion.$main::build"; $main::me->{do_pc9x} = 1; } diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 5f1664d0..135ce61a 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -119,7 +119,7 @@ sub pc18 { my $flags = " pc9x"; $flags .= " xml" if DXXml::available(); - return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^"; + return "PC18^DXSpider Version: $main::version Build: $main::subversion.$main::build$flags^$DXProt::myprot_version^"; } # diff --git a/perl/Messages b/perl/Messages index db4a1370..4c321d55 100644 --- a/perl/Messages +++ b/perl/Messages @@ -150,7 +150,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::build', + l2 => 'Hello $_[0], this is $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$main::build', lang => 'Language is now English', lange1 => 'set/language where is one of ($_[0])', lange2 => 'failed to set language on $_[0]', @@ -573,7 +573,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::build)', + l2 => 'Bonjour $_[0], bienvenue sur $main::mycall à $main::myqth\nServeur DXSpider V$main::version ($main::subversion.$main::build)', lang => 'Je parle maintenant français', lange1 => 'Syntaxe : set/language , où est à choisir parmi ($_[0])', lange2 => 'Impossible de fixer la langue à $_[0]', @@ -1207,7 +1207,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::build', + l2 => 'Moin $_[0], hier ist $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$main::build', lang => 'Sprache ist jetzt Deutsch', lange1 => 'set/language wobei ist eine von ($_[0])', lange2 => 'Fehler beim Setzen der Sprache auf $_[0]', @@ -1475,7 +1475,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::build', + l2 => 'Benvenuto $_[0] sul Cluster $main::mycall a $main::myqth\nsoftware in uso DXSpider V$main::version build $main::subversion.$main::build', lang => 'La lingua selezionata e\' adesso Italiano', lange1 => 'set/language dove e\' una tra ($_[0])', lange2 => 'impostazione lingua fallita per $_[0]', @@ -1752,7 +1752,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::build', + l2 => 'Ahoj $_[0], toto je $main::mycall, $main::myqth\npouzivajici DXSpider V$main::version build $main::subversion.$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]', @@ -2047,7 +2047,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::build', + l2 => 'Ol $_[0], isto $main::mycall em $main::myqth\nrunning DXSpider V$main::version build $main::subversion.$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 ecfc658c..bdd5fb89 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -7,9 +7,10 @@ package main; -use vars qw($version $build); +use vars qw($version $subversion $build); $version = '1.54'; -$build = '57'; +$subversion = '0'; +$build = '58'; 1; diff --git a/perl/cluster.pl b/perl/cluster.pl index 80bedb46..e1e75472 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -275,7 +275,7 @@ sub cease $l->close_server; } - LogDbg('cluster', "DXSpider V$version, build $build ended"); + LogDbg('cluster', "DXSpider V$version, build $subversion.$build ended"); dbgclose(); Logclose(); @@ -364,7 +364,7 @@ DXXml::init(); # banner my ($year) = (gmtime)[5]; $year += 1900; -LogDbg('cluster', "DXSpider V$version, build $build started"); +LogDbg('cluster', "DXSpider V$version, build $subversion.$build started"); dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH"); # load Prefixes diff --git a/perl/issue.pl b/perl/issue.pl index 6d2bfd34..67417127 100755 --- a/perl/issue.pl +++ b/perl/issue.pl @@ -19,7 +19,8 @@ use strict; use vars qw($root); my $fn = "$root/perl/Version.pm"; my $desc = `git-describe`; -my ($v, $b) = $desc =~ /^([\d.]+)-(\d+)-/; +my ($v, $s, $b) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-/; +$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"; @@ -32,9 +33,10 @@ print F qq(# package main; -use vars qw(\$version \$build); +use vars qw(\$version \$subversion \$build); \$version = '$v'; +\$subversion = '$s'; \$build = '$b'; 1;