diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2016-01-03 01:37:44 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2016-01-03 14:55:39 -0500 |
| commit | 2c5873054732d5548866beccefc4832559b90339 (patch) | |
| tree | 4498be9774c6bb993e254a0af5987070382b8b79 /winbuild.py | |
| parent | 1175caa4668cad93b7374982e25e5c4849a2fc10 (diff) | |
| download | pycurl-2c5873054732d5548866beccefc4832559b90339.tar.gz | |
Build libcurl against libssh2
Diffstat (limited to 'winbuild.py')
| -rw-r--r-- | winbuild.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/winbuild.py b/winbuild.py index ad6af5e..2cfc755 100644 --- a/winbuild.py +++ b/winbuild.py @@ -428,6 +428,9 @@ class LibcurlBuilder(Builder): self.use_cares = kwargs.pop('use_cares') if self.use_cares: self.cares_version = kwargs.pop('cares_version') + self.use_libssh2 = kwargs.pop('use_libssh2') + if self.use_libssh2: + self.libssh2_version = kwargs.pop('libssh2_version') @property def state_tag(self): @@ -460,6 +463,11 @@ class LibcurlBuilder(Builder): f.write("set include=%%include%%;%s\n" % cares_builder.include_path) f.write("set lib=%%lib%%;%s\n" % cares_builder.lib_path) extra_options += ' WITH_CARES=%s' % dll_or_static + if self.use_libssh2: + libssh2_builder = Libssh2Builder(bitness=self.bitness, vc_version=self.vc_version, libssh2_version=self.libssh2_version, zlib_version=self.zlib_version, openssl_version=self.openssl_version) + f.write("set include=%%include%%;%s\n" % libssh2_builder.include_path) + f.write("set lib=%%lib%%;%s\n" % libssh2_builder.lib_path) + extra_options += ' WITH_SSH2=%s' % dll_or_static f.write("nmake /f Makefile.vc ENABLE_IDN=no%s\n" % extra_options) @property @@ -518,6 +526,8 @@ class PycurlBuilder(Builder): self.use_openssl = kwargs.pop('use_openssl') self.cares_version = kwargs.pop('cares_version') self.use_cares = kwargs.pop('use_cares') + self.libssh2_version = kwargs.pop('libssh2_version') + self.use_libssh2 = kwargs.pop('use_libssh2') @property def python_path(self): @@ -539,6 +549,8 @@ class PycurlBuilder(Builder): openssl_version=self.openssl_version, use_cares=self.use_cares, cares_version=self.cares_version, + use_libssh2=self.use_libssh2, + libssh2_version=self.libssh2_version, libcurl_version=self.libcurl_version) libcurl_dir = os.path.abspath(libcurl_builder.output_dir_path) dll_paths = libcurl_builder.dll_paths |