From 2fb0892917fa75590e20c32599de11880fe92c23 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 21 Apr 2006 00:50:48 +0000 Subject: [PATCH] include package description in menuconfig help git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3687 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/rules.mk | 8 ++++++-- scripts/gen_menuconfig.pl | 10 ++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/rules.mk b/package/rules.mk index 5316debca..230b9669b 100644 --- a/package/rules.mk +++ b/package/rules.mk @@ -117,9 +117,13 @@ DUMPINFO += \ echo "Depends: $$(IDEPEND_$(1))"; \ echo "Category: $(CATEGORY)"; \ echo "Title: $(TITLE)"; \ - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; +ifneq ($(URL),) +DUMPINFO += \ echo; \ - echo "$(URL)"; \ + echo "$(URL)"; +endif +DUMPINFO += \ echo "@@"; diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl index 70e31a45f..3f4476a2c 100755 --- a/scripts/gen_menuconfig.pl +++ b/scripts/gen_menuconfig.pl @@ -28,6 +28,8 @@ sub print_category($) { foreach my $depend (@{$pkg->{depends}}) { print "\t\tdepends PACKAGE_$depend\n"; } + print "\t\thelp\n"; + print $pkg->{description}; print "\n" } } @@ -66,11 +68,11 @@ while ($line = <>) { push @{$category{$1}->{$src}}, $pkg; }; $line =~ /^Description: \s*(.*)\s*$/ and do { - my $desc = $1; + my $desc = "\t\t$1\n\n"; my $line; - while (<>) { - last if /^@@/; - $desc .= $1; + while ($line = <>) { + last if $line =~ /^@@/; + $desc .= "\t\t$line"; } $pkg->{description} = $desc; }