[asterisk-commits] branch russell/make_menuconfig - r7597 in
/team/russell/make_menuconfig: ./ a...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Dec 22 13:36:20 CST 2005
Author: russell
Date: Thu Dec 22 13:36:14 2005
New Revision: 7597
URL: http://svn.digium.com/view/asterisk?rev=7597&view=rev
Log:
split makeopts index into files for each sub directory
Added:
team/russell/make_menuconfig/apps/makeopts.xml
team/russell/make_menuconfig/cdr/makeopts.xml
team/russell/make_menuconfig/channels/makeopts.xml
team/russell/make_menuconfig/formats/makeopts.xml
team/russell/make_menuconfig/makeopts.xml
team/russell/make_menuconfig/pbx/makeopts.xml
team/russell/make_menuconfig/res/makeopts.xml
team/russell/make_menuconfig/utils/makeopts.xml
Removed:
team/russell/make_menuconfig/build_tools/makeopts.xml
Modified:
team/russell/make_menuconfig/build_tools/Makefile
team/russell/make_menuconfig/build_tools/menuconfig.c
team/russell/make_menuconfig/build_tools/menuconfig.h
Added: team/russell/make_menuconfig/apps/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/apps/makeopts.xml?rev=7597&view=auto
==============================================================================
--- team/russell/make_menuconfig/apps/makeopts.xml (added)
+++ team/russell/make_menuconfig/apps/makeopts.xml Thu Dec 22 13:36:14 2005
@@ -1,0 +1,220 @@
+<?xml version="1.0"?>
+
+<category>
+ <name>APPS</name>
+ <displayname>Applications</displayname>
+ <description>Diaplan Applications</description>
+ <member>
+ <name>app_adsiprog.so</name>
+ </member>
+ <member>
+ <name>app_alarmreceiver.so</name>
+ </member>
+ <member>
+ <name>app_authenticate.so</name>
+ </member>
+ <member>
+ <name>app_cdr.so</name>
+ </member>
+ <member>
+ <name>app_chanisavail.so</name>
+ </member>
+ <member>
+ <name>app_chanspy.so</name>
+ </member>
+ <member>
+ <name>app_controlplayback.so</name>
+ </member>
+ <member>
+ <name>app_db.so</name>
+ </member>
+ <member>
+ <name>app_dial.so</name>
+ <displayname>Dial(), RetryDial()</displayname>
+ <description>Dial() and RetryDial() Applications</description>
+ </member>
+ <member>
+ <name>app_dictate.so</name>
+ </member>
+ <member>
+ <name>app_directed_pickup.so</name>
+ </member>
+ <member>
+ <name>app_directory.so</name>
+ </member>
+ <member>
+ <name>app_disa.so</name>
+ </member>
+ <member>
+ <name>app_dumpchan.so</name>
+ </member>
+ <member>
+ <name>app_echo.so</name>
+ </member>
+ <member>
+ <name>app_exec.so</name>
+ </member>
+ <member>
+ <name>app_externalivr.so</name>
+ </member>
+ <member>
+ <name>app_festival.so</name>
+ </member>
+ <member>
+ <name>app_flash.so</name>
+ </member>
+ <member>
+ <name>app_forkcdr.so</name>
+ </member>
+ <member>
+ <name>app_getcpeid.so</name>
+ </member>
+ <member>
+ <name>app_hasnewvoicemail.so</name>
+ </member>
+ <member>
+ <name>app_ices.so</name>
+ </member>
+ <member>
+ <name>app_image.so</name>
+ </member>
+ <member>
+ <name>app_ivrdemo.so</name>
+ </member>
+ <member>
+ <name>app_lookupblacklist.so</name>
+ </member>
+ <member>
+ <name>app_lookupcidname.so</name>
+ </member>
+ <member>
+ <name>app_macro.so</name>
+ </member>
+ <member>
+ <name>app_meetme.so</name>
+ </member>
+ <member>
+ <name>app_milliwatt.so</name>
+ </member>
+ <member>
+ <name>app_mixmonitor.so</name>
+ </member>
+ <member>
+ <name>app_mp3.so</name>
+ </member>
+ <member>
+ <name>app_nbscat.so</name>
+ </member>
+ <member>
+ <name>app_page.so</name>
+ </member>
+ <member>
+ <name>app_parkandannounce.so</name>
+ </member>
+ <member>
+ <name>app_playback.so</name>
+ </member>
+ <member>
+ <name>app_privacy.so</name>
+ </member>
+ <member>
+ <name>app_queue.so</name>
+ </member>
+ <member>
+ <name>app_random.so</name>
+ </member>
+ <member>
+ <name>app_read.so</name>
+ </member>
+ <member>
+ <name>app_readfile.so</name>
+ </member>
+ <member>
+ <name>app_realtime.so</name>
+ </member>
+ <member>
+ <name>app_record.so</name>
+ </member>
+ <member>
+ <name>app_rpt.so</name>
+ </member>
+ <member>
+ <name>app_sayunixtime.so</name>
+ </member>
+ <member>
+ <name>app_senddtmf.so</name>
+ </member>
+ <member>
+ <name>app_sendtext.so</name>
+ </member>
+ <member>
+ <name>app_setcallerid.so</name>
+ <description>SetCallerID() and SetCallerPres() Applications</description>
+ </member>
+ <member>
+ <name>app_setcdruserfield.so</name>
+ </member>
+ <member>
+ <name>app_settransfercapability.so</name>
+ </member>
+ <member>
+ <name>app_skel.so</name>
+ </member>
+ <member>
+ <name>app_softhangup.so</name>
+ </member>
+ <member>
+ <name>app_sql_odbc.so</name>
+ </member>
+ <member>
+ <name>app_sql_postgres.so</name>
+ </member>
+ <member>
+ <name>app_stack.so</name>
+ </member>
+ <member>
+ <name>app_system.so</name>
+ </member>
+ <member>
+ <name>app_talkdetect.so</name>
+ </member>
+ <member>
+ <name>app_test.so</name>
+ </member>
+ <member>
+ <name>app_transfer.so</name>
+ </member>
+ <member>
+ <name>app_userevent.so</name>
+ </member>
+ <member>
+ <name>app_url.so</name>
+ </member>
+ <member>
+ <name>app_verbose.so</name>
+ </member>
+ <member>
+ <name>app_voicemail.so</name>
+ </member>
+ <member>
+ <name>app_waitforring.so</name>
+ </member>
+ <member>
+ <name>app_waitforsilence.so</name>
+ </member>
+ <member>
+ <name>app_while.so</name>
+ </member>
+ <member>
+ <name>app_zapateller.so</name>
+ </member>
+ <member>
+ <name>app_zapbarge.so</name>
+ </member>
+ <member>
+ <name>app_zapras.so</name>
+ </member>
+ <member>
+ <name>app_zapscan.so</name>
+ </member>
+</category>
Modified: team/russell/make_menuconfig/build_tools/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_tools/Makefile?rev=7597&r1=7596&r2=7597&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_tools/Makefile (original)
+++ team/russell/make_menuconfig/build_tools/Makefile Thu Dec 22 13:36:14 2005
@@ -1,7 +1,7 @@
_menuconfig: menuconfig.o
$(CC) -o menuconfig menuconfig.o ../mxml/libmxml.a -lcurses
-menuconfig.o: menuconfig.c
+menuconfig.o: menuconfig.c menuconfig.h
$(CC) -o menuconfig.o -c -I../ -I../include/ menuconfig.c
clean:
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=7597&r1=7596&r2=7597&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_tools/menuconfig.c (original)
+++ team/russell/make_menuconfig/build_tools/menuconfig.c Thu Dec 22 13:36:14 2005
@@ -90,10 +90,8 @@
struct tree *next;
} *trees = NULL;
-/*! The input build options file - TODO Make this optionally specified as a command line argument */
-static const char *build_options = BUILD_OPTIONS_DEFAULT;
/*! The output build configuration file - TODO Make this optionally specified as a command line argument */
-static const char *build_config = BUILD_CONFIG_DEFAULT;
+static const char *output_makeopts = OUTPUT_MAKEOPTS_DEFAULT;
/*! Maximum number of characters horizontally */
int max_x = 0;
@@ -179,7 +177,7 @@
return mem;
}
-int build_member_list(void)
+int parse_makeopts_xml(const char *makeopts_xml)
{
FILE *f;
struct category *cat;
@@ -194,9 +192,9 @@
mxml_node_t *cur2;
mxml_node_t *cur3;
- f = fopen(build_options, "r");
+ f = fopen(makeopts_xml, "r");
if (!f) {
- fprintf(stderr, "Unable to open '%s' for reading!\n", build_options);
+ fprintf(stderr, "Unable to open '%s' for reading!\n", makeopts_xml);
return -1;
}
@@ -232,7 +230,7 @@
{
cur2 = mxmlFindElement(cur, cur, "name", NULL, NULL, MXML_DESCEND);
if (!cur2) {
- fprintf(stderr, "category specified with no name in '%s'!\n", build_options);
+ fprintf(stderr, "category specified with no name in '%s'!\n", makeopts_xml);
continue;
}
if (!cur2->child) {
@@ -297,6 +295,19 @@
return 0;
}
+int build_member_list(void)
+{
+ int i = 0;
+ int res = -1;
+
+ for (; i < (sizeof(makeopts_files) / sizeof(makeopts_files[0])); i++) {
+ if ((res = parse_makeopts_xml(makeopts_files[i])))
+ break;
+ }
+
+ return res;
+}
+
void mark_as_enabled(const char *member, const char *category)
{
struct category *cat;
@@ -344,10 +355,10 @@
char *category, *parse, *member;
int lineno = 0;
- f = fopen(build_config, "r");
+ f = fopen(output_makeopts, "r");
if (!f) {
#ifdef MENUCONFIG_DEBUG
- fprintf(stderr, "Unable to open '%s' for reading exisiting config.\n", build_config);
+ fprintf(stderr, "Unable to open '%s' for reading exisiting config.\n", output_makeopts);
#endif
return;
}
@@ -366,7 +377,7 @@
/* Grab the category name */
category = strsep(&parse, "=");
if (!parse) {
- fprintf(stderr, "Invalid string in '%s' at line '%d'!\n", build_config, lineno);
+ fprintf(stderr, "Invalid string in '%s' at line '%d'!\n", output_makeopts, lineno);
continue;
}
@@ -383,16 +394,16 @@
close(f);
}
-int output_build_config(void)
+int generate_makeopts_file(void)
{
FILE *f;
struct category *cat;
struct member *mem;
int print_cat = 1;
- f = fopen(build_config, "w");
+ f = fopen(output_makeopts, "w");
if (!f) {
- fprintf(stderr, "Unable to open build configuration file (%s) for writing!\n", build_config);
+ fprintf(stderr, "Unable to open build configuration file (%s) for writing!\n", output_makeopts);
return -1;
}
@@ -707,7 +718,7 @@
/* Parse the input XML files to build the list of available options */
if (build_member_list()) {
- fprintf(stderr, "Unable to build the list of available build options from '%s'!\n", build_options);
+ fprintf(stderr, "Unable to build the list of available makeopts!\n");
exit(res);
}
@@ -725,7 +736,7 @@
/* If all is good, save the new config */
if (!res)
- res = output_build_config();
+ res = generate_makeopts_file();
/* free everything we allocated */
free_trees();
Modified: team/russell/make_menuconfig/build_tools/menuconfig.h
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_tools/menuconfig.h?rev=7597&r1=7596&r2=7597&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_tools/menuconfig.h (original)
+++ team/russell/make_menuconfig/build_tools/menuconfig.h Thu Dec 22 13:36:14 2005
@@ -24,5 +24,15 @@
*/
#define MENU_TITLE "The Asterisk Build Configurationator"
-#define BUILD_OPTIONS_DEFAULT "build_tools/makeopts.xml"
-#define BUILD_CONFIG_DEFAULT "asterisk.makeopts"
+#define OUTPUT_MAKEOPTS_DEFAULT "asterisk.makeopts"
+
+const char *makeopts_files[] = {
+ "makeopts.xml",
+ "apps/makeopts.xml",
+ "cdr/makeopts.xml",
+ "channels/makeopts.xml",
+ "formats/makeopts.xml",
+ "pbx/makeopts.xml",
+ "res/makeopts.xml",
+ "utils/makeopts.xml"
+};
Added: team/russell/make_menuconfig/cdr/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/cdr/makeopts.xml?rev=7597&view=auto
==============================================================================
--- team/russell/make_menuconfig/cdr/makeopts.xml (added)
+++ team/russell/make_menuconfig/cdr/makeopts.xml Thu Dec 22 13:36:14 2005
@@ -1,0 +1,15 @@
+<?xml version="1.0"?>
+
+<category>
+ <name>CDR_MODULES</name>
+ <displayname>CDR Storage</displayname>
+ <member>
+ <name>cdr_csv.so</name>
+ </member>
+ <member>
+ <name>cdr_manager.so</name>
+ </member>
+ <member>
+ <name>cdr_custom.so</name>
+ </member>
+</category>
Added: team/russell/make_menuconfig/channels/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/channels/makeopts.xml?rev=7597&view=auto
==============================================================================
--- team/russell/make_menuconfig/channels/makeopts.xml (added)
+++ team/russell/make_menuconfig/channels/makeopts.xml Thu Dec 22 13:36:14 2005
@@ -1,0 +1,34 @@
+<?xml version="1.0"?>
+
+<category>
+ <name>CHANNEL_LIBS</name>
+ <displayname>Channel Drivers</displayname>
+ <member>
+ <name>chan_sip.so</name>
+ <description>SIP Channel Driver</description>
+ </member>
+ <member>
+ <name>chan_agent.so</name>
+ <description>Agent Proxy Channel Driver</description>
+ </member>
+ <member>
+ <name>chan_mgcp.so</name>
+ <description>MGCP Channel Driver</description>
+ </member>
+ <member>
+ <name>chan_iax2.so</name>
+ <description>IAX2 Channel Driver</description>
+ </member>
+ <member>
+ <name>chan_local.so</name>
+ <description>Local Proxy Channel Driver</description>
+ </member>
+ <member>
+ <name>chan_skinny.so</name>
+ <description>skinny Channel Driver</description>
+ </member>
+ <member>
+ <name>chan_features.so</name>
+ <description>Features Proxy Channel (experimental)</description>
+ </member>
+</category>
Added: team/russell/make_menuconfig/formats/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/formats/makeopts.xml?rev=7597&view=auto
==============================================================================
--- team/russell/make_menuconfig/formats/makeopts.xml (added)
+++ team/russell/make_menuconfig/formats/makeopts.xml Thu Dec 22 13:36:14 2005
@@ -1,0 +1,45 @@
+<?xml version="1.0"?>
+
+<category>
+ <name>FORMAT_LIBS</name>
+ <displayname>Formats</displayname>
+ <member>
+ <name>format_gsm.so</name>
+ </member>
+ <member>
+ <name>format_wav.so</name>
+ </member>
+ <member>
+ <name>format_jpeg.so</name>
+ </member>
+ <member>
+ <name>format_wav_gsm.so</name>
+ </member>
+ <member>
+ <name>format_vox.so</name>
+ </member>
+ <member>
+ <name>format_pcm.so</name>
+ </member>
+ <member>
+ <name>format_g729.so</name>
+ </member>
+ <member>
+ <name>format_pcm_alaw.so</name>
+ </member>
+ <member>
+ <name>format_h263.so</name>
+ </member>
+ <member>
+ <name>format_g726.so</name>
+ </member>
+ <member>
+ <name>format_ilbc.so</name>
+ </member>
+ <member>
+ <name>format_sln.so</name>
+ </member>
+ <member>
+ <name>format_au.so</name>
+ </member>
+</category>
Added: team/russell/make_menuconfig/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/makeopts.xml?rev=7597&view=auto
==============================================================================
--- team/russell/make_menuconfig/makeopts.xml (added)
+++ team/russell/make_menuconfig/makeopts.xml Thu Dec 22 13:36:14 2005
@@ -1,0 +1,52 @@
+<?xml version="1.0"?>
+
+<category>
+ <name>MAKEOPTS_CFLAGS</name>
+ <displayname>Build Options</displayname>
+ <member>
+ <name>-DDEBUG_SCHEDULER</name>
+ <displayname>DEBUG_SCHEDULER</displayname>
+ <description>debug the scheduler</description>
+ </member>
+ <member>
+ <name>-DDEBUG_THREADS</name>
+ <displayname>DEBUG_THREADS</displayname>
+ <description>thread debugging</description>
+ </member>
+ <member>
+ <name>-DDETECT_DEADLOCKS</name>
+ <displayname>DETECT_DEADLOCKS</displayname>
+ <description>detect deadlocks</description>
+ </member>
+ <member>
+ <name>-DDUMP_SCHEDULER</name>
+ <displayname>DUMP_SCHEDULER</displayname>
+ <description>Dump the contents of the scheduler</description>
+ </member>
+ <member>
+ <name>-DLOW_MEMORY</name>
+ <displayname>LOW_MEMORY</displayname>
+ <description>If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY to reduce the size of certain static buffers</description>
+ </member>
+ <member>
+ <name>-DMALLOC_DEBUG</name>
+ <displayname>MALLOC_DEBUG</displayname>
+ <description>track memory allocation</description>
+ </member>
+ <member>
+ <name>-DOLD_DSP_ROUTINES</name>
+ <displayname>OLD_DSP_ROUTINES</displayname>
+ <description>Use the older DSP routines</description>
+ </member>
+ <member>
+ <name>-DRADIO_RELAX</name>
+ <displayname>RADIO_RELOAX</displayname>
+ <description>If you are running a radio application, define RADIO_RELAX so that the DTMF will be received more reliably</description>
+
+ </member>
+ <member>
+ <name>-DTRACE_FRAMES</name>
+ <displayname>TRACE_FRAMES</displayname>
+ <description>trace frames</description>
+ </member>
+</category>
Added: team/russell/make_menuconfig/pbx/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/pbx/makeopts.xml?rev=7597&view=auto
==============================================================================
--- team/russell/make_menuconfig/pbx/makeopts.xml (added)
+++ team/russell/make_menuconfig/pbx/makeopts.xml Thu Dec 22 13:36:14 2005
@@ -1,0 +1,25 @@
+<?xml version="1.0"?>
+
+<category>
+ <name>PBX_LIBS</name>
+ <displayname>PBX Modules</displayname>
+ <member>
+ <name>pbx_config.so</name>
+ </member>
+ <member>
+ <name>pbx_spool.so</name>
+ </member>
+ <member>
+ <name>pbx_dundi.so</name>
+ </member>
+ <member>
+ <name>pbx_loopback.so</name>
+ </member>
+ <member>
+ <name>pbx_realtime.so</name>
+ </member>
+ <member>
+ <name>pbx_ael.so</name>
+ </member>
+</category>
+
Added: team/russell/make_menuconfig/res/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/res/makeopts.xml?rev=7597&view=auto
==============================================================================
--- team/russell/make_menuconfig/res/makeopts.xml (added)
+++ team/russell/make_menuconfig/res/makeopts.xml Thu Dec 22 13:36:14 2005
@@ -1,0 +1,26 @@
+<?xml version="1.0"?>
+
+<category>
+ <name>RES_MODULES</name>
+ <displayname>Resources</displayname>
+ <member>
+ <name>res_indications.so</name>
+ <description>Indications</description>
+ </member>
+ <member>
+ <name>res_monitor.so</name>
+ <description>Monitor</description>
+ </member>
+ <member>
+ <name>res_adsi.so</name>
+ <description>ADSI Support</description>
+ </member>
+ <member>
+ <name>res_agi.so</name>
+ <description>AGI</description>
+ </member>
+ <member>
+ <name>res_features.so</name>
+ <description>Call Features</description>
+ </member>
+</category>
Added: team/russell/make_menuconfig/utils/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/utils/makeopts.xml?rev=7597&view=auto
==============================================================================
--- team/russell/make_menuconfig/utils/makeopts.xml (added)
+++ team/russell/make_menuconfig/utils/makeopts.xml Thu Dec 22 13:36:14 2005
@@ -1,0 +1,14 @@
+<?xml version="1.0"?>
+
+<category>
+ <name>UTILS</name>
+ <displayname>Utilities</displayname>
+ <member>
+ <name>streamplayer</name>
+ <description>A utility for reading from a raw TCP stream and sending the data to stdout</description>
+ </member>
+ <member>
+ <name>stereoize</name>
+ <description>Merge two mono WAV-files to one stereo WAV-file.</description>
+ </member>
+</category>
More information about the asterisk-commits
mailing list