fix submenu sorting

[openwrt.git] / scripts / gen_menuconfig.pl

diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index fe0dc27..9c705af 100755 (executable)
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -13,26 +13,15 @@ my $makefile;
 my $pkg;
 my %package;
 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 find_dep($$) {
        my $pkg = shift;
        my $name = shift;
-       
-       return 0 unless defined $pkg->{depends};
-       foreach my $dep (@{$pkg->{depends}}) {
+       my $deps = ($pkg->{vdepends} or $pkg->{depends});
+
+       return 0 unless defined $deps;
+       foreach my $dep (@{$deps}) {
                return 1 if $dep eq $name;
                return 1 if ($package{$dep} and (find_dep($package{$dep},$name) == 1));
        }
@@ -43,13 +32,14 @@ sub depends($$) {
        my $a = shift;
        my $b = shift;
        my $ret;
-       
+
+       return 0 if ($a->{submenu} ne $b->{submenu});
        if (find_dep($a, $b->{name}) == 1) {
                $ret = 1;
        } elsif (find_dep($b, $a->{name}) == 1) {
                $ret = -1;
        } else {
-               $ret = 0;
+               return 0;
        }
 #      print STDERR "depends($a->{name}, $b->{name}) == $ret\n";
        return $ret;
@@ -58,25 +48,42 @@ sub depends($$) {
 
 sub print_category($) {
        my $cat = shift;
+       my %menus;
+       my %menu_dep;
        
        return unless $category{$cat};
        
        print "menu \"$cat\"\n\n";
        my %spkg = %{$category{$cat}};
+       
        foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
+               foreach my $pkg (@{$spkg{$spkg}}) {
+                       my $menu = $pkg->{submenu};
+                       if ($menu) {
+                               $menu_dep{$menu} or $menu_dep{$menu} = $pkg->{submenudep};
+                       } else {
+                               $menu = 'undef';
+                       }
+                       $menus{$menu} or $menus{$menu} = [];
+                       push @{$menus{$menu}}, $pkg;
+               }
+       }
+       my @menus = sort {
+               ($a eq 'undef' ?  1 : 0) or
+               ($b eq 'undef' ? -1 : 0) or
+               ($a cmp $b)
+       } keys %menus;
+
+       foreach my $menu (@menus) {
                my @pkgs = sort {
                        depends($a, $b) or
-                       $a->{submenu}."->".$a->{name} cmp $b->{submenu}."->".$b->{name}
-               } @{$spkg{$spkg}};
+                       ($a->{name} cmp $b->{name})
+               } @{$menus{$menu}};
+               if ($menu ne 'undef') {
+                       $menu_dep{$menu} and print "if $menu_dep{$menu}\n";
+                       print "menu \"$menu\"\n";
+               }
                foreach my $pkg (@pkgs) {
-                       if ($cur_menu ne $pkg->{submenu}) {
-                               close_submenu();
-                               if ($pkg->{submenu}) {
-                                       $cur_menu = $pkg->{submenu};
-                                       $cur_menu_dep = $pkg->{submenudep} and print "if $cur_menu_dep\n";
-                                       print "menu \"$cur_menu\"\n";
-                               }
-                       }
                        my $title = $pkg->{name};
                        my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
                        if ($c > 0) {
@@ -93,8 +100,14 @@ sub print_category($) {
                                my $m = "depends";
                                $depend =~ s/^([@\+]+)//;
                                my $flags = $1;
-                               $flags =~ /@/ or $depend = "PACKAGE_$depend";
-                               $flags =~ /\+/ and $m = "select";
+                               my $vdep;
+                               
+                               if ($vdep = $package{$depend}->{vdepends}) {
+                                       $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
+                               } else {
+                                       $flags =~ /@/ or $depend = "PACKAGE_$depend";
+                                       $flags =~ /\+/ and $m = "select";
+                               }
                                print "\t\t$m $depend\n";
                        }
                        print "\t\thelp\n";
@@ -103,8 +116,11 @@ sub print_category($) {
 
                        $pkg->{config} and print $pkg->{config}."\n";
                }
+               if ($menu ne 'undef') {
+                       print "endmenu\n";
+                       $menu_dep{$menu} and print "endif\n";
+               }
        }
-       close_submenu();
        print "endmenu\n\n";
        
        undef $category{$cat};
@@ -132,6 +148,13 @@ while ($line = <>) {
        $line =~ /^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1;
        $line =~ /^Submenu-Depends: \s*(.+)\s*$/ and $pkg->{submenudep} = $1;
        $line =~ /^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
+       $line =~ /^Provides: \s*(.+)\s*$/ and do {
+               my @vpkg = split /\s+/, $1;
+               foreach my $vpkg (@vpkg) {
+                       $package{$vpkg} or $package{$vpkg} = { vdepends => [] };
+                       push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
+               }
+       };
        $line =~ /^Depends: \s*(.+)\s*$/ and do {
                my @dep = split /\s+/, $1;
                $pkg->{depends} = \@dep;