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

kill more code related to P= (will simplify next parts)

Browse Source
This commit is contained in:
espie 2010-10-27 22:53:32 +00:00
parent 6d0142a635
commit 309af926e4
2 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infrastructure/bin/dpb
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: dpb,v 1.4 2010/10/26 15:45:09 espie Exp $
# $OpenBSD: dpb,v 1.5 2010/10/27 22:53:32 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -241,7 +241,6 @@ if (!$opt_e) {
}
# and let's wait for all jobs now.
$engine->finished_scanning;
#$engine->dump($dump);
$engine->check_buildable;
#$engine->dump($dump);

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

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Engine.pm,v 1.7 2010/10/27 12:58:26 espie Exp $
# $OpenBSD: Engine.pm,v 1.8 2010/10/27 22:53:33 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -124,46 +124,6 @@ sub stats
}
}
sub finished_scanning
{
my $self = shift;
# this is scary, we need to do it by-pkgname
my $needed_by = {};
my $bneeded_by = {};
for my $v (values %{$self->{all}}) {
# also, this is an approximation, we could be more specific wrt
# BUILD/RUN_DEPENDS, this leads to more code in check_buildable...
for my $kind (qw(RUN_DEPENDS LIB_DEPENDS)) {
next unless defined $v->{info}{$kind};
for my $depend (values %{$v->{info}{$kind}}) {
next if $depend eq $v;
my $pkgname = $depend->fullpkgname;
next if !defined $pkgname;
$needed_by->{$pkgname}{$v} = $v;
}
}
if (defined $v->{info}{BUILD_DEPENDS}) {
for my $depend (values %{$v->{info}{BUILD_DEPENDS}}) {
next if $depend eq $v;
my $pkgname = $depend->fullpkgname;
next if !defined $pkgname;
$bneeded_by->{$pkgname}{$v} = $v;
}
}
}
# then we link each pkgpath to its array
for my $v (values %{$self->{all}}) {
if (defined $needed_by->{$v->fullpkgname}) {
$v->{info}{NEEDED_BY} = $needed_by->{$v->fullpkgname};
bless $v->{info}{NEEDED_BY}, "AddDepends";
}
if (defined $bneeded_by->{$v->fullpkgname}) {
$v->{info}{BNEEDED_BY} = $bneeded_by->{$v->fullpkgname};
bless $v->{info}{BNEEDED_BY}, "AddDepends";
}
}
}
sub important
{
my $self = shift;
@ -358,8 +318,7 @@ sub rebuild_info
}
my @subdirs = map {$_->fullpkgpath} @l;
$self->{grabber}->grab_subdirs($core, \@subdirs);
# XXX todo something needs to happen after the rescan,
# along the lines of finished_scanning
# XXX todo something needs to happen after the rescan ?
}
sub start_new_job