From: Witold Krecicki <wpk@isc.org>
Date: Mon, 5 Sep 2016 08:56:26 +0000 (+0200)
Subject: [rt42931] Update bind9.sln to visual studio 2012 (v110), configure system tests for... 
X-Git-Tag: v9.12.0a0~30
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b9e5e2aa5dd08a160e59bf4babc1f76aba25a685;p=thirdparty%2Fbind9.git

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

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