[rt42931] Update bind9.sln to visual studio 2012 (v110), configure system tests for...

diff --git a/win32utils/Configure b/win32utils/Configure
index dc6bb3fdcd7b2eac0945378f9dbce62d28451d0a..a05bae61c4d13809302e053b32e20c91120367aa 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -111,6 +111,7 @@ my @filelist = ("..\\bin\\check\\win32\\checktool.dsp",
                 "..\\bin\\tests\\resolver\\win32\\t_resolver.mak",
                 "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.dsp",
                 "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.mak",
+                "..\\bin\\tests\\system\\conf.sh",
                 "..\\bin\\tests\\tasks\\win32\\t_tasks.dsp",
                 "..\\bin\\tests\\tasks\\win32\\t_tasks.mak",
                 "..\\bin\\tests\\timers\\win32\\t_timers.dsp",
@@ -2544,7 +2545,7 @@ sub setupfile {
     my @passes;
     my $val;
 
-    open F, $filename . ".in" || die $!;
+    open F, $filename . ".win.in" || open F, $filename . ".in" || die $!;
     @Linesin = <F>;
     close F;
 

diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in
index b0693500d651dea552596e761ebe8bf9d68a1c95..81edbcb65598ee8fa13d7d7ec480cff57c7d6932 100644 (file)
--- a/win32utils/bind9.sln.in
+++ b/win32utils/bind9.sln.in
@@ -1,5 +1,5 @@
 \r
-Microsoft Visual Studio Solution File, Format Version 11.00\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
 # Visual C++ Express 2010\r
 # BINDInstall must be the first project\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "..\bin\win32\BINDInstall\BINDInstall.vcxproj", "{190CC424-E8CC-46F2-9013-3152D6905118}"\r