X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5bc57a98e306e8b404dda68c6ae6982a5d36937c..56574ceb396a26315114e5ddb37cbc41f79b3030:/scripts/gen_menuconfig.pl

diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index c40e1caed..9c705af56 100755
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -1,20 +1,89 @@
 #!/usr/bin/perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 use strict;
 
 my $src;
 my $makefile;
 my $pkg;
+my %package;
 my %category;
 
+
+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;
+	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->{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) {
@@ -29,10 +98,16 @@ sub print_category($) {
 			}
 			foreach my $depend (@{$pkg->{depends}}) {
 				my $m = "depends";
-				$depend =~ s/^([@\+])//;
+				$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";
@@ -41,6 +116,10 @@ sub print_category($) {
 
 			$pkg->{config} and print $pkg->{config}."\n";
 		}
+		if ($menu ne 'undef') {
+			print "endmenu\n";
+			$menu_dep{$menu} and print "endif\n";
+		}
 	}
 	print "endmenu\n\n";
 	
@@ -61,11 +140,21 @@ while ($line = <>) {
 		$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 =~ /^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $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;