From d8768bd143bf5743fe2780e1fb70db92784cd14f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 8 Nov 2019 14:25:37 +0100 Subject: [PATCH] Fix libuv.dll handling Make sure libuv.dll gets copied to the proper directory in the Release build configuration and that the BIND installer on Windows installs libuv.dll. --- bin/win32/BINDInstall/BINDInstallDlg.cpp | 1 + lib/isc/win32/libisc.vcxproj.in | 2 +- win32utils/Configure | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp index 050313659a..0587c9669b 100644 --- a/bin/win32/BINDInstall/BINDInstallDlg.cpp +++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp @@ -138,6 +138,7 @@ const FileData installFiles[] = {"libdns.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, {"libirs.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, {"libeay32.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, + {"libuv.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, #ifdef HAVE_LIBXML2 {"libxml2.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE}, #endif diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index 798129677d..e41b625e3a 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -243,7 +243,7 @@ copy @OPENSSL_DLL@ ..\Build\Release\ copy @OPENSSL_PATH@\LICENSE ..\Build\Release\OpenSSL-LICENSE echo Copying libuv DLL. -copy @LIBUV_DLL@ ..\Build\Debug\ +copy @LIBUV_DLL@ ..\Build\Release\ @IF LIBXML2 echo Copying the libxml DLL. diff --git a/win32utils/Configure b/win32utils/Configure index df52ef0fc9..70780e8d05 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -2690,6 +2690,7 @@ sub makeinstallfile { print LOUT "libdns.dll-BCFT\n"; print LOUT "libirs.dll-BCFT\n"; print LOUT "libns.dll-BCFT\n"; + print LOUT "libuv.dll-BCFT\n"; if ($use_openssl eq "yes") { my $v; my $d;