[Build-system] Use swig 4.1

diff --git a/libs/esl/java/Makefile b/libs/esl/java/Makefile
index 48ee95acc4507c3c87f9b7369b046ca608a3c7e9..8738ff93f9aa428cf809aaf681d4ee6b8e143ff3 100644 (file)
--- a/libs/esl/java/Makefile
+++ b/libs/esl/java/Makefile
@@ -5,7 +5,7 @@ CLASSES=org/freeswitch/esl/*
 all: esl.jar
 
 esl_wrap.cpp:
-       swig3.0 -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i
+       swig -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
        $(CXX) $(CXX_CFLAGS) $(LOCAL_CFLAGS) $(CXXFLAGS) $(GCC_WARNING_JUNK) $(PERL_INC) -c esl_wrap.cpp -o esl_wrap.o

diff --git a/libs/esl/lua/Makefile b/libs/esl/lua/Makefile
index a24b527ba5e64513a720f9c495caffa3d8501ba9..55c6ae2ec02fd36fe539f0e06645563f8c52ad27 100644 (file)
--- a/libs/esl/lua/Makefile
+++ b/libs/esl/lua/Makefile
@@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
 all: ESL.so
 
 esl_wrap.cpp:
-       swig3.0 -module ESL -lua -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+       swig -module ESL -lua -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
        $(CXX) $(CXX_CFLAGS) $(LUA_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o

diff --git a/libs/esl/managed/Makefile b/libs/esl/managed/Makefile
index fb8c36ba6764eef5ebc456d09c416b3d2316bb0d..8ce9a9890e526b391ff807c45f22276ebaabc5a1 100644 (file)
--- a/libs/esl/managed/Makefile
+++ b/libs/esl/managed/Makefile
@@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
 all: ESL.so
 
 esl_wrap.cpp:
-       swig3.0 -module ESL -csharp -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+       swig -module ESL -csharp -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
        $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o

diff --git a/libs/esl/perl/Makefile.am b/libs/esl/perl/Makefile.am
index 7caf8ad271858b187ce054e0ee1c4a0399310355..ebfa460cda0eb985b8a3630af2d2b53fb9531285 100644 (file)
--- a/libs/esl/perl/Makefile.am
+++ b/libs/esl/perl/Makefile.am
@@ -21,7 +21,7 @@ endif
        $(MAKE) -C ..
 
 esl_wrap.cpp:
-       swig3.0 -module ESL -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+       swig -module ESL -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 perlxsi.c:
        $(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c

diff --git a/libs/esl/php/Makefile.am b/libs/esl/php/Makefile.am
index bafc3f8764f70fc20d0ebd2309832bc5be02cb9c..e40457f294911da0925ed67390e4408f865e30a6 100644 (file)
--- a/libs/esl/php/Makefile.am
+++ b/libs/esl/php/Makefile.am
@@ -3,7 +3,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function
 all: ESL.so
 
 esl_wrap.cpp:
-       swig3.0 -module ESL -php7 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+       swig -module ESL -php7 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
        sed -e 's/  char \*type_name;/  const char \*type_name;/' -i esl_wrap.cpp
 
 esl_wrap.o: esl_wrap.cpp

diff --git a/libs/esl/python3/Makefile b/libs/esl/python3/Makefile
index 1c838534fd1cd97a6fd30fad705162a3e8bd5a36..43c3669c560b060f884c5a96075b2f74a22da397 100644 (file)
--- a/libs/esl/python3/Makefile
+++ b/libs/esl/python3/Makefile
@@ -5,7 +5,7 @@ SITE_DIR=$(DESTDIR)/`$(PYTHON3) -c "from distutils.sysconfig import get_python_l
 all: _ESL.so
 
 esl_wrap.cpp:
-       swig3.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
+       swig -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
        $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o

diff --git a/libs/esl/ruby/Makefile b/libs/esl/ruby/Makefile
index ae3d2a10d3145fe00f031c3e320e7b3fb593b174..8284dcda62cc1d5340c206002508331fb29c5870 100644 (file)
--- a/libs/esl/ruby/Makefile
+++ b/libs/esl/ruby/Makefile
@@ -6,7 +6,7 @@ RUBY_GEM_DIR=$(shell $(RUBY) -e 'puts RbConfig::CONFIG["rubylibdir"]')
 all: ESL.so
 
 esl_wrap.cpp:
-       swig3.0 -module ESL -ruby -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+       swig -module ESL -ruby -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
        $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o

diff --git a/libs/esl/tcl/Makefile b/libs/esl/tcl/Makefile
index 527ef0356926d70f03c60d5d7a51fa60307f4d22..85b1fa1211c494a7200a0bb45e50437a34bcf51b 100644 (file)
--- a/libs/esl/tcl/Makefile
+++ b/libs/esl/tcl/Makefile
@@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
 all: ESL.so
 
 esl_wrap.cpp:
-       swig3.0 -module ESL -tcl -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+       swig -module ESL -tcl -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
        $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o

diff --git a/src/mod/languages/mod_java/Makefile.am b/src/mod/languages/mod_java/Makefile.am
index 97499935997497ee19f2fc531ad217d84c5a8107..f5aaa90bb3b0d4538dade69a1bea645bcb720572 100644 (file)
--- a/src/mod/languages/mod_java/Makefile.am
+++ b/src/mod/languages/mod_java/Makefile.am
@@ -28,7 +28,7 @@ freeswitch.jar: classes
 
 reswig:
        rm -f switch_swig_wrap.cpp
-       swig3.0 -java -c++ -I../../../include -package org.freeswitch.swig -outdir src/org/freeswitch/swig -o switch_swig_wrap.cpp mod_java.i
+       swig -java -c++ -I../../../include -package org.freeswitch.swig -outdir src/org/freeswitch/swig -o switch_swig_wrap.cpp mod_java.i
 
 install-data-local:
        cp freeswitch.jar $(DESTDIR)@scriptdir@

diff --git a/src/mod/languages/mod_lua/Makefile.am b/src/mod/languages/mod_lua/Makefile.am
index 663cda167734d17a3e0b32c7a89ce1eb940ae551..f898c8abfa29eee8caa67e6aeb3cfc5aec846a0d 100644 (file)
--- a/src/mod/languages/mod_lua/Makefile.am
+++ b/src/mod/languages/mod_lua/Makefile.am
@@ -25,7 +25,7 @@ swigclean: clean
        rm -f mod_lua_wrap.*
 
 mod_lua_wrap.cpp: mod_lua_extra.c
-       swig3.0 -lua -c++ -I../../../../src/include -oh mod_lua_wrap.h -o mod_lua_wrap.cpp freeswitch.i
+       swig -lua -c++ -I../../../../src/include -oh mod_lua_wrap.h -o mod_lua_wrap.cpp freeswitch.i
        echo "#include \"mod_lua_extra.c\"" >> mod_lua_wrap.cpp
        patch -s -p0 -i hack.diff
 

diff --git a/src/mod/languages/mod_managed/Makefile.am b/src/mod/languages/mod_managed/Makefile.am
index a212a1ed1fc887815b94ef1b8d1cae288f1343d8..2995f82ed79569b24b50928b444da7fd5f431fe4 100644 (file)
--- a/src/mod/languages/mod_managed/Makefile.am
+++ b/src/mod/languages/mod_managed/Makefile.am
@@ -39,7 +39,7 @@ swigclean: clean
        rm -f freeswitch_wrap.cxx managed/swig.cs
 
 freeswitch_wrap.cxx:
-       swig3.0 -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i
+       swig -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i
        rm -f ./managed/swig.cs
        cat *.cs > ./managed/swig.cs
        rm -f *.cs

diff --git a/src/mod/languages/mod_perl/Makefile.am b/src/mod/languages/mod_perl/Makefile.am
index c1be5d68395b4b62b8f083a6347bb36c4af28f72..acf1d465a1a15e0bfc998d05c77fd5cdf639a9e9 100644 (file)
--- a/src/mod/languages/mod_perl/Makefile.am
+++ b/src/mod/languages/mod_perl/Makefile.am
@@ -23,7 +23,7 @@ swigclean: clean
        rm -f mod_perl_wrap.* freeswitch.so freeswitch.pm
 
 mod_perl_wrap.cpp:
-       swig3.0 -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
+       swig -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
        echo "#include \"mod_perl_extra.c\"" >> mod_perl_wrap.cpp
        patch -s -p0 -i hack.diff
 

diff --git a/src/mod/languages/mod_python3/Makefile.am b/src/mod/languages/mod_python3/Makefile.am
index 796f672234f3a7cce579a4bda70de23c8ea52425..17f6603497590b47ba771e46303e7e2c60a4f19b 100644 (file)
--- a/src/mod/languages/mod_python3/Makefile.am
+++ b/src/mod/languages/mod_python3/Makefile.am
@@ -20,7 +20,7 @@ swigclean: clean
        rm -f mod_python_wrap.* freeswitch.py
 
 mod_python_wrap.cpp: mod_python_extra.c hack.diff 
-       swig3.0 -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
+       swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
        echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp
        patch -s -p0 -i hack.diff
 

diff --git a/src/mod/languages/mod_python3/hack.diff b/src/mod/languages/mod_python3/hack.diff
index 5732630bba012770f358988676c3932d3f407ab8..55afb233887610636f35857c89ab808db39436e3 100644 (file)
--- a/src/mod/languages/mod_python3/hack.diff
+++ b/src/mod/languages/mod_python3/hack.diff
@@ -1,6 +1,6 @@
---- mod_python_wrap.cpp.old    2015-06-16 12:56:23.868000000 -0500
-+++ mod_python_wrap.cpp        2015-06-16 12:56:32.268000000 -0500
-@@ -3500,7 +3500,9 @@ SWIG_AsCharArray(PyObject * obj, char *val, size_t size)
+--- mod_python_wrap.cpp.old    2024-11-08 21:22:49.064934340 +0000
++++ mod_python_wrap.cpp        2024-11-12 13:45:20.822756877 +0000
+@@ -3492,7 +3492,9 @@
      if (csize <= size) {
        if (val) {
        if (csize) memcpy(val, cptr, csize*sizeof(char));
@@ -10,16 +10,16 @@
        }
        if (alloc == SWIG_NEWOBJ) {
        delete[] cptr;
-@@ -4677,7 +4677,7 @@ SWIGINTERN PyObject *_wrap_DTMF_digit_set(PyObject *SWIGUNUSEDPARM(self), PyObje
+@@ -4689,7 +4691,7 @@
    char arg2 ;
    void *argp1 = 0 ;
    int res1 = 0 ;
 -  char val2 ;
 +  char val2 = '\0';
    int ecode2 = 0 ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-@@ -4787,7 +4787,7 @@ SWIGINTERN PyObject *_wrap_new_DTMF(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
+   PyObject *swig_obj[2] ;
+   
+@@ -4799,7 +4801,7 @@
    PyObject *resultobj = 0;
    char arg1 ;
    uint32_t arg2 = (uint32_t) SWITCH_DEFAULT_DTMF_DURATION ;
@@ -28,7 +28,7 @@
    int ecode1 = 0 ;
    void *argp2 ;
    int res2 = 0 ;
-@@ -6198,7 +6198,9 @@
+@@ -6371,7 +6373,9 @@
      } 
      arg3 = static_cast< int >(val3);
    }
@@ -38,31 +38,16 @@
    resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN |  0 );
    return resultobj;
  fail:
-@@ -9264,20 +9266,20 @@
- }
- 
- 
--SWIGINTERN PyObject *_wrap_new_Session__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+SWIGINTERN PyObject *_wrap_new_Session__SWIG_0(PyObject *self, PyObject *args) {
-   PyObject *resultobj = 0;
-   PYTHON::Session *result = 0 ;
+@@ -9779,7 +9783,7 @@
    
-   if (!PyArg_ParseTuple(args,(char *)":new_Session")) SWIG_fail;
+   if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
    result = (PYTHON::Session *)new PYTHON::Session();
 -  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW |  0 );
 +  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PYTHON__Session, SWIG_POINTER_NEW |  0 ); result->setPython(self);
    return resultobj;
  fail:
    return NULL;
- }
- 
- 
--SWIGINTERN PyObject *_wrap_new_Session__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+SWIGINTERN PyObject *_wrap_new_Session__SWIG_1(PyObject *self, PyObject *args) {
-   PyObject *resultobj = 0;
-   char *arg1 = (char *) 0 ;
-   CoreSession *arg2 = (CoreSession *) 0 ;
-@@ -9302,7 +9304,7 @@
+@@ -9809,7 +9813,7 @@
    }
    arg2 = reinterpret_cast< CoreSession * >(argp2);
    result = (PYTHON::Session *)new PYTHON::Session(arg1,arg2);
@@ -71,16 +56,7 @@
    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
    return resultobj;
  fail:
-@@ -9311,7 +9313,7 @@
- }
- 
- 
--SWIGINTERN PyObject *_wrap_new_Session__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+SWIGINTERN PyObject *_wrap_new_Session__SWIG_2(PyObject *self, PyObject *args) {
-   PyObject *resultobj = 0;
-   char *arg1 = (char *) 0 ;
-   int res1 ;
-@@ -9327,7 +9329,7 @@
+@@ -9833,7 +9837,7 @@
    }
    arg1 = reinterpret_cast< char * >(buf1);
    result = (PYTHON::Session *)new PYTHON::Session(arg1);
@@ -89,16 +65,7 @@
    if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
    return resultobj;
  fail:
-@@ -9336,7 +9338,7 @@
- }
- 
- 
--SWIGINTERN PyObject *_wrap_new_Session__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-+SWIGINTERN PyObject *_wrap_new_Session__SWIG_3(PyObject *self, PyObject *args) {
-   PyObject *resultobj = 0;
-   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
-   void *argp1 = 0 ;
-@@ -9351,7 +9353,7 @@
+@@ -9856,7 +9860,7 @@
    }
    arg1 = reinterpret_cast< switch_core_session_t * >(argp1);
    result = (PYTHON::Session *)new PYTHON::Session(arg1);
@@ -107,11 +74,11 @@
    return resultobj;
  fail:
    return NULL;
-@@ -10492,6 +10492,7 @@ SWIGINTERN PyObject *_wrap_Session_setSelf(PyObject *SWIGUNUSEDPARM(self), PyObj
+@@ -10520,6 +10524,7 @@
      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Session_setSelf" "', argument " "1"" of type '" "PYTHON::Session *""'"); 
    }
    arg1 = reinterpret_cast< PYTHON::Session * >(argp1);
 +  if (!arg1) SWIG_exception_fail(SWIG_ValueError, "in method '" "Session_setSelf" "', argument " "1"" is NULL"); 
-   arg2 = obj1;
+   arg2 = swig_obj[1];
    (arg1)->setSelf(arg2);
    resultobj = SWIG_Py_Void();