Author: rhuijben
Date: Thu Nov 9 12:45:13 2017
New Revision: 1814726
URL: http://svn.apache.org/viewvc?rev=1814726&view=rev
Log:
Following up on r1814724, r1814725, also fix the DLL name for OpenSSL
1.1.0 to allow the test code to automatically copy the required libraries.
* build/generator/gen_win_dependencies.py
(_find_openssl): Generate dll name for 1.1.0+.
Modified:
subversion/trunk/build/generator/gen_win_dependencies.py
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1814726&r1=1814725&r2=1814726&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Thu Nov 9
12:45:13 2017
@@ -880,20 +880,24 @@ class GenDependenciesBase(gen_base.Gener
libcrypto = 'libcrypto'
libssl = 'libssl'
+ versuffix = '-%d_%d' % version[0:2]
if version < (1, 1, 0):
libcrypto = 'libeay32'
libssl = 'ssleay32'
+ versuffix = ''
self._libraries['openssl'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
'%s.lib' % (libssl,),
openssl_version,
- dll_name='%s.dll' %
(libssl,),
+ dll_name='%s%s.dll' %
+ (libssl, versuffix),
dll_dir=bin_dir)
self._libraries['libcrypto'] = SVNCommonLibrary('openssl', inc_dir,
lib_dir,
'%s.lib' % (libcrypto,),
openssl_version,
- dll_name='%s.dll' %
(libcrypto,),
+ dll_name='%s%s.dll' %
+ (libcrypto, versuffix),
dll_dir=bin_dir)
def _find_perl(self, show_warnings):
