diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-07-21 22:48:58 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-07-21 22:48:58 +0000 |
commit | aa4721eb38c4f6781766ff1fda43a33148a21089 (patch) | |
tree | a66febee633e165f2e87b9845a6f2a736bcd4b90 | |
parent | 65aeed311cbddeb66427150582239ff1623246d9 (diff) |
fix menu/submenu nesting
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4200 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-x | scripts/gen_menuconfig.pl | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl index ddce86bfa..fe0131092 100755 --- a/scripts/gen_menuconfig.pl +++ b/scripts/gen_menuconfig.pl @@ -15,6 +15,17 @@ my %category; my $cur_menu; 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($) { my $cat = shift; @@ -25,14 +36,7 @@ sub print_category($) { foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) { foreach my $pkg (@{$spkg{$spkg}}) { if ($cur_menu ne $pkg->{submenu}) { - if ($cur_menu) { - print "endmenu\n"; - $cur_menu_dep and do { - print "endif\n"; - $cur_menu_dep = undef; - }; - undef $cur_menu; - } + close_submenu(); if ($pkg->{submenu}) { $cur_menu = $pkg->{submenu}; $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"; } } + close_submenu(); print "endmenu\n\n"; undef $category{$cat}; |