mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 00:14:05 +02:00
fix menu/submenu nesting
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4200 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
65aeed311c
commit
aa4721eb38
@ -15,6 +15,17 @@ my %category;
|
|||||||
my $cur_menu;
|
my $cur_menu;
|
||||||
my $cur_menu_dep;
|
my $cur_menu_dep;
|
||||||
|
|
||||||
|
sub close_submenu {
|
||||||
|
if ($cur_menu) {
|
||||||
|
print "endmenu\n";
|
||||||
|
$cur_menu_dep and do {
|
||||||
|
print "endif\n";
|
||||||
|
$cur_menu_dep = undef;
|
||||||
|
};
|
||||||
|
undef $cur_menu;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sub print_category($) {
|
sub print_category($) {
|
||||||
my $cat = shift;
|
my $cat = shift;
|
||||||
|
|
||||||
@ -25,14 +36,7 @@ sub print_category($) {
|
|||||||
foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
|
foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
|
||||||
foreach my $pkg (@{$spkg{$spkg}}) {
|
foreach my $pkg (@{$spkg{$spkg}}) {
|
||||||
if ($cur_menu ne $pkg->{submenu}) {
|
if ($cur_menu ne $pkg->{submenu}) {
|
||||||
if ($cur_menu) {
|
close_submenu();
|
||||||
print "endmenu\n";
|
|
||||||
$cur_menu_dep and do {
|
|
||||||
print "endif\n";
|
|
||||||
$cur_menu_dep = undef;
|
|
||||||
};
|
|
||||||
undef $cur_menu;
|
|
||||||
}
|
|
||||||
if ($pkg->{submenu}) {
|
if ($pkg->{submenu}) {
|
||||||
$cur_menu = $pkg->{submenu};
|
$cur_menu = $pkg->{submenu};
|
||||||
$cur_menu_dep = $pkg->{submenudep} and print "if $cur_menu_dep\n";
|
$cur_menu_dep = $pkg->{submenudep} and print "if $cur_menu_dep\n";
|
||||||
@ -66,6 +70,7 @@ sub print_category($) {
|
|||||||
$pkg->{config} and print $pkg->{config}."\n";
|
$pkg->{config} and print $pkg->{config}."\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
close_submenu();
|
||||||
print "endmenu\n\n";
|
print "endmenu\n\n";
|
||||||
|
|
||||||
undef $category{$cat};
|
undef $category{$cat};
|
||||||
|
Loading…
Reference in New Issue
Block a user