X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e240cc0ea62aa7404ccf6187cc95cf6370212bef..c08f41eff171197ea217328db24982dd34466dc0:/scripts/gen_menuconfig.pl

diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index a7f939ff5..c0279d545 100755
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -1,10 +1,30 @@
 #!/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 %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;
@@ -14,7 +34,18 @@ sub print_category($) {
 	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 @pkgs = sort {
+			$a->{submenu}."->".$a->{name} cmp $b->{submenu}."->".$b->{name}
+		} @{$spkg{$spkg}};
+		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) {
@@ -24,10 +55,12 @@ sub print_category($) {
 			$pkg->{menu} and print "menu";
 			print "config PACKAGE_".$pkg->{name}."\n";
 			print "\t\ttristate \"$title\"\n";
-			print "\t\tdefault ".$pkg->{default}."\n";
+			foreach my $default (split /\s*,\s*/, $pkg->{default}) {
+				print "\t\tdefault $default\n";
+			}
 			foreach my $depend (@{$pkg->{depends}}) {
 				my $m = "depends";
-				$depend =~ s/^([@\+])//;
+				$depend =~ s/^([@\+]+)//;
 				my $flags = $1;
 				$flags =~ /@/ or $depend = "PACKAGE_$depend";
 				$flags =~ /\+/ and $m = "select";
@@ -40,6 +73,7 @@ sub print_category($) {
 			$pkg->{config} and print $pkg->{config}."\n";
 		}
 	}
+	close_submenu();
 	print "endmenu\n\n";
 	
 	undef $category{$cat};
@@ -63,6 +97,8 @@ while ($line = <>) {
 	$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 =~ /^Depends: \s*(.+)\s*$/ and do {
 		my @dep = split /\s+/, $1;