1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:17:32 +02:00

menuconfig: include dependency checking in submenu sorting function

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5193 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-10-17 17:45:14 +00:00
parent 346b56b086
commit 2c5be9bc38

View File

@ -11,6 +11,7 @@ use strict;
my $src; my $src;
my $makefile; my $makefile;
my $pkg; my $pkg;
my %package;
my %category; my %category;
my $cur_menu; my $cur_menu;
my $cur_menu_dep; my $cur_menu_dep;
@ -26,6 +27,35 @@ sub close_submenu {
} }
} }
sub find_dep($$) {
my $pkg = shift;
my $name = shift;
return 0 unless defined $pkg->{depends};
foreach my $dep (@{$pkg->{depends}}) {
return 1 if $dep eq $name;
return 1 if ($package{$dep} and (find_dep($package{$dep},$name) == 1));
}
return 0;
}
sub depends($$) {
my $a = shift;
my $b = shift;
my $ret;
if (find_dep($a, $b->{name}) == 1) {
$ret = 1;
} elsif (find_dep($b, $a->{name}) == 1) {
$ret = -1;
} else {
$ret = 0;
}
# print STDERR "depends($a->{name}, $b->{name}) == $ret\n";
return $ret;
}
sub print_category($) { sub print_category($) {
my $cat = shift; my $cat = shift;
@ -35,6 +65,7 @@ sub print_category($) {
my %spkg = %{$category{$cat}}; my %spkg = %{$category{$cat}};
foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) { foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
my @pkgs = sort { my @pkgs = sort {
depends($a, $b) or
$a->{submenu}."->".$a->{name} cmp $b->{submenu}."->".$b->{name} $a->{submenu}."->".$a->{name} cmp $b->{submenu}."->".$b->{name}
} @{$spkg{$spkg}}; } @{$spkg{$spkg}};
foreach my $pkg (@pkgs) { foreach my $pkg (@pkgs) {
@ -93,6 +124,7 @@ while ($line = <>) {
$pkg->{makefile} = $makefile; $pkg->{makefile} = $makefile;
$pkg->{name} = $1; $pkg->{name} = $1;
$pkg->{default} = "m if ALL"; $pkg->{default} = "m if ALL";
$package{$1} = $pkg;
}; };
$line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1; $line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
$line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1; $line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;