Changeset: ecff245bc383 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ecff245bc383
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
Branch: monetdburl
Log Message:
Install openssl libraries on Windows.
diffs (50 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -36,10 +36,12 @@ def main():
if sys.argv[2] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
+ libcrypto = '-x64'
vcpkg = r'C:\vcpkg\installed\x64-windows\{}'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
vcdir = os.getenv('VCINSTALLDIR')
if vcdir is None:
@@ -91,6 +93,8 @@ def main():
vcpkg.format(r'bin\iconv-2.dll'),
vcpkg.format(r'bin\bz2.dll'),
vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
+ vcpkg.format(r'bin\libcrypto-3{}.dll'.format(libcrypto)),
+ vcpkg.format(r'bin\libssl-3{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\lz4.dll'),
vcpkg.format(r'bin\liblzma.dll'),
vcpkg.format(r'bin\zlib1.dll')])
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -43,10 +43,12 @@ def main():
if sys.argv[2] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
+ libcrypto = '-x64'
vcpkg = r'C:\vcpkg\installed\x64-windows\{}'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
vcdir = os.getenv('VCINSTALLDIR')
if vcdir is None:
@@ -158,6 +160,8 @@ def main():
vcpkg.format(r'bin\bz2.dll'),
vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
vcpkg.format(r'bin\getopt.dll'),
+ vcpkg.format(r'bin\libcrypto-3{}.dll'.format(libcrypto)),
+ vcpkg.format(r'bin\libssl-3{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\libxml2.dll'),
vcpkg.format(r'bin\lz4.dll'),
vcpkg.format(r'bin\liblzma.dll'),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
