[asterisk-commits] russell: branch russell/sla_rewrite r53787 - in
/team/russell/sla_rewrite: ./...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 9 17:23:13 MST 2007
Author: russell
Date: Fri Feb 9 18:23:13 2007
New Revision: 53787
URL: http://svn.digium.com/view/asterisk?view=rev&rev=53787
Log:
Merged revisions 53779-53781,53783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r53779 | kpfleming | 2007-02-09 17:51:29 -0600 (Fri, 09 Feb 2007) | 2 lines
fix awk scripts to work when both MODULEINFO and MAKEOPTS are present in a source file
........
r53780 | kpfleming | 2007-02-09 17:51:41 -0600 (Fri, 09 Feb 2007) | 2 lines
add some inter-module dependencies
........
r53781 | kpfleming | 2007-02-09 17:52:44 -0600 (Fri, 09 Feb 2007) | 2 lines
another dependency
........
r53783 | russell | 2007-02-09 18:15:50 -0600 (Fri, 09 Feb 2007) | 4 lines
When the Echo() application receives the digit '#', echo that back as well.
Since we already sent the BEGIN frame for that digit, it makes sense to send
the END as well.
........
Modified:
team/russell/sla_rewrite/ (props changed)
team/russell/sla_rewrite/apps/app_adsiprog.c
team/russell/sla_rewrite/apps/app_echo.c
team/russell/sla_rewrite/apps/app_voicemail.c
team/russell/sla_rewrite/build_tools/get_makeopts
team/russell/sla_rewrite/build_tools/get_moduleinfo
team/russell/sla_rewrite/channels/chan_gtalk.c
team/russell/sla_rewrite/funcs/func_odbc.c
team/russell/sla_rewrite/res/res_adsi.c
team/russell/sla_rewrite/res/res_config_odbc.c
Propchange: team/russell/sla_rewrite/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 9 18:23:13 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-53776
+/branches/1.4:1-53786
Modified: team/russell/sla_rewrite/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/apps/app_adsiprog.c?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/apps/app_adsiprog.c (original)
+++ team/russell/sla_rewrite/apps/app_adsiprog.c Fri Feb 9 18:23:13 2007
@@ -24,6 +24,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <depend>res_adsi</depend>
+ ***/
#include "asterisk.h"
Modified: team/russell/sla_rewrite/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/apps/app_echo.c?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/apps/app_echo.c (original)
+++ team/russell/sla_rewrite/apps/app_echo.c Fri Feb 9 18:23:13 2007
@@ -73,6 +73,8 @@
case AST_FRAME_DTMF:
if (f->subclass == '#') {
res = 0;
+ if (ast_write(chan, f))
+ res = -1;
ast_frfree(f);
goto end;
}
Modified: team/russell/sla_rewrite/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/apps/app_voicemail.c?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/apps/app_voicemail.c (original)
+++ team/russell/sla_rewrite/apps/app_voicemail.c Fri Feb 9 18:23:13 2007
@@ -28,14 +28,20 @@
* \note This module requires res_adsi to load.
*/
+/*** MODULEINFO
+ <depend>res_adsi</depend>
+ ***/
+
/*** MAKEOPTS
<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o">
<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
<depend>unixodbc</depend>
+ <conflict>IMAP_STORAGE</conflict>
<defaultenabled>no</defaultenabled>
</member>
<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
<depend>imap_tk</depend>
+ <conflict>ODBC_STORAGE</conflict>
<use>ssl</use>
<defaultenabled>no</defaultenabled>
</member>
Modified: team/russell/sla_rewrite/build_tools/get_makeopts
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/build_tools/get_makeopts?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/build_tools/get_makeopts (original)
+++ team/russell/sla_rewrite/build_tools/get_makeopts Fri Feb 9 18:23:13 2007
@@ -1,3 +1,3 @@
/\/\*\*\* MAKEOPTS/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
// {if (printit) print}
Modified: team/russell/sla_rewrite/build_tools/get_moduleinfo
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/build_tools/get_moduleinfo?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/build_tools/get_moduleinfo (original)
+++ team/russell/sla_rewrite/build_tools/get_moduleinfo Fri Feb 9 18:23:13 2007
@@ -1,3 +1,3 @@
/\/\*\*\* MODULEINFO/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
// {if (printit) print}
Modified: team/russell/sla_rewrite/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/channels/chan_gtalk.c?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/channels/chan_gtalk.c (original)
+++ team/russell/sla_rewrite/channels/chan_gtalk.c Fri Feb 9 18:23:13 2007
@@ -27,6 +27,7 @@
/*** MODULEINFO
<depend>iksemel</depend>
+ <depend>res_jabber</depend>
***/
#include "asterisk.h"
Modified: team/russell/sla_rewrite/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/funcs/func_odbc.c?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/funcs/func_odbc.c (original)
+++ team/russell/sla_rewrite/funcs/func_odbc.c Fri Feb 9 18:23:13 2007
@@ -26,6 +26,7 @@
/*** MODULEINFO
<depend>unixodbc</depend>
+ <depend>res_odbc</depend>
***/
#include "asterisk.h"
Modified: team/russell/sla_rewrite/res/res_adsi.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/res/res_adsi.c?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/res/res_adsi.c (original)
+++ team/russell/sla_rewrite/res/res_adsi.c Fri Feb 9 18:23:13 2007
@@ -1122,7 +1122,7 @@
return -1;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ADSI Resource (not optional)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ADSI Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/russell/sla_rewrite/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_rewrite/res/res_config_odbc.c?view=diff&rev=53787&r1=53786&r2=53787
==============================================================================
--- team/russell/sla_rewrite/res/res_config_odbc.c (original)
+++ team/russell/sla_rewrite/res/res_config_odbc.c Fri Feb 9 18:23:13 2007
@@ -30,6 +30,7 @@
/*** MODULEINFO
<depend>unixodbc</depend>
+ <depend>res_odbc</depend>
***/
#include "asterisk.h"
More information about the asterisk-commits
mailing list