[svn-commits] russell: branch russell/bindings r103760 - in /team/russell/bindings: binding...

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Feb 18 08:21:41 2008
New Revision: 103760

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103760
Log:
Pull the logging prototypes from the header file instead of duplicating them

Added:
    team/russell/bindings/bindings/asterisk_base.i
      - copied, changed from r103759, team/russell/bindings/bindings/asterisk.i
Removed:
    team/russell/bindings/bindings/asterisk.i
Modified:
    team/russell/bindings/bindings/   (props changed)
    team/russell/bindings/bindings/Makefile
    team/russell/bindings/res/python/res_python.h

Propchange: team/russell/bindings/bindings/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 18 08:21:41 2008
@@ -1,5 +1,12 @@
 build
 ast_cdr.py
 ast_cdr.pyc
+ast_channel.py
+ast_channel.pyc
+asterisk.py
+asterisk.pyc
 ast_cdr_wrap.c
+ast_channel_wrap.c
+asterisk_wrap.c
 ast_cdr.i
+asterisk.i

Modified: team/russell/bindings/bindings/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/bindings/Makefile?view=diff&rev=103760&r1=103759&r2=103760
==============================================================================
--- team/russell/bindings/bindings/Makefile (original)
+++ team/russell/bindings/bindings/Makefile Mon Feb 18 08:21:41 2008
@@ -14,6 +14,10 @@
 PYTHON_MODS:=ast_cdr.py ast_channel.py asterisk.py
 
 all: asterisk_wrap.c ast_channel_wrap.c ast_cdr_wrap.c swigpyrun.h
+
+asterisk.i: $(ASTTOPDIR)/res/python/res_python.h
+	cat asterisk_base.i > $@
+	$(AWK) -f get_swig $< >> $@
 
 ast_channel.i: $(ASTTOPDIR)/include/asterisk/channel.h
 

Copied: team/russell/bindings/bindings/asterisk_base.i (from r103759, team/russell/bindings/bindings/asterisk.i)
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/bindings/asterisk_base.i?view=diff&rev=103760&p1=team/russell/bindings/bindings/asterisk.i&r1=103759&p2=team/russell/bindings/bindings/asterisk_base.i&r2=103760
==============================================================================
--- team/russell/bindings/bindings/asterisk.i (original)
+++ team/russell/bindings/bindings/asterisk_base.i Mon Feb 18 08:21:41 2008
@@ -1,16 +1,9 @@
 %module asterisk
 
 %{
-#include <stdarg.h>
-
 #include "asterisk.h"
 #include "asterisk/logger.h"
 
 #include "python/res_python.h"
 %}
 
-void ast_log_error(const char *msg);
-void ast_log_warning(const char *msg);
-void ast_log_notice(const char *msg);
-void ast_log_debug(unsigned int level, const char *msg);
-void ast_log_verbose(unsigned int level, const char *msg);

Modified: team/russell/bindings/res/python/res_python.h
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/res/python/res_python.h?view=diff&rev=103760&r1=103759&r2=103760
==============================================================================
--- team/russell/bindings/res/python/res_python.h (original)
+++ team/russell/bindings/res/python/res_python.h Mon Feb 18 08:21:41 2008
@@ -29,11 +29,13 @@
 /*! defined by python_asterisk_wrap.c */
 void init_asterisk(void);
 
+/*** SWIG_BEGIN ***/
 void ast_log_error(const char *msg);
 void ast_log_warning(const char *msg);
 void ast_log_notice(const char *msg);
 void ast_log_debug(unsigned int level, const char *msg);
 void ast_log_verbose(unsigned int level, const char *msg);
+/*** SWIG_END ***/
 
 /*! defined by python_ast_cdr_wrap.c */
 void init_ast_cdr(void);