summaryrefslogtreecommitdiff
path: root/new-infra/TLSRC.pm
diff options
context:
space:
mode:
Diffstat (limited to 'new-infra/TLSRC.pm')
-rw-r--r--new-infra/TLSRC.pm44
1 files changed, 22 insertions, 22 deletions
diff --git a/new-infra/TLSRC.pm b/new-infra/TLSRC.pm
index 2cc88a478da..f496f384e37 100644
--- a/new-infra/TLSRC.pm
+++ b/new-infra/TLSRC.pm
@@ -19,12 +19,12 @@ sub new {
shortdesc => $params{'shortdesc'},
longdesc => $params{'longdesc'},
catalogue => $params{'catalogue'},
- runpatterns => $params{'runpatterns'},
- srcpatterns => $params{'srcpatterns'},
- docpatterns => $params{'docpatterns'},
- binpatterns => $params{'binpatterns'},
- executes => $params{'executes'},
- depends => $params{'depends'},
+ runpatterns => defined($params{'runpatterns'}) ? $params{'runpatterns'} : [],
+ srcpatterns => defined($params{'srcpatterns'}) ? $params{'srcpatterns'} : [],
+ docpatterns => defined($params{'docpatterns'}) ? $params{'docpatterns'} : [],
+ binpatterns => defined($params{'binpatterns'}) ? $params{'binpatterns'} : [],
+ executes => defined($params{'executes'}) ? $params{'executes'} : [],
+ depends => defined($params{'depends'}) ? $params{'depends'} : [],
};
bless $self, $class;
return $self;
@@ -147,25 +147,25 @@ sub writeout {
}
if (defined($self->{'srcpatterns'}) && (@{$self->{'srcpatterns'}})) {
print $fd "srcpatterns\n";
- foreach (@{$self->{'srcpatterns'}}) {
+ foreach (sort @{$self->{'srcpatterns'}}) {
print $fd " $_\n";
}
}
if (defined($self->{'runpatterns'}) && (@{$self->{'runpatterns'}})) {
print $fd "runpatterns\n";
- foreach (@{$self->{'runpatterns'}}) {
+ foreach (sort @{$self->{'runpatterns'}}) {
print $fd " $_\n";
}
}
if (defined($self->{'docpatterns'}) && (@{$self->{'docpatterns'}})) {
print $fd "docpatterns\n";
- foreach (@{$self->{'docpatterns'}}) {
+ foreach (sort @{$self->{'docpatterns'}}) {
print $fd " $_\n";
}
}
if (defined($self->{'binpatterns'}) && (@{$self->{'binpatterns'}})) {
print $fd "binpatterns\n";
- foreach (@{$self->{'binpatterns'}}) {
+ foreach (sort @{$self->{'binpatterns'}}) {
print $fd " $_\n";
}
}
@@ -190,12 +190,12 @@ sub make_tlp {
push @{$self->{'srcpatterns'}}, "t texmf-dist source $tlp";
}
my $tlp = TLP->new;
- $tlp->name($tlsrc->name);
+ $tlp->name($self->name);
$tlp->shortdesc($self->{'shortdesc'}) if (defined($self->{'shortdesc'}));
- $tlp->longdesc($self->{'longdesc'}) if (defined($tls{$tlp}{'longdesc'}));
- $tlp->catalogue($self->{'catalogue'}) if (defined($tls{$tlp}{'catalogue'}));
- $tlp->executes($self->{'executes'}) if (defined($tls{$tlp}{'executes'}));
- $tlp->depends($self->{'depends'}) if (defined($tls{$tlp}{'depends'}));
+ $tlp->longdesc($self->{'longdesc'}) if (defined($self->{'longdesc'}));
+ $tlp->catalogue($self->{'catalogue'}) if (defined($self->{'catalogue'}));
+ $tlp->executes(@{$self->{'executes'}}) if (defined($self->{'executes'}));
+ $tlp->depends(@{$self->{'depends'}}) if (defined($self->{'depends'}));
$tlp->revision(0);
my $filemax;
foreach my $p (@{$self->{'runpatterns'}}) {
@@ -230,26 +230,29 @@ sub make_tlp {
$self->_do_regexp_pattern($tlp,$tltree,'binfiles',$p);
}
}
+ return $tlp;
}
sub _do_leaf_pattern {
my ($self,$tlp,$tltree,$type,@patwords) = @_;
- my @matchfiles = $tltree->get_files_matching_dir_pattern($type,$patwords);
+ my @matchfiles = $tltree->get_files_matching_dir_pattern($type,@patwords);
my $filemax;
foreach my $f (@matchfiles) {
$filemax = $tltree->file_svn_lastrevision($f);
- $tlp->revision($filemax > $tlp->revision ? : $filemax : $tlp->revision);
+ $tlp->revision(($filemax > $tlp->revision) ? $filemax : $tlp->revision);
}
+ $tlp->add_files($type,@matchfiles);
}
sub _do_regexp_pattern {
- my ($self,$tltree,$tlp,$filetype,$p) = @_;
+ my ($self,$tlp,$tltree,$type,$p) = @_;
my @matchfiles = $tltree->get_files_matching_regexp_pattern($type,$p);
my $filemax;
foreach my $f (@matchfiles) {
$filemax = $tltree->file_svn_lastrevision($f);
- $tlp->revision($filemax > $tlp->revision ? : $filemax : $tlp->revision);
+ $tlp->revision(($filemax > $tlp->revision) ? $filemax : $tlp->revision);
}
+ $tlp->add_files($type,@matchfiles);
}
sub pattern_hit {
@@ -258,16 +261,13 @@ sub pattern_hit {
$pattern =~ /^(d|f|t)\s+(.*)$/;
my $pattype = $1;
my $patdata = $2;
- logit("pattype=...$pattype...patdata=...$patdata...\n");
if ($pattype eq "d") {
pop @dirs ;
my $foo = join "/",@dirs;
- logit("matching [d] >>>$patdata<<< against >>>$foo<<<\n");
if ($foo =~ /^$patdata$/) {
return 1;
}
} elsif ($pattype eq "f") {
- logit("matching [f] >>>$patdata<<< against >>>$file<<<\n");
if ($file =~ /^$patdata$/) {
return 1;
}