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

diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index c40e1caed..e62363e63 100755
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -1,10 +1,18 @@
 #!/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;
 
 sub print_category($) {
 	my $cat = shift;
@@ -15,6 +23,16 @@ sub print_category($) {
 	my %spkg = %{$category{$cat}};
 	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";
+					undef $cur_menu;
+				} 
+				if ($pkg->{submenu}) {
+					$cur_menu = $pkg->{submenu};
+					print "menu \"$cur_menu\"\n";
+				}
+			}
 			my $title = $pkg->{name};
 			my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
 			if ($c > 0) {
@@ -29,7 +47,7 @@ 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";
@@ -65,6 +83,7 @@ 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 =~ /^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
 	$line =~ /^Depends: \s*(.+)\s*$/ and do {
 		my @dep = split /\s+/, $1;