[asterisk-commits] branch russell/autoconf_and_menuselect - r7932 in /team/russell/autoconf_and_...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Jan 10 00:38:09 CST 2006


Author: russell
Date: Tue Jan 10 00:38:06 2006
New Revision: 7932

URL: http://svn.digium.com/view/asterisk?rev=7932&view=rev
Log:
- rename menuconfig to menuselect
- remove CFLAGS from menuselect, since those will be handled with autoconf

Added:
    team/russell/autoconf_and_menuselect/build_tools/menuselect.c
      - copied, changed from r7931, team/russell/autoconf_and_menuselect/build_tools/menuconfig.c
    team/russell/autoconf_and_menuselect/build_tools/menuselect.h
      - copied, changed from r7931, team/russell/autoconf_and_menuselect/build_tools/menuconfig.h
Removed:
    team/russell/autoconf_and_menuselect/build_tools/menuconfig.c
    team/russell/autoconf_and_menuselect/build_tools/menuconfig.h
    team/russell/autoconf_and_menuselect/makeopts.xml
Modified:
    team/russell/autoconf_and_menuselect/Makefile
    team/russell/autoconf_and_menuselect/build_tools/Makefile

Modified: team/russell/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/Makefile?rev=7932&r1=7931&r2=7932&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/Makefile (original)
+++ team/russell/autoconf_and_menuselect/Makefile Tue Jan 10 00:38:06 2006
@@ -920,11 +920,11 @@
 		$(MAKE) clean; cp -f .cleancount .lastclean;\
 	fi
 
-menuconfig: mxml/libmxml.a _menuconfig
-	./build_tools/menuconfig
-
-_menuconfig:
-	$(MAKE) -C build_tools _menuconfig
+menuselect: mxml/libmxml.a _menuselect
+	./build_tools/menuselect
+
+_menuselect:
+	$(MAKE) -C build_tools _menuselect
 	
 mxml/libmxml.a: FORCE
 	cd mxml && test -f config.h || ./configure

Modified: team/russell/autoconf_and_menuselect/build_tools/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/build_tools/Makefile?rev=7932&r1=7931&r2=7932&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/build_tools/Makefile (original)
+++ team/russell/autoconf_and_menuselect/build_tools/Makefile Tue Jan 10 00:38:06 2006
@@ -1,8 +1,8 @@
-_menuconfig: menuconfig.o
-	$(CC) -o menuconfig menuconfig.o ../mxml/libmxml.a -lcurses
+_menuselect: menuselect.o
+	$(CC) -o menuselect menuselect.o ../mxml/libmxml.a -lcurses
 
-menuconfig.o: menuconfig.c menuconfig.h
-	$(CC) -o menuconfig.o -c -I../ -I../include/ menuconfig.c
+menuselect.o: menuselect.c menuselect.h
+	$(CC) -o menuselect.o -c -I../ -I../include/ menuselect.c
 
 clean:
-	rm -f menuconfig menuconfig.o
+	rm -f menuselect menuselect.o

Copied: team/russell/autoconf_and_menuselect/build_tools/menuselect.c (from r7931, team/russell/autoconf_and_menuselect/build_tools/menuconfig.c)
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/build_tools/menuselect.c?p2=team/russell/autoconf_and_menuselect/build_tools/menuselect.c&p1=team/russell/autoconf_and_menuselect/build_tools/menuconfig.c&r1=7931&r2=7932&rev=7932&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/build_tools/menuconfig.c (original)
+++ team/russell/autoconf_and_menuselect/build_tools/menuselect.c Tue Jan 10 00:38:06 2006
@@ -19,7 +19,7 @@
 /*
  * \file
  *
- * \brief a generic 'make menuconfig' system
+ * \brief a generic 'make menuselect' system
  *
  */
 
@@ -31,7 +31,7 @@
 
 #include "mxml/mxml.h"
 
-#include "menuconfig.h"
+#include "menuselect.h"
 
 #define HELP_MESSAGE	"scroll = up/down arrows, select = Enter, back = left arrow"
 #define HELP_MESSAGE2	"quit = q, save and quit = x"
@@ -41,7 +41,7 @@
 #define MIN_X		80
 #define MIN_Y		25
 
-/* #define MENUCONFIG_DEBUG */
+/* #define MENUSELECT_DEBUG */
 
 #define my_calloc(num, len) \
 	({ \
@@ -297,10 +297,10 @@
 
 int build_member_list(void)
 {
-	int i = 0;
+	int i;
 	int res = -1;
 
-	for (; i < (sizeof(makeopts_files) / sizeof(makeopts_files[0])); i++) {
+	for (i = 0; makeopts_files[i]; i++) {
 		if ((res = parse_makeopts_xml(makeopts_files[i])))
 			break;
 	}
@@ -357,7 +357,7 @@
 
 	f = fopen(output_makeopts, "r");
 	if (!f) {
-#ifdef MENUCONFIG_DEBUG
+#ifdef MENUSELECT_DEBUG
 		fprintf(stderr, "Unable to open '%s' for reading exisiting config.\n", output_makeopts);
 #endif	
 		return;
@@ -432,7 +432,7 @@
 	return 0;
 }
 
-#ifdef MENUCONFIG_DEBUG
+#ifdef MENUSELECT_DEBUG
 void dump_member_list(void)
 {
 	struct category *cat;
@@ -725,7 +725,7 @@
 	/* Read in the existing makeopts, if they exist */
 	parse_existing_config();
 
-#ifdef MENUCONFIG_DEBUG
+#ifdef MENUSELECT_DEBUG
 	/* Dump the list produced by parsing the input XML and show which ones
 	   are already enabled by reading in the existing config */
 	dump_member_list();

Copied: team/russell/autoconf_and_menuselect/build_tools/menuselect.h (from r7931, team/russell/autoconf_and_menuselect/build_tools/menuconfig.h)
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/build_tools/menuselect.h?p2=team/russell/autoconf_and_menuselect/build_tools/menuselect.h&p1=team/russell/autoconf_and_menuselect/build_tools/menuconfig.h&r1=7931&r2=7932&rev=7932&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/build_tools/menuconfig.h (original)
+++ team/russell/autoconf_and_menuselect/build_tools/menuselect.h Tue Jan 10 00:38:06 2006
@@ -19,20 +19,20 @@
 /*
  * \file
  *
- * \brief defaults for menuconfig
+ * \brief defaults for menuselect
  *
  */
 
-#define MENU_TITLE		"The Asterisk Build Configurationator"
+#define MENU_TITLE		"Asterisk Module Selection"
 #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"
+	"utils/makeopts.xml",
+	NULL
 };



More information about the asterisk-commits mailing list