Author: jamessan Date: Wed Dec 23 04:46:42 2015 New Revision: 1721488 URL: http://svn.apache.org/viewvc?rev=1721488&view=rev Log: Enable building bindings with SWIG >= 3.0.6
This reinstates r1690591 and adds the minimum version checks for SWIG proposed by Joe Orton in http://svn.haxx.se/dev/archive-2015-07/0028.shtml. * build/ac-macros/swig.m4, subversion/bindings/swig/INSTALL: Change version check and documentation to allow SWIG >= 3.0.6 * subversion/bindings/swig/include/proxy.swg: Use %{ %} with %pythoncode so comments avoid the SWIG processor, fixing the bindings with SWIG >= 3.0.6. Modified: subversion/trunk/build/ac-macros/swig.m4 subversion/trunk/subversion/bindings/swig/INSTALL subversion/trunk/subversion/bindings/swig/include/proxy.swg Modified: subversion/trunk/build/ac-macros/swig.m4 URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/swig.m4?rev=1721488&r1=1721487&r2=1721488&view=diff ============================================================================== --- subversion/trunk/build/ac-macros/swig.m4 (original) +++ subversion/trunk/build/ac-macros/swig.m4 Wed Dec 23 04:46:42 2015 @@ -92,12 +92,12 @@ AC_DEFUN(SVN_FIND_SWIG, # If you change the required swig version number, don't forget to update: # subversion/bindings/swig/INSTALL if test -n "$SWIG_VERSION" && test "$SWIG_VERSION" -ge "103024" && \ - test "$SWIG_VERSION" -lt "300000"; then + ( test "$SWIG_VERSION" -lt "300000" || test "$SWIG_VERSION" -ge "300006" ); then SWIG_SUITABLE=yes else SWIG_SUITABLE=no AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW]) - AC_MSG_WARN([Subversion requires SWIG >= 1.3.24 and < 3.0.0 ]) + AC_MSG_WARN([Subversion requires SWIG >= 1.3.24 and < 3.0.0, or >= 3.0.6 ]) fi fi Modified: subversion/trunk/subversion/bindings/swig/INSTALL URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/INSTALL?rev=1721488&r1=1721487&r2=1721488&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/swig/INSTALL (original) +++ subversion/trunk/subversion/bindings/swig/INSTALL Wed Dec 23 04:46:42 2015 @@ -65,7 +65,7 @@ BUILDING SWIG BINDINGS FOR SVN ON UNIX Step 1: Install a suitable version of SWIG (which is - currently SWIG version 1.3.24 or later, but not SWIG 3.0.0 or newer). + currently SWIG version 1.3.24 or later, excluding SWIG 3.0.0 through 3.0.5). * Perhaps your distribution packages a suitable version - if it does install it, and skip to the last bullet point in this section. Modified: subversion/trunk/subversion/bindings/swig/include/proxy.swg URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/include/proxy.swg?rev=1721488&r1=1721487&r2=1721488&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/swig/include/proxy.swg (original) +++ subversion/trunk/subversion/bindings/swig/include/proxy.swg Wed Dec 23 04:46:42 2015 @@ -62,7 +62,7 @@ /* Default code for all wrapped proxy classes in Python */ %define %proxy_pythoncode(TYPE) -%pythoncode { +%pythoncode %{ def set_parent_pool(self, parent_pool=None): """Create a new proxy object for TYPE""" import libsvn.core, weakref @@ -104,7 +104,7 @@ self.__dict__.setdefault("_members",{})[name] = value return _swig_setattr(self, self.__class__, name, value) -} +%} %enddef /* Define a proxy for wrapping an existing struct */
