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.

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 050313659ab67b6dae2251b8b099adab21fc57c8..0587c9669b9c748a9e1b94350fd03a67b2e96e68 100644 (file)
--- 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 798129677de231e210fc4988c8da4f4600fb664d..e41b625e3a47e9bfdfd60a2acbf41a432714ae46 100644 (file)
--- 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 df52ef0fc9b82cc36065bbc162dc8d311b49c00d..70780e8d052580712782c96190b87b758a1c57b8 100644 (file)
--- 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;