cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move summary.log generation into the subengine, because it's absurd

Browse Source 
to create it in dpb modes that don't build anything (such as -F and
HISTORY_ONLY). No functional change.
This commit is contained in:
espie 2022-02-17 12:42:37 +00:00
parent ec348d9c61
commit a20dd924fb
2 changed files with 74 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
infrastructure/lib/DPB/Engine.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Engine.pm,v 1.144 2021/11/15 14:48:17 espie Exp $
# $OpenBSD: Engine.pm,v 1.145 2022/02/17 12:42:37 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -686,66 +686,7 @@ sub end_dump
sub smart_dump
{
my ($self, $fh) = @_;
my $h = {};
for my $v (values %{$self->{tobuild}}) {
$v->{info}{problem} = 'not built';
$v->{info}{missing} = $v->{info}{DEPENDS};
$h->{$v} = $v;
}
for my $v (values %{$self->{built}}) {
$v->{info}{problem} = 'not installable';
$v->{info}{missing} = $v->{info}{RDEPENDS};
$h->{$v} = $v;
}
for my $v (@{$self->{errors}}) {
$v->{info}{problem} = "errored";
$h->{$v} = $v;
}
for my $v (@{$self->{locks}}) {
$v->{info}{problem} = "locked";
$h->{$v} = $v;
}
my $cache = {};
for my $v (sort {$a->fullpkgpath cmp $b->fullpkgpath}
values %$h) {
if (defined $cache->{$v->{info}}) {
print $fh $v->fullpkgpath, " same as ",
$cache->{$v->{info}}, "\n";
next;
}
print $fh $v->fullpkgpath, " ", $v->{info}{problem};
if (defined $v->{info}{missing}) {
$self->follow_thru($v, $fh, $v->{info}{missing});
#print $fh " ", $v->{info}{missing}->string;
}
print $fh "\n";
$cache->{$v->{info}} = $v->fullpkgpath;
}
print $fh '-'x70, "\n";
}
sub follow_thru
{
my ($self, $v, $fh, $list) = @_;
my @d = ();
my $known = {$v => $v};
while (1) {
my $w = (values %$list)[0];
push(@d, $w);
if (defined $known->{$w}) {
last;
}
$known->{$w} = $w;
if (defined $w->{info}{missing}) {
$list = $w->{info}{missing};
} else {
last;
}
}
print $fh " ", join(' -> ', map {$_->logname} @d);
$self->{buildable}->smart_dump($fh);
}
sub dump

73
infrastructure/lib/DPB/SubEngine.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: SubEngine.pm,v 1.34 2020/04/07 15:18:33 espie Exp $
# $OpenBSD: SubEngine.pm,v 1.35 2022/02/17 12:42:37 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -320,6 +320,72 @@ sub preempt_core
return 0;
}
sub smart_dump
{
my ($self, $fh) = @_;
my $h = {};
my $engine = $self->{engine};
for my $v (values %{$engine->{tobuild}}) {
$v->{info}{problem} = 'not built';
$v->{info}{missing} = $v->{info}{DEPENDS};
$h->{$v} = $v;
}
for my $v (values %{$engine->{built}}) {
$v->{info}{problem} = 'not installable';
$v->{info}{missing} = $v->{info}{RDEPENDS};
$h->{$v} = $v;
}
for my $v (@{$engine->{errors}}) {
$v->{info}{problem} = "errored";
$h->{$v} = $v;
}
for my $v (@{$engine->{locks}}) {
$v->{info}{problem} = "locked";
$h->{$v} = $v;
}
my $cache = {};
for my $v (sort {$a->fullpkgpath cmp $b->fullpkgpath}
values %$h) {
if (defined $cache->{$v->{info}}) {
print $fh $v->fullpkgpath, " same as ",
$cache->{$v->{info}}, "\n";
next;
}
print $fh $v->fullpkgpath, " ", $v->{info}{problem};
if (defined $v->{info}{missing}) {
$self->follow_thru($v, $fh, $v->{info}{missing});
#print $fh " ", $v->{info}{missing}->string;
}
print $fh "\n";
$cache->{$v->{info}} = $v->fullpkgpath;
}
print $fh '-'x70, "\n";
}
sub follow_thru
{
my ($self, $v, $fh, $list) = @_;
my @d = ();
my $known = {$v => $v};
while (1) {
my $w = (values %$list)[0];
push(@d, $w);
if (defined $known->{$w}) {
last;
}
$known->{$w} = $w;
if (defined $w->{info}{missing}) {
$list = $w->{info}{missing};
} else {
last;
}
}
print $fh " ", join(' -> ', map {$_->logname} @d);
}
# for parts of dpb that won't run
package DPB::SubEngine::Dummy;
our @ISA = qw(DPB::SubEngine::BuildBase);
@ -347,4 +413,9 @@ sub is_dummy
{
return 1;
}
sub smart_dump
{
# don't bother
}
1;