From: Michał Kępień Date: Thu, 26 Sep 2019 13:11:15 +0000 (+0200) Subject: Make VS solution upgrading unnecessary X-Git-Tag: v9.14.7~6^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78a3cacf8db83d32fa2b162d7722fff1bbd5741f;p=thirdparty%2Fbind9.git Make VS solution upgrading unnecessary Until now, the build process for BIND on Windows involved upgrading the solution file to the version of Visual Studio used on the build host. Unfortunately, the executable used for that (devenv.exe) is not part of Visual Studio Build Tools and thus there is no clean way to make that executable part of a Windows Server container. Luckily, the solution upgrade process boils down to just adding XML tags to Visual Studio project files and modifying certain XML attributes - in files which we pregenerate anyway using win32utils/Configure. Thus, extend win32utils/Configure with three new command line parameters that enable it to mimic what "devenv.exe bind9.sln /upgrade" does. This makes the devenv.exe build step redundant and thus facilitates building BIND in Windows Server containers. (cherry picked from commit 0476e8f1ac81b2ac131e35b766c4c5eef9703e21) --- diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in index 235ac814c8a..5688d69debc 100644 --- a/bin/check/win32/checkconf.vcxproj.in +++ b/bin/check/win32/checkconf.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {03A96113-CB14-43AA-AEB2-48950E3915C5} Win32Proj checkconf + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/check/win32/checktool.vcxproj.in b/bin/check/win32/checktool.vcxproj.in index af1c5c7abf3..52f5e87a426 100644 --- a/bin/check/win32/checktool.vcxproj.in +++ b/bin/check/win32/checktool.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -17,18 +17,21 @@ {2C1F7096-C5B5-48D4-846F-A7ACA454335D} Win32Proj checktool + @WINDOWS_TARGET_PLATFORM_VERSION@ StaticLibrary true MultiByte + @PLATFORM_TOOLSET@ StaticLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in index dcec2eca9ec..07cb4bf5131 100644 --- a/bin/check/win32/checkzone.vcxproj.in +++ b/bin/check/win32/checkzone.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {66028555-7DD5-4016-B601-9EF9A1EE8BFA} Win32Proj checkzone + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/confgen/win32/confgentool.vcxproj.in b/bin/confgen/win32/confgentool.vcxproj.in index 5798e7b9070..20a0d3c249b 100644 --- a/bin/confgen/win32/confgentool.vcxproj.in +++ b/bin/confgen/win32/confgentool.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {64964B03-4815-41F0-9057-E766A94AF197} Win32Proj confgentool + @WINDOWS_TARGET_PLATFORM_VERSION@ StaticLibrary true MultiByte + @PLATFORM_TOOLSET@ StaticLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/confgen/win32/ddnsconfgen.vcxproj.in b/bin/confgen/win32/ddnsconfgen.vcxproj.in index aefd77b69ba..20a412e4acd 100644 --- a/bin/confgen/win32/ddnsconfgen.vcxproj.in +++ b/bin/confgen/win32/ddnsconfgen.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1} Win32Proj ddnsconfgen + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.in b/bin/confgen/win32/rndcconfgen.vcxproj.in index 10b7b834fb8..202ac3d0f3a 100644 --- a/bin/confgen/win32/rndcconfgen.vcxproj.in +++ b/bin/confgen/win32/rndcconfgen.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {1E2C1635-3093-4D59-80E7-4743AC10F22F} Win32Proj rndcconfgen + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/delv/win32/delv.vcxproj.in b/bin/delv/win32/delv.vcxproj.in index 051c1eb38dd..58555ab2ce5 100644 --- a/bin/delv/win32/delv.vcxproj.in +++ b/bin/delv/win32/delv.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {BE172EFE-C1DC-4812-BFB9-8C5F8ADB7E9F} Win32Proj delv + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in index f85829786a1..694ad44240c 100644 --- a/bin/dig/win32/dig.vcxproj.in +++ b/bin/dig/win32/dig.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {F938F9B8-D395-4A40-BEC7-0122D289C692} Win32Proj dig + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dig/win32/dighost.vcxproj.in b/bin/dig/win32/dighost.vcxproj.in index 98a9f0e17d2..8492936a07f 100644 --- a/bin/dig/win32/dighost.vcxproj.in +++ b/bin/dig/win32/dighost.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {140DE800-E552-43CC-B0C7-A33A92E368CA} Win32Proj dighost + @WINDOWS_TARGET_PLATFORM_VERSION@ StaticLibrary true MultiByte + @PLATFORM_TOOLSET@ StaticLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in index d13d88675ba..b883ace0eba 100644 --- a/bin/dig/win32/host.vcxproj.in +++ b/bin/dig/win32/host.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {BA1048A8-6961-4A20-BE12-08BE20611C9D} Win32Proj host + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in index c3c719c71bd..886ff8c484c 100644 --- a/bin/dig/win32/nslookup.vcxproj.in +++ b/bin/dig/win32/nslookup.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5} Win32Proj nslookup + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/cds.vcxproj.in b/bin/dnssec/win32/cds.vcxproj.in index 6c9f5d99e21..196fd3dbc6b 100644 --- a/bin/dnssec/win32/cds.vcxproj.in +++ b/bin/dnssec/win32/cds.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {0EB1727E-2BBD-47A6-AD12-418F9DEB0531} Win32Proj cds + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/dnssectool.vcxproj.in b/bin/dnssec/win32/dnssectool.vcxproj.in index 57ed65c492c..d442915d32e 100644 --- a/bin/dnssec/win32/dnssectool.vcxproj.in +++ b/bin/dnssec/win32/dnssectool.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -20,18 +20,21 @@ {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} Win32Proj dnssectool + @WINDOWS_TARGET_PLATFORM_VERSION@ StaticLibrary true MultiByte + @PLATFORM_TOOLSET@ StaticLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in index 25bb801feeb..ab1491feef9 100644 --- a/bin/dnssec/win32/dsfromkey.vcxproj.in +++ b/bin/dnssec/win32/dsfromkey.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {6E6297F4-69D7-4533-85E1-BD17C30017C8} Win32Proj dsfromkey + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/importkey.vcxproj.in b/bin/dnssec/win32/importkey.vcxproj.in index faffd9961cc..df34daf611d 100644 --- a/bin/dnssec/win32/importkey.vcxproj.in +++ b/bin/dnssec/win32/importkey.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {AB6690A0-055E-458f-BAC5-BF38BCC5834F} Win32Proj importkey + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in index e80a22618f7..79c54df8888 100644 --- a/bin/dnssec/win32/keyfromlabel.vcxproj.in +++ b/bin/dnssec/win32/keyfromlabel.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {17455DC6-5FBB-47C3-8F44-7DB574A188D3} Win32Proj keyfromlabel + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in index 01567ede2a1..ae9eb7ce161 100644 --- a/bin/dnssec/win32/keygen.vcxproj.in +++ b/bin/dnssec/win32/keygen.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {0BF11E21-168C-4CAA-B784-429D126BBAE5} Win32Proj keygen + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in index ba1aef106d2..1be77f3a959 100644 --- a/bin/dnssec/win32/revoke.vcxproj.in +++ b/bin/dnssec/win32/revoke.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {D171F185-D3C2-4463-9CF3-ED1D0B1D6832} Win32Proj revoke + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in index 4bba65f8103..8a1779520cb 100644 --- a/bin/dnssec/win32/settime.vcxproj.in +++ b/bin/dnssec/win32/settime.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {03FB7588-C5A7-4572-968F-14F1206BC69C} Win32Proj settime + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in index fafed9741da..16318792e46 100644 --- a/bin/dnssec/win32/signzone.vcxproj.in +++ b/bin/dnssec/win32/signzone.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {205ED8A9-2E4C-41CC-9385-F3613402AA90} Win32Proj signzone + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/dnssec/win32/verify.vcxproj.in b/bin/dnssec/win32/verify.vcxproj.in index e34320bdb7a..a281a4753c2 100644 --- a/bin/dnssec/win32/verify.vcxproj.in +++ b/bin/dnssec/win32/verify.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {FD653434-F1A8-44A9-85B2-A7468491DA6D} Win32Proj verify + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in index 0c7b0b2913d..76fe390cad5 100644 --- a/bin/named/win32/named.vcxproj.in +++ b/bin/named/win32/named.vcxproj.in @@ -1,5 +1,5 @@ - + Debug @@ -14,18 +14,21 @@ {723C65DA-A96C-4BA3-A34E-44F11CA346F9} Win32Proj named + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in index e4988fc32a4..f0c7fb6de53 100644 --- a/bin/nsupdate/win32/nsupdate.vcxproj.in +++ b/bin/nsupdate/win32/nsupdate.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {C41266C7-E27E-4D60-9815-82D3B32BF82F} Win32Proj nsupdate + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in index 2f09499a029..201618f1374 100644 --- a/bin/pkcs11/win32/pk11destroy.vcxproj.in +++ b/bin/pkcs11/win32/pk11destroy.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {5B3137E5-7E1F-49AA-8810-A09AA417D326} Win32Proj pk11destroy + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.in b/bin/pkcs11/win32/pk11keygen.vcxproj.in index d60ba3a69c0..fbbd337976e 100644 --- a/bin/pkcs11/win32/pk11keygen.vcxproj.in +++ b/bin/pkcs11/win32/pk11keygen.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {5042D371-0402-4FA3-A52A-769708694422} Win32Proj pk11keygen + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/pkcs11/win32/pk11list.vcxproj.in b/bin/pkcs11/win32/pk11list.vcxproj.in index 2c66e3335fd..18cac318a5b 100644 --- a/bin/pkcs11/win32/pk11list.vcxproj.in +++ b/bin/pkcs11/win32/pk11list.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {C663B088-F7BC-4C8C-8D06-A76636EED651} Win32Proj pk11list + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/pkcs11/win32/pk11tokens.vcxproj.in b/bin/pkcs11/win32/pk11tokens.vcxproj.in index 937fdbd455d..ff0c6eeadcc 100644 --- a/bin/pkcs11/win32/pk11tokens.vcxproj.in +++ b/bin/pkcs11/win32/pk11tokens.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {403FD4B1-A4F9-4159-9013-5860E3A4417D} Win32Proj pk11tokens + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/rndc/win32/rndc.vcxproj.in b/bin/rndc/win32/rndc.vcxproj.in index 2948c7c9adf..239225d32c1 100644 --- a/bin/rndc/win32/rndc.vcxproj.in +++ b/bin/rndc/win32/rndc.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {39721F26-8B80-4AA9-9826-2AEF7322C3D5} Win32Proj rndc + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/rndc/win32/rndcutil.vcxproj.in b/bin/rndc/win32/rndcutil.vcxproj.in index eac31afb8b6..f6afdf73dd5 100644 --- a/bin/rndc/win32/rndcutil.vcxproj.in +++ b/bin/rndc/win32/rndcutil.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {7C8681A1-E3A8-470E-9EEF-16054D111A19} Win32Proj rndcutil + @WINDOWS_TARGET_PLATFORM_VERSION@ StaticLibrary true MultiByte + @PLATFORM_TOOLSET@ StaticLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/system/win32/bigkey.vcxproj.in b/bin/tests/system/win32/bigkey.vcxproj.in index f9d6a06678b..8df39eaabe4 100644 --- a/bin/tests/system/win32/bigkey.vcxproj.in +++ b/bin/tests/system/win32/bigkey.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {61F9D673-EB5C-47A5-8907-24E034C75EF8} Win32Proj bigkey + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/system/win32/feature-test.vcxproj.in b/bin/tests/system/win32/feature-test.vcxproj.in index aeddcb41346..f9ad4e8e2fb 100644 --- a/bin/tests/system/win32/feature-test.vcxproj.in +++ b/bin/tests/system/win32/feature-test.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {63A921F6-1200-4723-828A-98960127B73D} Win32Proj feature-test + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/system/win32/gencheck.vcxproj.in b/bin/tests/system/win32/gencheck.vcxproj.in index b2f513c8ea4..be3c7490a47 100644 --- a/bin/tests/system/win32/gencheck.vcxproj.in +++ b/bin/tests/system/win32/gencheck.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {764DBE24-C8B3-46E8-BE73-196431353A5D} Win32Proj gencheck + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/system/win32/keycreate.vcxproj.in b/bin/tests/system/win32/keycreate.vcxproj.in index d9d275d8ac7..3fd7b66d0eb 100644 --- a/bin/tests/system/win32/keycreate.vcxproj.in +++ b/bin/tests/system/win32/keycreate.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {4F9A0F6F-366D-4483-B131-793832840508} Win32Proj keycreate + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/system/win32/keydelete.vcxproj.in b/bin/tests/system/win32/keydelete.vcxproj.in index aa1d707a425..fb5e6a0a86c 100644 --- a/bin/tests/system/win32/keydelete.vcxproj.in +++ b/bin/tests/system/win32/keydelete.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {85ADFF2A-BE31-4B8D-9089-9AD56CE78D7E} Win32Proj keydelete + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/system/win32/pipequeries.vcxproj.in b/bin/tests/system/win32/pipequeries.vcxproj.in index 4baeeff9b8f..3e74ac7f9e8 100644 --- a/bin/tests/system/win32/pipequeries.vcxproj.in +++ b/bin/tests/system/win32/pipequeries.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {E1478F40-786C-4738-8E99-E7A71DD98661} Win32Proj pipequeries + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/win32/backtrace_test.vcxproj.in b/bin/tests/win32/backtrace_test.vcxproj.in index 32ef8fd1eb9..2cbd83550d2 100644 --- a/bin/tests/win32/backtrace_test.vcxproj.in +++ b/bin/tests/win32/backtrace_test.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {14751171-C40E-40EE-A2F0-37FFC3CCD4A2} Win32Proj backtrace_test + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/win32/inter_test.vcxproj.in b/bin/tests/win32/inter_test.vcxproj.in index 3cc39bfe07b..901c153bdaa 100644 --- a/bin/tests/win32/inter_test.vcxproj.in +++ b/bin/tests/win32/inter_test.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1} Win32Proj inter_test + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/win32/makejournal.vcxproj.in b/bin/tests/win32/makejournal.vcxproj.in index 8ce7f454b68..f305597e70e 100644 --- a/bin/tests/win32/makejournal.vcxproj.in +++ b/bin/tests/win32/makejournal.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {31715139-2C27-47D2-8394-71B71A8AC3D5} Win32Proj makejournal + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/win32/rwlock_test.vcxproj.in b/bin/tests/win32/rwlock_test.vcxproj.in index 28255eb9ded..5aa6cc9dbb7 100644 --- a/bin/tests/win32/rwlock_test.vcxproj.in +++ b/bin/tests/win32/rwlock_test.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {7705EEF6-6980-48F9-A045-699DAFE860C9} Win32Proj rwlock_test + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/win32/shutdown_test.vcxproj.in b/bin/tests/win32/shutdown_test.vcxproj.in index 949518d5c36..9e977ab0672 100644 --- a/bin/tests/win32/shutdown_test.vcxproj.in +++ b/bin/tests/win32/shutdown_test.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {551561F6-4A2A-4824-8A34-A4AF0EB7C179} Win32Proj shutdown_test + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/win32/sock_test.vcxproj.in b/bin/tests/win32/sock_test.vcxproj.in index 84898db399e..f26ae581a36 100644 --- a/bin/tests/win32/sock_test.vcxproj.in +++ b/bin/tests/win32/sock_test.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {6200ED9D-CAB1-4C00-8D79-478F64A19B8F} Win32Proj sock_test + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/win32/task_test.vcxproj.in b/bin/tests/win32/task_test.vcxproj.in index 1df893ee062..7722d468cee 100644 --- a/bin/tests/win32/task_test.vcxproj.in +++ b/bin/tests/win32/task_test.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {CC7340C1-CBAF-4145-969A-73AE960401D6} Win32Proj task_test + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tests/win32/timer_test.vcxproj.in b/bin/tests/win32/timer_test.vcxproj.in index b4e01fb7055..1d42073fff1 100644 --- a/bin/tests/win32/timer_test.vcxproj.in +++ b/bin/tests/win32/timer_test.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {E55653C8-5501-4871-A97C-C926631F40F9} Win32Proj timer_test + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tools/win32/arpaname.vcxproj.in b/bin/tools/win32/arpaname.vcxproj.in index 2f3990287ef..d7835a52ea9 100644 --- a/bin/tools/win32/arpaname.vcxproj.in +++ b/bin/tools/win32/arpaname.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {91E60FDA-E48C-4DA0-92A2-97F963348E00} Win32Proj arpaname + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tools/win32/journalprint.vcxproj.in b/bin/tools/win32/journalprint.vcxproj.in index 5972f9651fa..4298dfe063b 100644 --- a/bin/tools/win32/journalprint.vcxproj.in +++ b/bin/tools/win32/journalprint.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {B19042CE-D3D9-469B-BCD2-C3140150939A} Win32Proj journalprint + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tools/win32/mdig.vcxproj.in b/bin/tools/win32/mdig.vcxproj.in index 74115a30668..0911360aca3 100644 --- a/bin/tools/win32/mdig.vcxproj.in +++ b/bin/tools/win32/mdig.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {3115091C-8135-481F-9757-F013A26255E0} Win32Proj mdig + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in index 45ebdd8c6b4..078d5d7c84d 100644 --- a/bin/tools/win32/nsec3hash.vcxproj.in +++ b/bin/tools/win32/nsec3hash.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {4EE91023-94C3-48C0-B71C-5333B726C2EE} Win32Proj nsec3hash + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/tools/win32/rrchecker.vcxproj.in b/bin/tools/win32/rrchecker.vcxproj.in index c13876ef6d7..fff51289ed9 100644 --- a/bin/tools/win32/rrchecker.vcxproj.in +++ b/bin/tools/win32/rrchecker.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {98743A7C-6AF8-467f-9911-FA69C451AF2B} Win32Proj rrchecker + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in index 9e81634fe09..2b901d98479 100644 --- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in +++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,12 +14,14 @@ {190CC424-E8CC-46F2-9013-3152D6905118} Win32Proj BINDInstall + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Static @@ -27,6 +29,7 @@ false true MultiByte + @PLATFORM_TOOLSET@ Static diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in index 7edd5a73454..f4cfc638d0e 100644 --- a/lib/bind9/win32/libbind9.vcxproj.in +++ b/lib/bind9/win32/libbind9.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {E741C10B-B075-4206-9596-46765B665E03} Win32Proj libbind9 + @WINDOWS_TARGET_PLATFORM_VERSION@ DynamicLibrary true MultiByte + @PLATFORM_TOOLSET@ DynamicLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/dns/win32/gen.vcxproj.in b/lib/dns/win32/gen.vcxproj.in index 2d6d8e0b214..67c06d0ef5b 100644 --- a/lib/dns/win32/gen.vcxproj.in +++ b/lib/dns/win32/gen.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} Win32Proj gen + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in index a5c565110e0..728d65925e3 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -1,5 +1,5 @@ - + Debug @@ -14,18 +14,21 @@ {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} Win32Proj libdns + @WINDOWS_TARGET_PLATFORM_VERSION@ DynamicLibrary true MultiByte + @PLATFORM_TOOLSET@ DynamicLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in index 57176f5accb..30ef238c9d4 100644 --- a/lib/irs/win32/libirs.vcxproj.in +++ b/lib/irs/win32/libirs.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} Win32Proj libirs + @WINDOWS_TARGET_PLATFORM_VERSION@ DynamicLibrary true MultiByte + @PLATFORM_TOOLSET@ DynamicLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index e6ef9ed7fbb..b8ccc380375 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -1,5 +1,5 @@ - + Debug @@ -14,18 +14,21 @@ {3840E563-D180-4761-AA9C-E6155F02EAFF} Win32Proj libisc + @WINDOWS_TARGET_PLATFORM_VERSION@ DynamicLibrary true MultiByte + @PLATFORM_TOOLSET@ DynamicLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in index 71fd918b983..4a6eaa33ee2 100644 --- a/lib/isccc/win32/libisccc.vcxproj.in +++ b/lib/isccc/win32/libisccc.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {B556705F-1920-4400-878A-B259D3556047} Win32Proj libisccc + @WINDOWS_TARGET_PLATFORM_VERSION@ DynamicLibrary true MultiByte + @PLATFORM_TOOLSET@ DynamicLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in index d3811d58444..30bb01cc921 100644 --- a/lib/isccfg/win32/libisccfg.vcxproj.in +++ b/lib/isccfg/win32/libisccfg.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {B2DFA58C-6347-478E-81E8-01E06999D4F1} Win32Proj libisccfg + @WINDOWS_TARGET_PLATFORM_VERSION@ DynamicLibrary true MultiByte + @PLATFORM_TOOLSET@ DynamicLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in index 6b884c1df4d..95cda5dcc98 100644 --- a/lib/ns/win32/libns.vcxproj.in +++ b/lib/ns/win32/libns.vcxproj.in @@ -1,5 +1,5 @@ - + Debug @@ -14,17 +14,20 @@ {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} Win32Proj libns + @WINDOWS_TARGET_PLATFORM_VERSION@ DynamicLibrary true MultiByte + @PLATFORM_TOOLSET@ DynamicLibrary false MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/samples/win32/async.vcxproj.in b/lib/samples/win32/async.vcxproj.in index 7f2561be0a8..d24107cccad 100644 --- a/lib/samples/win32/async.vcxproj.in +++ b/lib/samples/win32/async.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06} Win32Proj async + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/samples/win32/gai.vcxproj.in b/lib/samples/win32/gai.vcxproj.in index 6f1cd81aa25..1c34be6847a 100644 --- a/lib/samples/win32/gai.vcxproj.in +++ b/lib/samples/win32/gai.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE} Win32Proj gai + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/samples/win32/nsprobe.vcxproj.in b/lib/samples/win32/nsprobe.vcxproj.in index e5edadd8207..dbd16a75681 100644 --- a/lib/samples/win32/nsprobe.vcxproj.in +++ b/lib/samples/win32/nsprobe.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD} Win32Proj nsprobe + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/samples/win32/request.vcxproj.in b/lib/samples/win32/request.vcxproj.in index 4314ea87fa3..ce7c859dbf6 100644 --- a/lib/samples/win32/request.vcxproj.in +++ b/lib/samples/win32/request.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {FF440E85-7450-439C-82EE-04C464512D0E} Win32Proj request + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/samples/win32/resolve.vcxproj.in b/lib/samples/win32/resolve.vcxproj.in index da1fc2d8dea..73a21032421 100644 --- a/lib/samples/win32/resolve.vcxproj.in +++ b/lib/samples/win32/resolve.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {F66D8B7E-721D-4602-99AD-820D19AD1313} Win32Proj resolve + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/samples/win32/update.vcxproj.in b/lib/samples/win32/update.vcxproj.in index 74a99227525..b274653dc56 100644 --- a/lib/samples/win32/update.vcxproj.in +++ b/lib/samples/win32/update.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {05682E12-523F-4DAE-8E6D-ADFDBC308AFD} Win32Proj update + @WINDOWS_TARGET_PLATFORM_VERSION@ Application true MultiByte + @PLATFORM_TOOLSET@ Application false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/lib/win32/bindevt/bindevt.vcxproj.in b/lib/win32/bindevt/bindevt.vcxproj.in index bc1394d58e3..e1dedada929 100644 --- a/lib/win32/bindevt/bindevt.vcxproj.in +++ b/lib/win32/bindevt/bindevt.vcxproj.in @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0} Win32Proj bindevt + @WINDOWS_TARGET_PLATFORM_VERSION@ DynamicLibrary true MultiByte + @PLATFORM_TOOLSET@ DynamicLibrary false true MultiByte + @PLATFORM_TOOLSET@ diff --git a/win32utils/Configure b/win32utils/Configure index 1941f2e2d10..109e924d5c3 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -293,7 +293,9 @@ my @substdll = ("COMERR_DLL", # variables -my %configvar; +my %configvar = ( + "TOOLS_VERSION" => "4.0", +); my @substvar = ("BIND9_VERSION", "BUILD_MACHINE", @@ -311,11 +313,14 @@ my @substvar = ("BIND9_VERSION", "OPENSSL_PATH", "PLATFORM", "PKCS11_TOOLS", + "PLATFORM_TOOLSET", "prefix", "PSSUSPEND", "PYTHON", "PYTHON_INSTALL_DIR", - "VCREDIST_PATH"), + "TOOLS_VERSION", + "VCREDIST_PATH", + "WINDOWS_TARGET_PLATFORM_VERSION"), # defines @@ -435,8 +440,12 @@ my @help = ( " with-iconv[=PATH] path of the iconv DLL [default=same than idn]\n", " with-zlib[=PATH] build with zlib library yes|no|path\n", " with-vcredist[=PATH] visual C++ redistributable package yes|path\n", -" with-tuning=OPTION tune for plaform size (large|default)\n", -" with-cross-compile 32 / 64 bit build / host plaforms\n"); +" with-tuning=OPTION tune for platform size (large|default)\n", +" with-cross-compile 32 / 64 bit build / host platforms\n", +"\nOptional Visual Studio project parameters:\n", +" with-tools-version=VERSION set the ToolsVersion attribute to VERSION\n", +" with-platform-toolset=VERSION use supplied toolset VERSION for building\n", +" with-platform-version=VERSION use supplied Windows SDK VERSION for building\n"); # Parse arguments @@ -857,6 +866,12 @@ sub mywith { if ($val =~ /^large$/i) { $tuning = "large"; } + } elsif ($key =~ /^tools-version$/i) { + $configvar{"TOOLS_VERSION"} = $val; + } elsif ($key =~ /^platform-version$/i) { + $configvar{"WINDOWS_TARGET_PLATFORM_VERSION"} = "$val"; + } elsif ($key =~ /^platform-toolset$/i) { + $configvar{"PLATFORM_TOOLSET"} = "$val"; } else { $want_unknown = "yes"; if ($val eq "no") {