Author: svn-role Date: Wed Nov 16 04:00:20 2022 New Revision: 1905332 URL: http://svn.apache.org/viewvc?rev=1905332&view=rev Log: Merge the r1904198 group from trunk:
* r1904198, r1904287 swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release Justification: Reduce extra deprecation warnings from SWIG. Depends: r1878379, r1883719, r1883722, r1884610 Votes: +1: futatuki, jamessan, rhuijben Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/build/ac-macros/swig.m4 subversion/branches/1.14.x/build/generator/gen_win_dependencies.py Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1904198,1904287 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905332&r1=1905331&r2=1905332&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Nov 16 04:00:20 2022 @@ -27,12 +27,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1904198, r1904287 - swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release - Justification: - Reduce extra deprecation warnings from SWIG. - Depends: - r1878379, r1883719, r1883722, r1884610 - Votes: - +1: futatuki, jamessan, rhuijben Modified: subversion/branches/1.14.x/build/ac-macros/swig.m4 URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/ac-macros/swig.m4?rev=1905332&r1=1905331&r2=1905332&view=diff ============================================================================== --- subversion/branches/1.14.x/build/ac-macros/swig.m4 (original) +++ subversion/branches/1.14.x/build/ac-macros/swig.m4 Wed Nov 16 04:00:20 2022 @@ -182,22 +182,29 @@ suitable Python interpreter is not found if test "$SWIG_VERSION" -ge "300010"; then dnl SWIG Python bindings successfully configured, clear the error message dnl SWIG_PY_ERRMSG="" + if test "$SWIG_VERSION" -lt "400000"; then + SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" + elif test "$SWIG_VERSION" -lt "401000"; then + SWIG_PY_OPTS="-python -py3 -nofastunpack" + else + SWIG_PY_OPTS="-python -nofastunpack" + fi + if test "$SWIG_VERSION" -gt "400002"; then + AC_MSG_WARN([Subversion Python bindings may work,]) + AC_MSG_WARN([but we didn't check with this SWIG version.]) + fi else + SWIG_PY_OPTS="-no-such-option" # fool proof SWIG_PY_ERRMSG="SWIG version is not suitable" AC_MSG_WARN([Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer]) fi - if test "$SWIG_VERSION" -lt "400000"; then - SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" - else - SWIG_PY_OPTS="-python -py3 -nofastunpack" - fi else if test "$SWIG_VERSION" -lt "400000"; then SWIG_PY_OPTS="-python -classic" dnl SWIG Python bindings successfully configured, clear the error message dnl SWIG_PY_ERRMSG="" else - SWIG_PY_OPTS="-python -nofastunpack" + SWIG_PY_OPTS="-no-such-option" # fool proof SWIG_PY_ERRMSG="SWIG version is not suitable" AC_MSG_WARN([Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0]) fi Modified: subversion/branches/1.14.x/build/generator/gen_win_dependencies.py URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_win_dependencies.py?rev=1905332&r1=1905331&r2=1905332&view=diff ============================================================================== --- subversion/branches/1.14.x/build/generator/gen_win_dependencies.py (original) +++ subversion/branches/1.14.x/build/generator/gen_win_dependencies.py Wed Nov 16 04:00:20 2022 @@ -1044,8 +1044,13 @@ class GenDependenciesBase(gen_base.Gener return if self.swig_version < (4, 0, 0): opts = "-python -py3 -nofastunpack -modern" - else: + elif self.swig_version < (4, 1, 0): opts = "-python -py3 -nofastunpack" + else: + opts = "-python -nofastunpack" + if show_warnings and self.swig_version > (4, 0, 2): + print("WARNING: Subversion Python bindings may work,\n" + "but we didn't check with this SWIG version.") else: if not ((1, 3, 24) <= self.swig_version < (4, 0, 0)): if show_warnings: