Checkout
troycurtisjr
committed
on 29 Jan 18
On branch swig-py3: Add py3c library support to the Windows build.

* build/generator/templates/vcnet_vcxproj.ezt
(UserMacros): Add templa… Show more
On branch swig-py3: Add py3c library support to the Windows build.

* build/generator/templates/vcnet_vcxproj.ezt

 (UserMacros): Add template options to define UserMacros.

* build/generator/gen_vcnet_vcproj.py

 (Generator.write_project): Include new user macro values in

  data passed to the ezt template function.

* build/generator/gen_win_dependencies.py

 (UserMacro): Define a new type to use with user macro templates.

 (GenDependenciesBase._optional_libraries): Include py3c library.

 (GenDependenciesBase.parse_options): Include the py3c library path

  option.

 (GenDependenciesBase.find_libraries): Add a call to _find_py3c().

 (GenDependenciesBase._find_python): Define SWIG_PY_OPTS user macro

  based on detected Python version.

 (GenDependenciesBase._find_py3c): New method.

 (GenDependenciesBase._find_swig,

  GenDependenciesBase._find_jdk): Ensure output from subprocess is

  properly decoded.

* gen-make.py

 (_usage_exit): Add --with-py3c usage.

 (my_getopt): Add with-py3c option.

* subversion/bindings/swig/INSTALL

 Include py3c in Windows SWIG building instructions.

* build/generator/gen_base.py

 (IncludeDependencyInfo._scan_for_includes): Ensure file data is

  properly encoded as UTF8.

* build/generator/gen_win.py

 (WinGeneratorBase.makeguid): Ensure data input to hashlib is binary

  and not Unicode.

 (WinGeneratorBase.get_win_includes): Include py3c include directory

  in swig compile definition.

Show less