[svn-commits] branch russell/menuselect_buildoptions r34364 - in /team/russell/menuselect_b...

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Jun 15 19:02:43 2006
New Revision: 34364

URL: http://svn.digium.com/view/asterisk?rev=34364&view=rev
Log:
support voicemail build options in menuselect using a different method

Added:
    team/russell/menuselect_buildoptions/build_tools/get_makeopts   (with props)
    team/russell/menuselect_buildoptions/build_tools/get_moduleinfo
      - copied unchanged from r34348, team/russell/menuselect_buildoptions/build_tools/get_moduledeps
Removed:
    team/russell/menuselect_buildoptions/build_tools/get_moduledeps
Modified:
    team/russell/menuselect_buildoptions/apps/Makefile
    team/russell/menuselect_buildoptions/apps/app_voicemail.c
    team/russell/menuselect_buildoptions/build_tools/menuselect.c
    team/russell/menuselect_buildoptions/build_tools/prep_moduledeps

Modified: team/russell/menuselect_buildoptions/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/menuselect_buildoptions/apps/Makefile?rev=34364&r1=34363&r2=34364&view=diff
==============================================================================
--- team/russell/menuselect_buildoptions/apps/Makefile (original)
+++ team/russell/menuselect_buildoptions/apps/Makefile Thu Jun 15 19:02:43 2006
@@ -17,7 +17,7 @@
 
 MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
 
-app_voicemail.o: CFLAGS+=$(patsubst %,-D%,$(MENUSELECT_BUILDOPT_app_voicemail))
+app_voicemail.o: CFLAGS+=$(patsubst %,-D%,$(MENUSELECT_app_voicemail))
 
 all: $(MODS)
 

Modified: team/russell/menuselect_buildoptions/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/menuselect_buildoptions/apps/app_voicemail.c?rev=34364&r1=34363&r2=34364&view=diff
==============================================================================
--- team/russell/menuselect_buildoptions/apps/app_voicemail.c (original)
+++ team/russell/menuselect_buildoptions/apps/app_voicemail.c Thu Jun 15 19:02:43 2006
@@ -41,10 +41,21 @@
  *				 Bartosz Supczinski <Bartosz.Supczinski at dir.pl>
  */
 
-/*** MODULEINFO
-	<buildopt>ODBC_STORAGE</buildopt>
-	<buildopt>EXTENDED_ODBC_STORAGE</buildopt>
-	<buildopt>IMAP_STORAGE</buildopt>
+/*** MAKEOPTS
+<category name="MENUSELECT_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" force_clean_on_change="yes">
+	<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP">
+		<depend>cc-client</depend>
+		<defaultenabled>no</defaultenabled>
+	</member>
+	<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
+		<depend>unixodbc</depend>
+		<defaultenabled>no</defaultenabled>
+	</member>
+	<member name="EXTENDED_ODBC_STORAGE" displayname="Storage of Voicemail using ODBC (extended)">
+		<depend>unixodbc</depend>
+		<defaultenabled>no</defaultenabled>
+	</member>
+</category>
  ***/
 
 #include "asterisk.h"

Added: team/russell/menuselect_buildoptions/build_tools/get_makeopts
URL: http://svn.digium.com/view/asterisk/team/russell/menuselect_buildoptions/build_tools/get_makeopts?rev=34364&view=auto
==============================================================================
--- team/russell/menuselect_buildoptions/build_tools/get_makeopts (added)
+++ team/russell/menuselect_buildoptions/build_tools/get_makeopts Thu Jun 15 19:02:43 2006
@@ -1,0 +1,3 @@
+/\/\*\*\* MAKEOPTS/ {printit=1; next}
+/\*\*\*\// {exit}
+// {if (printit) print}

Propchange: team/russell/menuselect_buildoptions/build_tools/get_makeopts
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/russell/menuselect_buildoptions/build_tools/get_makeopts
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/russell/menuselect_buildoptions/build_tools/get_makeopts
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: team/russell/menuselect_buildoptions/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/russell/menuselect_buildoptions/build_tools/menuselect.c?rev=34364&r1=34363&r2=34364&view=diff
==============================================================================
--- team/russell/menuselect_buildoptions/build_tools/menuselect.c (original)
+++ team/russell/menuselect_buildoptions/build_tools/menuselect.c Thu Jun 15 19:02:43 2006
@@ -36,7 +36,7 @@
 
 #include "asterisk/linkedlists.h"
 
-#define MENUSELECT_DEBUG
+#undef MENUSELECT_DEBUG
 
 /*! The list of categories */
 struct categories categories = AST_LIST_HEAD_NOLOCK_INIT_VALUE;

Modified: team/russell/menuselect_buildoptions/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/team/russell/menuselect_buildoptions/build_tools/prep_moduledeps?rev=34364&r1=34363&r2=34364&view=diff
==============================================================================
--- team/russell/menuselect_buildoptions/build_tools/prep_moduledeps (original)
+++ team/russell/menuselect_buildoptions/build_tools/prep_moduledeps Thu Jun 15 19:02:43 2006
@@ -39,15 +39,21 @@
 		get_description ${file}
 		desc=${TDESC}
 		echo -e "\t\t<member name=\"${fname%%.c}\" displayname=\"${desc}\">"
-		awk -f build_tools/get_moduledeps ${file}
+		awk -f build_tools/get_moduleinfo ${file}
 		echo -e "\t\t</member>"
 	done
 	echo -e "\t</category>"
+
+	for file in ${dir}/${prefix}*.c
+	do
+		awk -f build_tools/get_makeopts ${file} >> .makeoptstmp
+	done
 }
 
 echo "<?xml version="1.0"?>"
 echo
 echo "<menu>"
+rm -f .makeoptstmp
 process_dir apps app APPS Applications
 process_dir cdr cdr CDR "Call Detail Recording"
 process_dir channels chan CHANNELS "Channel Drivers"
@@ -58,4 +64,6 @@
 process_dir res res RES "Resource Modules"
 cat build_tools/cflags.xml
 cat sounds/sounds.xml
+cat .makeoptstmp
+rm -f .makeoptstmp
 echo "</menu>"