fix submenu sorting

[openwrt.git] / scripts / gen_menuconfig.pl

diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index fe01310..9c705af 100755 (executable)
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -11,38 +11,79 @@ use strict;
 my $src;
 my $makefile;
 my $pkg;
 my $src;
 my $makefile;
 my $pkg;

+my %package;

 my %category;
 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;
+       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));
+       }
+       return 0;

 }
 
 }
 

+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 {
+               return 0;
+       }
+#      print STDERR "depends($a->{name}, $b->{name}) == $ret\n";
+       return $ret;
+}
+
+

 sub print_category($) {
        my $cat = shift;
 sub print_category($) {
        my $cat = shift;

+       my %menus;
+       my %menu_dep;

        
        return unless $category{$cat};
        
        print "menu \"$cat\"\n\n";
        my %spkg = %{$category{$cat}};
        
        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}}) {
        foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
                foreach my $pkg (@{$spkg{$spkg}}) {

-                       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 $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->{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) {

                        my $title = $pkg->{name};
                        my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
                        if ($c > 0) {
                        my $title = $pkg->{name};
                        my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
                        if ($c > 0) {


@@ -59,8 +100,14 @@ sub print_category($) {
                                my $m = "depends";
                                $depend =~ s/^([@\+]+)//;
                                my $flags = $1;
                                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";
                                print "\t\t$m $depend\n";
                        }
                        print "\t\thelp\n";


@@ -69,8 +116,11 @@ sub print_category($) {
 
                        $pkg->{config} and print $pkg->{config}."\n";
                }
 
                        $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};
        print "endmenu\n\n";
        
        undef $category{$cat};


@@ -90,6 +140,7 @@ while ($line = <>) {
                $pkg->{makefile} = $makefile;
                $pkg->{name} = $1;
                $pkg->{default} = "m if ALL";
                $pkg->{makefile} = $makefile;
                $pkg->{name} = $1;
                $pkg->{default} = "m if ALL";

+               $package{$1} = $pkg;

        };
        $line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
        $line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;
        };
        $line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
        $line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;


@@ -97,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 =~ /^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;
        $line =~ /^Depends: \s*(.+)\s*$/ and do {
                my @dep = split /\s+/, $1;
                $pkg->{depends} = \@dep;