[asterisk-commits] branch russell/make_menuconfig - r7534 in /team/russell/make_menuconfig: ./ b...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Dec 20 00:36:55 2005
New Revision: 7534

URL: http://svn.digium.com/view/asterisk?rev=7534&view=rev
Log:
- move some option defaults into a header file
- move build_options.xml to the build_tools/ directory and rename it to makeopts.xml
- change default build options file to "asterisk.makeopts" to be consistent with the others

Added:
    team/russell/make_menuconfig/build_tools/makeopts.xml
      - copied unchanged from r7500, team/russell/make_menuconfig/build_options.xml
    team/russell/make_menuconfig/build_tools/menuconfig.h
Removed:
    team/russell/make_menuconfig/build_options.xml
Modified:
    team/russell/make_menuconfig/Makefile
    team/russell/make_menuconfig/build_tools/menuconfig.c

Modified: team/russell/make_menuconfig/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/Makefile?rev=7534&r1=7533&r2=7534&view=diff
==============================================================================
--- team/russell/make_menuconfig/Makefile (original)
+++ team/russell/make_menuconfig/Makefile Tue Dec 20 00:36:55 2005
@@ -171,8 +171,8 @@
 endif
 
 # Include the local build configuration
-ifneq ($(wildcard build_config),)
-  include build_config
+ifneq ($(wildcard asterisk.makeopts),)
+  include asterisk.makeopts
   ASTCFLAGS+= $(BUILD_CONFIG_CFLAGS)
 endif
 

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=7534&r1=7533&r2=7534&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_tools/menuconfig.c (original)
+++ team/russell/make_menuconfig/build_tools/menuconfig.c Tue Dec 20 00:36:55 2005
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 2005, Digium, Inc.
+ * Copyright (C) 2005, Russell Bryant
  *
  * Russell Bryant <russell at digium.com>
  *
@@ -31,18 +31,15 @@
 
 #include "mxml/mxml.h"
 
-#define MENU_TITLE	"The Asterisk Build Configurationator"
+#include "menuconfig.h"
 
 #define HELP_MESSAGE	"scroll = up/down arrows, select = Enter, back = left arrow"
 #define HELP_MESSAGE2	"quit = q, save and quit = x"
 
 #define TITLE_HEIGHT	5
 
-#define BUILD_OPTIONS_DEFAULT	 	"build_options.xml"
-#define BUILD_CONFIG_DEFAULT 		"build_config"
-
-#define MIN_X	80
-#define MIN_Y	25
+#define MIN_X		80
+#define MIN_Y		25
 
 /* #define MENUCONFIG_DEBUG */
 

Added: team/russell/make_menuconfig/build_tools/menuconfig.h
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_tools/menuconfig.h?rev=7534&view=auto
==============================================================================
--- team/russell/make_menuconfig/build_tools/menuconfig.h (added)
+++ team/russell/make_menuconfig/build_tools/menuconfig.h Tue Dec 20 00:36:55 2005
@@ -1,0 +1,28 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2005, Russell Bryant
+ *
+ * Russell Bryant <russell at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ * \file
+ *
+ * \brief defaults for menuconfig
+ *
+ */
+
+#define MENU_TITLE		"The Asterisk Build Configurationator"
+#define BUILD_OPTIONS_DEFAULT	"build_tools/makeopts.xml"
+#define BUILD_CONFIG_DEFAULT 	"asterisk.makeopts"