[svn-commits] branch russell/make_menuconfig - r7535 /team/russell/make_menuconfig/build_to...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Tue Dec 20 00:47:10 CST 2005


Author: russell
Date: Tue Dec 20 00:47:09 2005
New Revision: 7535

URL: http://svn.digium.com/view/asterisk?rev=7535&view=rev
Log:
add support for a category description

Modified:
    team/russell/make_menuconfig/build_tools/makeopts.xml
    team/russell/make_menuconfig/build_tools/menuconfig.c

Modified: team/russell/make_menuconfig/build_tools/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_tools/makeopts.xml?rev=7535&r1=7534&r2=7535&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_tools/makeopts.xml (original)
+++ team/russell/make_menuconfig/build_tools/makeopts.xml Tue Dec 20 00:47:09 2005
@@ -3,37 +3,30 @@
 <category>
 	<name>APPS</name>
 	<displayname>Applications</displayname>
+	<description>Diaplan Applications</description>
 	<member>
 		<name>app_adsiprog.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_alarmreceiver.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_authenticate.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_cdr.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_chanisavail.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_chanspy.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_controlplayback.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_db.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_dial.so</name>
@@ -42,135 +35,102 @@
 	</member>
 	<member>
 		<name>app_dictate.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_directed_pickup.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_directory.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_disa.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_dumpchan.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_echo.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_exec.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_externalivr.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_festival.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_forkcdr.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_getcpeid.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_hasnewvoicemail.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_ices.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_image.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_lookupblacklist.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_lookupcidname.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_macro.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_milliwatt.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_mixmonitor.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_mp3.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_nbscat.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_parkandannounce.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_playback.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_privacy.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_queue.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_random.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_read.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_readfile.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_realtime.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_record.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_sayunixtime.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_senddtmf.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_sendtext.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_setcallerid.so</name>
@@ -178,67 +138,51 @@
 	</member>
 	<member>
 		<name>app_setcdruserfield.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_settransfercapability.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_softhangup.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_stack.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_system.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_talkdetect.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_test.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_transfer.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_userevent.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_url.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_verbose.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_voicemail.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_waitforring.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_waitforsilence.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_while.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>app_zapateller.so</name>
-		<description></description>
 	</member>
 </category>
 
@@ -247,15 +191,12 @@
 	<displayname>CDR Storage</displayname>
 	<member>
 		<name>cdr_csv.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>cdr_manager.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>cdr_custom.so</name>
-		<description></description>
 	</member>
 </category>
 
@@ -297,55 +238,42 @@
 	<displayname>Formats</displayname>
 	<member>
 		<name>format_gsm.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_wav.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_jpeg.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_wav_gsm.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_vox.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_pcm.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_g729.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_pcm_alaw.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_h263.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_g726.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_ilbc.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_sln.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>format_au.so</name>
-		<description></description>
 	</member>
 </category>
 
@@ -354,27 +282,21 @@
 	<displayname>PBX Modules</displayname>
 	<member>
 		<name>pbx_config.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>pbx_spool.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>pbx_dundi.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>pbx_loopback.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>pbx_realtime.so</name>
-		<description></description>
 	</member>
 	<member>
 		<name>pbx_ael.so</name>
-		<description></description>
 	</member>
 </category>
 

Modified: team/russell/make_menuconfig/build_tools/menuconfig.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_tools/menuconfig.c?rev=7535&r1=7534&r2=7535&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_tools/menuconfig.c (original)
+++ team/russell/make_menuconfig/build_tools/menuconfig.c Tue Dec 20 00:47:09 2005
@@ -75,6 +75,7 @@
 static struct category {
 	const char *name;
 	const char *displayname;
+	const char *desc;
 	struct member *members;
 	struct category *next;
 } *categories = NULL;
@@ -116,7 +117,7 @@
 	return str;
 }
 
-struct category *add_category(const char *category, const char *displayname)
+struct category *add_category(const char *category, const char *displayname, const char *desc)
 {
 	struct category *cat;
 	struct category *cat_prev = NULL;
@@ -141,6 +142,7 @@
 		cat_prev->next = cat;
 	cat->name = category;
 	cat->displayname = displayname;
+	cat->desc = desc;
 
 	return cat;
 }
@@ -187,6 +189,7 @@
 	const char *mem_desc;
 	const char *cat_name;
 	const char *cat_displayname;
+	const char *cat_desc;
 	mxml_node_t *cur;
 	mxml_node_t *cur2;
 	mxml_node_t *cur3;
@@ -237,7 +240,14 @@
 			cat_displayname = NULL;
 		}
 
-		cat = add_category(cat_name, cat_displayname);
+		cur2 = mxmlFindElement(cur, cur, "description", NULL, NULL, MXML_DESCEND);
+		if (cur2 && cur2->child) {
+			cat_desc = cur2->child->value.opaque;
+		} else {
+			cat_desc = NULL;
+		}
+
+		cat = add_category(cat_name, cat_displayname, cat_desc);
 		if (!cat)
 			continue;
 
@@ -411,9 +421,12 @@
 
 	for (cat = categories; cat; cat = cat->next) {
 		fprintf(stderr, "Category: '%s'\n", cat->name);
+		if (!strlen_zero(cat->desc))
+			fprintf(stderr, " --> Description: '%s'\n", cat->desc);
 		for (mem = cat->members; mem; mem = mem->next) {
-			fprintf(stderr, " --> Member: '%s'  (%s)\n", mem->name, mem->enabled ? "Enabled" : "Disabled");
-			fprintf(stderr, "     --> Description: '%s'\n", mem->desc ? mem->desc : "<empty>");
+			fprintf(stderr, "   ==>> Member: '%s'  (%s)\n", mem->name, mem->enabled ? "Enabled" : "Disabled");
+			if (!strlen_zero(mem->desc))
+				fprintf(stderr, "      --> Description: '%s'\n", mem->desc);
 		}
 	}
 }



More information about the svn-commits mailing list