&pipethrough_run_along &pipethrough_run_finish
&pipethrough_run_gzip
&cgipostform &yarrgpostform &cgi_get_caller
- &set_ctype_utf8);
+ &set_ctype_utf8 $masterinfoversion);
%EXPORT_TAGS = ( );
@EXPORT_OK = qw();
}
+our $masterinfoversion= 2; # version we understand
+
our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources;
our %clients; # eg $clients{'ypp-sc-tools'}= [ qw(last-page) ];
our %routes; # eg $routes{'Midnight'}{'Orca'}{'Tinga'}= $sources NB abbrevs!
our (%pctb_commodmap,@pctb_commodmap);
my %colours; # eg $colours{'c'}{'black'}= $sources
-my @rawcm; # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
+my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
# IMPORTANT
# when extending the format of source-info in a non-backward
@ctx= (sub { $colours{$colourkind}{lc $_} .= $src; });
} elsif (m/^commods$/) {
@ctx= (sub { push @rawcm, lc $_; });
+ } elsif (m/^nocommods$/) {
+ @ctx= (sub { push @nocm, lc $_; });
} elsif (m/^ocean (\w+)$/) {
my $ocean= $1;
+ keys %{ $oceans{$ocean} };
@ctx= (sub {
$ocean or die; # ref to $ocean needed to work
# around a perl bug
my $arch= $_;
+ keys %{ $oceans{$ocean}{$arch} };
$ctx[1]= sub {
$oceans{$ocean}{$arch}{$_} .= $src;
};
my ($name, $props) = $s =~
/^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/
or die "bad commodspec $s";
+ return if grep { $name eq $_ } @nocm;
my $ucname= ucfirst $name;
$commods{$ucname}{Srcs} .= $ss;
my $c= $commods{$ucname};
sub parse_info_clientside () {
my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
return unless $yarrg;
- my $master= fetch_with_rsync('info');
+ my $master= fetch_with_rsync("info-v$masterinfoversion");
parse_info1($master,'s');
my $local= '_local-info.txt';
if (stat $local) {
sub parse_info_serverside_ocean ($) {
my ($oceanname) = @_;
die "unknown ocean $oceanname ?" unless exists $oceans{$oceanname};
- parse_info1("ocean-".(lc $oceanname).".txt",'s');
+ parse_info1("_ocean-".(lc $oceanname).".txt",'s');
}
sub parse_pctb_commodmap () {
sub get_our_version ($$) {
my ($aref,$prefix) = @_;
$aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
- $aref->{"${prefix}fixes"}= 'lastpage';
-
- my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;
+ $aref->{"${prefix}fixes"}= 'lastpage checkpager';
+
+ my $version= `
+ if type -p git-describe >/dev/null 2>&1; then
+ gd=git-describe
+ else
+ gd="git describe"
+ fi
+ \$gd --tags HEAD || echo 0unknown
+ `; $? and die $?;
chomp($version);
$aref->{"${prefix}version"}= $version;
return $aref;