Author: svn-role
Date: Wed Dec 16 04:00:16 2020
New Revision: 1884482
URL: http://svn.apache.org/viewvc?rev=1884482&view=rev
Log:
Merge r1877338 from trunk:
* r1877338
Add SWIG4 support for SWIG Python binding on Windows.
Justification:
SWIG Python bindings should be able to build with SWIG4 on Windows, too
Votes:
+1: futatuki, jun66j5, jcorvel
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1877338
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1884482&r1=1884481&r2=1884482&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Dec 16 04:00:16 2020
@@ -111,13 +111,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1877338
- Add SWIG4 support for SWIG Python binding on Windows.
- Justification:
- SWIG Python bindings should be able to build with SWIG4 on Windows, too
- Votes:
- +1: futatuki, jun66j5, jcorvel
-
* r1883335
Fix unable to load *.pyd files with Python 3.8.x on Windows.
Justification:
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=1884482&r1=1884481&r2=1884482&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 Dec
16 04:00:16 2020
@@ -1038,10 +1038,22 @@ class GenDependenciesBase(gen_base.Gener
return
if sys.version_info[0] >= 3:
- self.user_macros.append(UserMacro("SWIG_PY_OPTS", "-python -py3"))
+ if self.swig_version < (3, 0, 10):
+ if show_warnings:
+ print("WARNING: Subversion Python bindings for Python 3 require SWIG
3.0.10 or newer")
+ return
+ if self.swig_version < (4, 0, 0):
+ opts = "-python -py3 -nofastunpack -modern"
+ else:
+ opts = "-python -py3 -nofastunpack"
else:
- self.user_macros.append(UserMacro("SWIG_PY_OPTS", "-python -classic"))
+ if not ((1, 3, 24) <= self.swig_version < (4, 0, 0)):
+ if show_warnings:
+ print("WARNING: Subversion Python bindings for Python 2 require
1.3.24 <= SWIG < 4.0.0")
+ return
+ opts = "-python -classic"
+ self.user_macros.append(UserMacro("SWIG_PY_OPTS", opts))
self._libraries['python'] = SVNCommonLibrary('python', inc_dir, lib_dir,
None,
sys.version.split(' ')[0])
