diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92e9d713ba..6438b33882 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -238,6 +238,7 @@ stages: artifacts: untracked: true expire_in: "1 day" + when: always .setup_interfaces: &setup_interfaces | if [ "$(id -u)" -eq "0" ]; then @@ -1160,6 +1161,39 @@ system:clang:openbsd6.6:amd64: - schedules - web +# Jobs for Visual Studio 2017 builds on Windows (amd64) + +msvc:windows:amd64: + <<: *windows_build_job + <<: *default_triggering_rules + variables: + VSCONF: Release + +system:msvc:windows:amd64: + <<: *windows_system_test_job + variables: + VSCONF: Release + needs: + - job: msvc:windows:amd64 + artifacts: true + +msvc-debug:windows:amd64: + <<: *windows_build_job + variables: + VSCONF: Debug + only: + - schedules + - tags + - web + +system:msvc-debug:windows:amd64: + <<: *windows_system_test_job + variables: + VSCONF: Debug + needs: + - job: msvc-debug:windows:amd64 + artifacts: true + # Job producing a release tarball release: diff --git a/Makefile.am b/Makefile.am index 5cd00bd25f..6ea8e8d4ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ BUILT_SOURCES = bind.keys.h CLEANFILES = bind.keys.h bind.keys.h: bind.keys Makefile - ${PERL} ${top_srcdir}/util/bindkeys.pl < ${top_srcdir}/bind.keys > $@ + ${PERL} ${top_srcdir}/util/bindkeys.pl ${top_srcdir}/bind.keys > $@ dist_sysconf_DATA = bind.keys diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in index d1b2522c65..6ee994afbf 100644 --- a/bin/check/win32/checkconf.vcxproj.in +++ b/bin/check/win32/checkconf.vcxproj.in @@ -118,6 +118,26 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {E741C10B-B075-4206-9596-46765B665E03} + + + {2C1F7096-C5B5-48D4-846F-A7ACA454335D} + + diff --git a/bin/check/win32/checktool.vcxproj.in b/bin/check/win32/checktool.vcxproj.in index 26c84230c7..103ec11ede 100644 --- a/bin/check/win32/checktool.vcxproj.in +++ b/bin/check/win32/checktool.vcxproj.in @@ -104,6 +104,20 @@ .\$(Configuration)\$(TargetName)$(TargetExt) + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in index 5f4882b8a3..532e506397 100644 --- a/bin/check/win32/checkzone.vcxproj.in +++ b/bin/check/win32/checkzone.vcxproj.in @@ -129,6 +129,23 @@ copy /Y named-checkzone.exe named-compilezone.exe + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {2C1F7096-C5B5-48D4-846F-A7ACA454335D} + + diff --git a/bin/confgen/win32/confgentool.vcxproj.in b/bin/confgen/win32/confgentool.vcxproj.in index 26e4461758..b33fa3dd5b 100644 --- a/bin/confgen/win32/confgentool.vcxproj.in +++ b/bin/confgen/win32/confgentool.vcxproj.in @@ -114,6 +114,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/confgen/win32/ddnsconfgen.vcxproj.in b/bin/confgen/win32/ddnsconfgen.vcxproj.in index c634322dea..a49330cae7 100644 --- a/bin/confgen/win32/ddnsconfgen.vcxproj.in +++ b/bin/confgen/win32/ddnsconfgen.vcxproj.in @@ -69,15 +69,15 @@ $(OutDir)$(TargetName).pdb true ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories) + .\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) CompileAsC Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies) + $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) cd ..\..\..\Build\$(Configuration) @@ -104,7 +104,7 @@ copy /Y ddns-confgen.ilk tsig-keygen.ilk .\$(Configuration)\ $(OutDir)$(TargetName).pdb ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories) + .\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) CompileAsC @@ -114,8 +114,8 @@ copy /Y ddns-confgen.ilk tsig-keygen.ilk true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies) + $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) cd ..\..\..\Build\$(Configuration) @@ -126,6 +126,17 @@ copy /Y ddns-confgen.exe tsig-keygen.exe + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {64964B03-4815-41F0-9057-E766A94AF197} + + diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.in b/bin/confgen/win32/rndcconfgen.vcxproj.in index 6e7eefdbed..df2ba60b03 100644 --- a/bin/confgen/win32/rndcconfgen.vcxproj.in +++ b/bin/confgen/win32/rndcconfgen.vcxproj.in @@ -69,15 +69,15 @@ $(OutDir)$(TargetName).pdb true ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories) + .\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) CompileAsC Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies) + $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -98,7 +98,7 @@ .\$(Configuration)\ $(OutDir)$(TargetName).pdb ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories) + .\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) CompileAsC @@ -108,13 +108,24 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies) + $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@confgentool.lib;libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {64964B03-4815-41F0-9057-E766A94AF197} + + diff --git a/bin/delv/win32/delv.vcxproj.in b/bin/delv/win32/delv.vcxproj.in index c110759b40..0ae7565b76 100644 --- a/bin/delv/win32/delv.vcxproj.in +++ b/bin/delv/win32/delv.vcxproj.in @@ -113,6 +113,20 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} + + diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in index c4db20b820..33632379e4 100644 --- a/bin/dig/win32/dig.vcxproj.in +++ b/bin/dig/win32/dig.vcxproj.in @@ -116,6 +116,26 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} + + + {E741C10B-B075-4206-9596-46765B665E03} + + + {140DE800-E552-43CC-B0C7-A33A92E368CA} + + diff --git a/bin/dig/win32/dighost.vcxproj.in b/bin/dig/win32/dighost.vcxproj.in index 1ed120c0e6..0e26a2cb3b 100644 --- a/bin/dig/win32/dighost.vcxproj.in +++ b/bin/dig/win32/dighost.vcxproj.in @@ -109,6 +109,23 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} + + + {E741C10B-B075-4206-9596-46765B665E03} + + diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in index 545cb716b2..1851fd3275 100644 --- a/bin/dig/win32/host.vcxproj.in +++ b/bin/dig/win32/host.vcxproj.in @@ -113,6 +113,26 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} + + + {E741C10B-B075-4206-9596-46765B665E03} + + + {140DE800-E552-43CC-B0C7-A33A92E368CA} + + diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in index e441ba396c..babc99883e 100644 --- a/bin/dig/win32/nslookup.vcxproj.in +++ b/bin/dig/win32/nslookup.vcxproj.in @@ -114,6 +114,26 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} + + + {E741C10B-B075-4206-9596-46765B665E03} + + + {140DE800-E552-43CC-B0C7-A33A92E368CA} + + diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index dacb871619..dcf54cd936 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -331,7 +331,7 @@ usage(void) { fprintf(stderr, " %s [options] -f zonefile [zonename]\n\n", program); fprintf(stderr, " %s [options] -s dnsname\n\n", program); fprintf(stderr, " %s [-h|-V]\n\n", program); - fprintf(stderr, "Version: %s\n", VERSION); + fprintf(stderr, "Version: %s\n", PACKAGE_VERSION); fprintf(stderr, "Options:\n" " -1: digest algorithm SHA-1\n" " -2: digest algorithm SHA-256\n" diff --git a/bin/dnssec/win32/cds.vcxproj.in b/bin/dnssec/win32/cds.vcxproj.in index 71388051e9..2c9ce759f3 100644 --- a/bin/dnssec/win32/cds.vcxproj.in +++ b/bin/dnssec/win32/cds.vcxproj.in @@ -115,6 +115,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/dnssec/win32/dnssectool.vcxproj.in b/bin/dnssec/win32/dnssectool.vcxproj.in index be87bca0a2..d871174bd7 100644 --- a/bin/dnssec/win32/dnssectool.vcxproj.in +++ b/bin/dnssec/win32/dnssectool.vcxproj.in @@ -112,6 +112,14 @@ false + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in index 801982a301..16585e6348 100644 --- a/bin/dnssec/win32/dsfromkey.vcxproj.in +++ b/bin/dnssec/win32/dsfromkey.vcxproj.in @@ -141,6 +141,17 @@ set PYTHONPATH=. + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/dnssec/win32/importkey.vcxproj.in b/bin/dnssec/win32/importkey.vcxproj.in index 13bc303e61..6be1ce1e76 100644 --- a/bin/dnssec/win32/importkey.vcxproj.in +++ b/bin/dnssec/win32/importkey.vcxproj.in @@ -115,6 +115,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in index ee32a3567e..d4e0f85911 100644 --- a/bin/dnssec/win32/keyfromlabel.vcxproj.in +++ b/bin/dnssec/win32/keyfromlabel.vcxproj.in @@ -115,6 +115,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in index d84c4d3795..58c1e408e1 100644 --- a/bin/dnssec/win32/keygen.vcxproj.in +++ b/bin/dnssec/win32/keygen.vcxproj.in @@ -115,6 +115,20 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in index dcbd5a07f7..cf4174a4e6 100644 --- a/bin/dnssec/win32/revoke.vcxproj.in +++ b/bin/dnssec/win32/revoke.vcxproj.in @@ -115,6 +115,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in index 148f28cc3c..22b45d93dd 100644 --- a/bin/dnssec/win32/settime.vcxproj.in +++ b/bin/dnssec/win32/settime.vcxproj.in @@ -115,6 +115,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in index 2014f5757d..f7b0f5c018 100644 --- a/bin/dnssec/win32/signzone.vcxproj.in +++ b/bin/dnssec/win32/signzone.vcxproj.in @@ -115,6 +115,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/dnssec/win32/verify.vcxproj.in b/bin/dnssec/win32/verify.vcxproj.in index eeb9c1afce..748e48f110 100644 --- a/bin/dnssec/win32/verify.vcxproj.in +++ b/bin/dnssec/win32/verify.vcxproj.in @@ -115,6 +115,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + diff --git a/bin/named/win32/named.vcxproj.filters.in b/bin/named/win32/named.vcxproj.filters.in index 60b2ec26ac..6677ef31a4 100644 --- a/bin/named/win32/named.vcxproj.filters.in +++ b/bin/named/win32/named.vcxproj.filters.in @@ -62,6 +62,9 @@ Source Files + + Source Files + Source Files @@ -114,6 +117,9 @@ Header Files + + Header Files + Header Files diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in index a4f3575da6..dfb5153e15 100644 --- a/bin/named/win32/named.vcxproj.in +++ b/bin/named/win32/named.vcxproj.in @@ -59,7 +59,7 @@ Level4 false Disabled - WIN32;@USE_GSSAPI@BUILDER="Visual Studio";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;BUILDER="Visual Studio";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -77,6 +77,13 @@ ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) @OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) + + cd .. +perl -e "print \"const char xslmsg[] =\n\";" > xsl.c +perl -p -e "s/\"/\\\\\"/g;" -e "s/^/\"/;" -e "s/$/\"/;" < bind9.xsl >> xsl.c +perl -e "print \";\";" >> xsl.c + + @@ -87,7 +94,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@USE_GSSAPI@BUILDER="Visual Studio";NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;BUILDER="Visual Studio";NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true @@ -109,6 +116,13 @@ ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) @OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies) + + cd .. +perl -e "print \"const char xslmsg[] =\n\";" > xsl.c +perl -p -e "s/\"/\\\\\"/g;s/^/\"/;s/$/\"/;" < bind9.xsl >> xsl.c +perl -e "print \";\";" >> xsl.c + + @@ -125,6 +139,7 @@ + @@ -146,10 +161,31 @@ + + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} + + + {B556705F-1920-4400-878A-B259D3556047} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {E741C10B-B075-4206-9596-46765B665E03} + + diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in index 38921aaa75..00a93794be 100644 --- a/bin/nsupdate/win32/nsupdate.vcxproj.in +++ b/bin/nsupdate/win32/nsupdate.vcxproj.in @@ -59,7 +59,7 @@ Level4 false Disabled - WIN32;@USE_GSSAPI@USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true .\$(Configuration)\$(TargetName).pch .\$(Configuration)\ @@ -87,7 +87,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@USE_GSSAPI@USE_READLINE_STATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;USE_READLINE_STATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) OnlyExplicitInline false true @@ -113,6 +113,23 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} + + + {E741C10B-B075-4206-9596-46765B665E03} + + diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in index 7ef65ca360..842581dc31 100644 --- a/bin/pkcs11/win32/pk11destroy.vcxproj.in +++ b/bin/pkcs11/win32/pk11destroy.vcxproj.in @@ -115,6 +115,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.in b/bin/pkcs11/win32/pk11keygen.vcxproj.in index 89504a2b10..3655c87560 100644 --- a/bin/pkcs11/win32/pk11keygen.vcxproj.in +++ b/bin/pkcs11/win32/pk11keygen.vcxproj.in @@ -115,6 +115,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/bin/pkcs11/win32/pk11list.vcxproj.in b/bin/pkcs11/win32/pk11list.vcxproj.in index f297b2a66b..7425207197 100644 --- a/bin/pkcs11/win32/pk11list.vcxproj.in +++ b/bin/pkcs11/win32/pk11list.vcxproj.in @@ -115,6 +115,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/bin/pkcs11/win32/pk11tokens.vcxproj.in b/bin/pkcs11/win32/pk11tokens.vcxproj.in index f224d0ccd8..eb3415472a 100644 --- a/bin/pkcs11/win32/pk11tokens.vcxproj.in +++ b/bin/pkcs11/win32/pk11tokens.vcxproj.in @@ -115,6 +115,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/bin/rndc/win32/rndc.vcxproj.filters.in b/bin/rndc/win32/rndc.vcxproj.filters.in index 5187c1608d..93105edc68 100644 --- a/bin/rndc/win32/rndc.vcxproj.filters.in +++ b/bin/rndc/win32/rndc.vcxproj.filters.in @@ -23,5 +23,8 @@ Source Files + + Source Files + - \ No newline at end of file + diff --git a/bin/rndc/win32/rndc.vcxproj.in b/bin/rndc/win32/rndc.vcxproj.in index d646cf273e..df7c3a9144 100644 --- a/bin/rndc/win32/rndc.vcxproj.in +++ b/bin/rndc/win32/rndc.vcxproj.in @@ -75,7 +75,7 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@util.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) @@ -107,7 +107,7 @@ ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default $(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@util.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) + @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies) @@ -115,6 +115,24 @@ + + + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B556705F-1920-4400-878A-B259D3556047} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {E741C10B-B075-4206-9596-46765B665E03} + diff --git a/bin/rndc/win32/rndcutil.vcxproj.filters.in b/bin/rndc/win32/rndcutil.vcxproj.filters.in deleted file mode 100644 index 766ea801fe..0000000000 --- a/bin/rndc/win32/rndcutil.vcxproj.filters.in +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/rndc/win32/rndcutil.vcxproj.in b/bin/rndc/win32/rndcutil.vcxproj.in deleted file mode 100644 index fad1472171..0000000000 --- a/bin/rndc/win32/rndcutil.vcxproj.in +++ /dev/null @@ -1,113 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {7C8681A1-E3A8-470E-9EEF-16054D111A19} - Win32Proj - rndcutil - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - StaticLibrary - true - MultiByte - @PLATFORM_TOOLSET@ - - - StaticLibrary - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - .\$(Configuration)\ - .\$(Configuration)\ - None - util - - - false - .\$(Configuration)\ - .\$(Configuration)\ - None - util - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(ProjectName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) - CompileAsC - - - $(OutDir)$(TargetName)$(TargetExt) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(ProjectName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) - CompileAsC - - - $(OutDir)$(TargetName)$(TargetExt) - - - - - - - - - - - - diff --git a/bin/rndc/win32/rndcutil.vcxproj.user b/bin/rndc/win32/rndcutil.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/bin/rndc/win32/rndcutil.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common index 5970f8e8da..a571b2d275 100644 --- a/bin/tests/system/conf.sh.common +++ b/bin/tests/system/conf.sh.common @@ -51,27 +51,99 @@ SEQUENTIAL_COMMON="" # rpzrecurse are scheduled first, in order to get more benefit from # parallelism. # -PARALLEL_COMMON="dnssec rpzrecurse serve-stale \ - acl additional addzone allow-query auth autosign \ - builtin cacheclean case catz cds chain \ - checkconf checknames checkzone \ - cookie database digdelv dlz dlzexternal \ - dns64 dscp dsdigest dyndb \ - ecdsa eddsa ednscompliance emptyzones \ - fetchlimit filter-aaaa formerr forward \ - geoip2 glue idna include-multiplecfg \ - inline integrity ixfr \ - kasp keepalive legacy limits \ - masterfile masterformat metadata mirror mkeys \ - names notify nslookup nsupdate nzd2nzf \ - padding pending pipelined qmin \ - reclimit redirect resolver rndc rootkeysentinel rpz \ - rrchecker rrl rrsetorder rsabigexponent runtime \ - sfcache smartsign sortlist \ - spf staticstub statistics statschannel stub synthfromdnssec \ - tcp tkey tools tsig tsiggss ttl \ - unknown upforwd verify views wildcard \ - xfer xferquota zero zonechecks" +PARALLEL_COMMON="dnssec rpzrecurse serve-stale +acl +additional +addzone +allow-query +auth +autosign +builtin +cacheclean +case +catz +cds +chain +checkconf +checknames +checkzone +cookie +database +digdelv +dlz +dlzexternal +dns64 +dscp +dsdigest +dyndb +ecdsa +eddsa +ednscompliance +emptyzones +fetchlimit +filter-aaaa +formerr +forward +geoip2 +glue +idna +include-multiplecfg +inline +integrity +ixfr +kasp +keepalive +legacy +limits +masterfile +masterformat +metadata +mirror +mkeys +names +notify +nslookup +nsupdate +nzd2nzf +padding +pending +pipelined +qmin +reclimit +redirect +resolver +rndc +rootkeysentinel +rpz +rrchecker +rrl +rrsetorder +rsabigexponent +runtime +sfcache +smartsign +sortlist +spf +staticstub +statistics +statschannel +stub +synthfromdnssec +tcp +tkey +tools +tsig +tsiggss +ttl +unknown +upforwd +verify +views +wildcard +xfer +xferquota +zero +zonechecks" # # Set up color-coded test output diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32 index 0b66f72b15..6565e1620b 100644 --- a/bin/tests/system/conf.sh.win32 +++ b/bin/tests/system/conf.sh.win32 @@ -15,66 +15,64 @@ # # Find the top of the BIND9 tree. -TOP=${SYSTEMTESTTOP:=.}/../../.. - -# Make it absolute so that it continues to work after we cd. -TOP=`cd $TOP && pwd` +TOP_BUILDDIR=@abs_top_builddir@ +TOP_SRCDIR=@abs_top_srcdir@ # This is the windows build. This disables certain tests cases # and changes some specific behaviors where necessary. CYGWIN=1 # Load common values shared between windows and unix/linux. -. $TOP/bin/tests/system/conf.sh.common +. $TOP_BUILDDIR/bin/tests/system/conf.sh.common # Visual Studio build configurations are Release and Debug VSCONF=${VSCONF:-Debug} -ARPANAME=$TOP/Build/$VSCONF/arpaname@EXEEXT@ -CDS=$TOP/Build/$VSCONF/dnssec-cds@EXEEXT@ -CHECKCONF=$TOP/Build/$VSCONF/named-checkconf@EXEEXT@ -CHECKZONE=$TOP/Build/$VSCONF/named-checkzone@EXEEXT@ -DDNSCONFGEN=$TOP/Build/$VSCONF/ddns-confgen@EXEEXT@ -DELV=$TOP/Build/$VSCONF/delv@EXEEXT@ -DIG=$TOP/Build/$VSCONF/dig@EXEEXT@ -DNSTAPREAD=$TOP/Build/$VSCONF/dnstap-read@EXEEXT@ -DSFROMKEY=$TOP/Build/$VSCONF/dnssec-dsfromkey@EXEEXT@ -FEATURETEST=$TOP/Build/$VSCONF/feature-test@EXEEXT@ +ARPANAME=$TOP_BUILDDIR/Build/$VSCONF/arpaname@EXEEXT@ +CDS=$TOP_BUILDDIR/Build/$VSCONF/dnssec-cds@EXEEXT@ +CHECKCONF=$TOP_BUILDDIR/Build/$VSCONF/named-checkconf@EXEEXT@ +CHECKZONE=$TOP_BUILDDIR/Build/$VSCONF/named-checkzone@EXEEXT@ +DDNSCONFGEN=$TOP_BUILDDIR/Build/$VSCONF/ddns-confgen@EXEEXT@ +DELV=$TOP_BUILDDIR/Build/$VSCONF/delv@EXEEXT@ +DIG=$TOP_BUILDDIR/Build/$VSCONF/dig@EXEEXT@ +DNSTAPREAD=$TOP_BUILDDIR/Build/$VSCONF/dnstap-read@EXEEXT@ +DSFROMKEY=$TOP_BUILDDIR/Build/$VSCONF/dnssec-dsfromkey@EXEEXT@ +FEATURETEST=$TOP_BUILDDIR/Build/$VSCONF/feature-test@EXEEXT@ FSTRM_CAPTURE=@FSTRM_CAPTURE@ -IMPORTKEY=$TOP/Build/$VSCONF/dnssec-importkey@EXEEXT@ -JOURNALPRINT=$TOP/Build/$VSCONF/named-journalprint@EXEEXT@ -KEYFRLAB=$TOP/Build/$VSCONF/dnssec-keyfromlabel@EXEEXT@ -KEYGEN=$TOP/Build/$VSCONF/dnssec-keygen@EXEEXT@ -MDIG=$TOP/Build/$VSCONF/mdig@EXEEXT@ -NAMED=$TOP/Build/$VSCONF/named@EXEEXT@ -NSEC3HASH=$TOP/Build/$VSCONF/nsec3hash@EXEEXT@ -NSLOOKUP=$TOP/Build/$VSCONF/nslookup@EXEEXT@ -NSUPDATE=$TOP/Build/$VSCONF/nsupdate@EXEEXT@ -NZD2NZF=$TOP/Build/$VSCONF/named-nzd2nzf@EXEEXT@ -PK11DEL="$TOP/Build/$VSCONF/pkcs11-destroy@EXEEXT@ -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0" -PK11GEN="$TOP/Build/$VSCONF/pkcs11-keygen@EXEEXT@ -q -s ${SLOT:-0} -p ${HSMPIN:-1234}" -PK11LIST="$TOP/Build/$VSCONF/pkcs11-list@EXEEXT@ -s ${SLOT:-0} -p ${HSMPIN:-1234}" -RESOLVE=$TOP/lib/samples/resolve -REVOKE=$TOP/Build/$VSCONF/dnssec-revoke@EXEEXT@ -RNDC=$TOP/Build/$VSCONF/rndc@EXEEXT@ -RNDCCONFGEN=$TOP/Build/$VSCONF/rndc-confgen@EXEEXT@ -RRCHECKER=$TOP/Build/$VSCONF/named-rrchecker@EXEEXT@ -SAMPLEUPDATE=$TOP/Build/$VSCONF/update@EXEEXT@ -SETTIME=$TOP/Build/$VSCONF/dnssec-settime@EXEEXT@ -SIGNER=$TOP/Build/$VSCONF/dnssec-signzone@EXEEXT@ -TSIGKEYGEN=$TOP/Build/$VSCONF/tsig-keygen@EXEEXT@ -VERIFY=$TOP/Build/$VSCONF/dnssec-verify@EXEEXT@ +IMPORTKEY=$TOP_BUILDDIR/Build/$VSCONF/dnssec-importkey@EXEEXT@ +JOURNALPRINT=$TOP_BUILDDIR/Build/$VSCONF/named-journalprint@EXEEXT@ +KEYFRLAB=$TOP_BUILDDIR/Build/$VSCONF/dnssec-keyfromlabel@EXEEXT@ +KEYGEN=$TOP_BUILDDIR/Build/$VSCONF/dnssec-keygen@EXEEXT@ +MDIG=$TOP_BUILDDIR/Build/$VSCONF/mdig@EXEEXT@ +NAMED=$TOP_BUILDDIR/Build/$VSCONF/named@EXEEXT@ +NSEC3HASH=$TOP_BUILDDIR/Build/$VSCONF/nsec3hash@EXEEXT@ +NSLOOKUP=$TOP_BUILDDIR/Build/$VSCONF/nslookup@EXEEXT@ +NSUPDATE=$TOP_BUILDDIR/Build/$VSCONF/nsupdate@EXEEXT@ +NZD2NZF=$TOP_BUILDDIR/Build/$VSCONF/named-nzd2nzf@EXEEXT@ +PK11DEL="$TOP_BUILDDIR/Build/$VSCONF/pkcs11-destroy@EXEEXT@ -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0" +PK11GEN="$TOP_BUILDDIR/Build/$VSCONF/pkcs11-keygen@EXEEXT@ -q -s ${SLOT:-0} -p ${HSMPIN:-1234}" +PK11LIST="$TOP_BUILDDIR/Build/$VSCONF/pkcs11-list@EXEEXT@ -s ${SLOT:-0} -p ${HSMPIN:-1234}" +RESOLVE=$TOP_BUILDDIR/lib/samples/resolve +REVOKE=$TOP_BUILDDIR/Build/$VSCONF/dnssec-revoke@EXEEXT@ +RNDC=$TOP_BUILDDIR/Build/$VSCONF/rndc@EXEEXT@ +RNDCCONFGEN=$TOP_BUILDDIR/Build/$VSCONF/rndc-confgen@EXEEXT@ +RRCHECKER=$TOP_BUILDDIR/Build/$VSCONF/named-rrchecker@EXEEXT@ +SAMPLEUPDATE=$TOP_BUILDDIR/Build/$VSCONF/update@EXEEXT@ +SETTIME=$TOP_BUILDDIR/Build/$VSCONF/dnssec-settime@EXEEXT@ +SIGNER=$TOP_BUILDDIR/Build/$VSCONF/dnssec-signzone@EXEEXT@ +TSIGKEYGEN=$TOP_BUILDDIR/Build/$VSCONF/tsig-keygen@EXEEXT@ +VERIFY=$TOP_BUILDDIR/Build/$VSCONF/dnssec-verify@EXEEXT@ -# to port WIRETEST=$TOP/Build/$VSCONF/wire_test@EXEEXT@ +# to port WIRETEST=$TOP_BUILDDIR/Build/$VSCONF/wire_test@EXEEXT@ WIRETEST= -BIGKEY=$TOP/Build/$VSCONF/bigkey@EXEEXT@ -GENCHECK=$TOP/Build/$VSCONF/gencheck@EXEEXT@ -KEYCREATE=$TOP/Build/$VSCONF/keycreate@EXEEXT@ -KEYDELETE=$TOP/Build/$VSCONF/keydelete@EXEEXT@ -MAKEJOURNAL=$TOP/Build/$VSCONF/makejournal@EXEEXT@ -PIPEQUERIES=$TOP/Build/$VSCONF/pipequeries@EXEEXT@ -# to port SAMPLEUPDATE=$TOP/lib/samples/sample-update +BIGKEY=$TOP_BUILDDIR/Build/$VSCONF/bigkey@EXEEXT@ +GENCHECK=$TOP_BUILDDIR/Build/$VSCONF/gencheck@EXEEXT@ +KEYCREATE=$TOP_BUILDDIR/Build/$VSCONF/keycreate@EXEEXT@ +KEYDELETE=$TOP_BUILDDIR/Build/$VSCONF/keydelete@EXEEXT@ +MAKEJOURNAL=$TOP_BUILDDIR/Build/$VSCONF/makejournal@EXEEXT@ +PIPEQUERIES=$TOP_BUILDDIR/Build/$VSCONF/pipequeries@EXEEXT@ +# to port SAMPLEUPDATE=$TOP_BUILDDIR/lib/samples/sample-update # we don't want a KRB5_CONFIG setting breaking the tests KRB5_CONFIG=NUL @@ -120,6 +118,3 @@ HAVEJSONSTATS=@JSONSTATS@ HAVEZLIB=@ZLIB@ NZD=@NZD_TOOLS@ CRYPTO=@CRYPTO@ - -# The rest is shared between Windows and Unices -. $TOP/bin/tests/system/conf.sh.common diff --git a/bin/tests/system/parallel.sh b/bin/tests/system/parallel.sh index e59b4d585f..3d9a042929 100644 --- a/bin/tests/system/parallel.sh +++ b/bin/tests/system/parallel.sh @@ -11,7 +11,7 @@ . ./conf.sh -PARALLELS=`echo $PARALLELDIRS | sed "s|\([^ ][^ ]*\)|test-\1|g;" | tr _ -` +PARALLELS=$(echo "$PARALLELDIRS" | sed "s|\([^ ][^ ]*\)|test-\1|g;" | tr _ - | tr "\n" " ") echo ".PHONY: $PARALLELS" echo @@ -28,7 +28,7 @@ echo "test check: $PARALLELS" port=${STARTPORT:-5000} for directory in $PARALLELDIRS ; do echo - echo "test-`echo $directory | tr _ -`: check_interfaces" - echo " @${SHELL} ./run.sh -p $port $directory 2>&1 | tee test.output.$directory" - port=`expr $port + 100` + echo "test-$(echo "$directory" | tr _ -): check_interfaces" + echo " @${SHELL} ./run.sh -r -p $port $directory 2>&1 | tee test.output.$directory" + port=$((port+100)) done diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh index 93df8dab49..5f20e16669 100755 --- a/bin/tests/system/runall.sh +++ b/bin/tests/system/runall.sh @@ -25,7 +25,7 @@ # run sequentially on that platform.) SYSTEMTESTTOP=. -. $SYSTEMTESTTOP/conf.sh +. "$SYSTEMTESTTOP/conf.sh" usage="Usage: ./runall.sh [-c] [-n] [numprocesses]" @@ -36,22 +36,23 @@ SYSTEMTEST_NO_CLEAN=${SYSTEMTEST_NO_CLEAN:-0} # Handle command line switches if present. -while getopts "cn" flag; do +while getopts "cn-" flag; do case "$flag" in c) SYSTEMTEST_FORCE_COLOR=1 ;; n) SYSTEMTEST_NO_CLEAN=1 ;; + -) break;; + *) exit 1;; esac done export NOCLEAN -shift `expr $OPTIND - 1` +shift $((OPTIND-1)) # Obtain number of processes to use. if [ $# -eq 0 ]; then numproc=1 elif [ $# -eq 1 ]; then - test "$1" -eq "$1" > /dev/null 2>&1 - if [ $? -ne 0 ]; then + if [ "$1" -ne "$1" ] 2>&1; then # Value passed is not numeric echo "$usage" >&2 exit 1 @@ -72,14 +73,14 @@ status=0 if [ "$NOPARALLEL" = "" ]; then if [ "$CYGWIN" = "" ]; then # Running on Unix, use "make" to run tests in parallel. - make -j $numproc check + make -j "$numproc" check status=$? else # Running on Windows: Cygwin "make" is available, but isn't being # used for the build. So we create a special makefile for the purpose # of parallel execution of system tests, and use that. $SHELL parallel.sh > parallel.mk - make -f parallel.mk -j $numproc check + make -f parallel.mk -j "$numproc" check $SHELL ./runsequential.sh $SHELL ./testsummary.sh || status=1 fi @@ -95,11 +96,15 @@ else EOF exit 1 } - { + ( + status=0 for testdir in $SUBDIRS; do - $SHELL run.sh $testdir || status=1 + $SHELL run.sh -r "$testdir" || status=1 done - } 2>&1 | tee "systests.output" + echo "$status" > systests.status + ) 2>&1 | tee "systests.output" + read -r status < systests.status + rm systests.status fi -exit $status +exit "$status" diff --git a/bin/tests/system/runsequential.sh b/bin/tests/system/runsequential.sh index 6380f4c2f2..f3f168e479 100755 --- a/bin/tests/system/runsequential.sh +++ b/bin/tests/system/runsequential.sh @@ -17,9 +17,9 @@ # SYSTEMTESTTOP=. -. $SYSTEMTESTTOP/conf.sh +. "$SYSTEMTESTTOP/conf.sh" for d in $SEQUENTIALDIRS do - $SHELL run.sh "${@}" $d 2>&1 | tee test.output.$d + $SHELL run.sh "${@}" "$d" 2>&1 | tee "test.output.$d" done diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh index 6089b16770..64a99fd4c7 100644 --- a/bin/tests/system/testsummary.sh +++ b/bin/tests/system/testsummary.sh @@ -25,17 +25,18 @@ # 1 - one or more tests failed SYSTEMTESTTOP=. -. $SYSTEMTESTTOP/conf.sh +. "$SYSTEMTESTTOP/conf.sh" keepfile=0 while getopts "n" flag; do case $flag in n) keepfile=1 ;; + *) exit 1 ;; esac done -if [ `ls test.output.* 2> /dev/null | wc -l` -eq 0 ]; then +if [ "$(find . -name 'test.output.*' 2>/dev/null | wc -l)" -eq 0 ]; then echowarn "I:No 'test.output.*' files were found." echowarn "I:Printing summary from pre-existing 'systests.output'." else @@ -45,37 +46,42 @@ else fi fi +if [ ! -f systests.output ]; then + echowarn "I:No 'systests.output' file found." + exit 1 +fi + status=0 echoinfo "I:System test result summary:" -echoinfo "`grep 'R:[a-z0-9_-][a-z0-9_-]*:[A-Z][A-Z]*' systests.output | cut -d':' -f3 | sort | uniq -c | sed -e 's/^/I:/'`" +echoinfo "$(grep 'R:[a-z0-9_-][a-z0-9_-]*:[A-Z][A-Z]*' systests.output | cut -d':' -f3 | sort | uniq -c | sed -e 's/^/I:/')" -FAILED_TESTS=`grep 'R:[a-z0-9_-][a-z0-9_-]*:FAIL' systests.output | cut -d':' -f2 | sort | sed -e 's/^/I: /'` +FAILED_TESTS=$(grep 'R:[a-z0-9_-][a-z0-9_-]*:FAIL' systests.output | cut -d':' -f2 | sort | sed -e 's/^/I: /') if [ -n "${FAILED_TESTS}" ]; then echoinfo "I:The following system tests failed:" echoinfo "${FAILED_TESTS}" status=1 fi -CRASHED_TESTS=`find . -name 'core*' -or -name '*.core' | cut -d'/' -f2 | sort -u | sed -e 's/^/I: /'` +CRASHED_TESTS=$(find . -name 'core*' -or -name '*.core' | cut -d'/' -f2 | sort -u | sed -e 's/^/I: /') if [ -n "${CRASHED_TESTS}" ]; then echoinfo "I:Core dumps were found for the following system tests:" echoinfo "${CRASHED_TESTS}" fi -ASSERTION_FAILED_TESTS=`find . -name named.run | xargs grep "assertion failure" | cut -d'/' -f2 | sort -u | sed -e 's/^/I: /'` +ASSERTION_FAILED_TESTS=$(find . -name named.run -print0 | xargs -0 grep "assertion failure" | cut -d'/' -f2 | sort -u | sed -e 's/^/I: /') if [ -n "${ASSERTION_FAILED_TESTS}" ]; then echoinfo "I:Assertion failures were detected for the following system tests:" echoinfo "${ASSERTION_FAILED_TESTS}" fi -TSAN_REPORT_TESTS=`find . -name 'tsan.*' | cut -d'/' -f2 | sort -u | sed -e 's/^/I: /'` +TSAN_REPORT_TESTS=$(find . -name 'tsan.*' | cut -d'/' -f2 | sort -u | sed -e 's/^/I: /') if [ -n "${TSAN_REPORT_TESTS}" ]; then echoinfo "I:ThreadSanitizer reported issues for the following system tests:" echoinfo "${TSAN_REPORT_TESTS}" fi -RESULTS_FOUND=`grep -c 'R:[a-z0-9_-][a-z0-9_-]*:[A-Z][A-Z]*' systests.output` -TESTS_RUN=`echo "${SUBDIRS}" | wc -w` +RESULTS_FOUND=$(grep -c 'R:[a-z0-9_-][a-z0-9_-]*:[A-Z][A-Z]*' systests.output) +TESTS_RUN=$(echo "${SUBDIRS}" | wc -w) if [ "${RESULTS_FOUND}" -ne "${TESTS_RUN}" ]; then echofail "I:Found ${RESULTS_FOUND} test results, but ${TESTS_RUN} tests were run" status=1 diff --git a/bin/tests/system/win32/bigkey.vcxproj.in b/bin/tests/system/win32/bigkey.vcxproj.in index 1738e987d5..990cb39f57 100644 --- a/bin/tests/system/win32/bigkey.vcxproj.in +++ b/bin/tests/system/win32/bigkey.vcxproj.in @@ -113,6 +113,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/tests/system/win32/feature-test.vcxproj.in b/bin/tests/system/win32/feature-test.vcxproj.in index fce69da012..61daea6799 100644 --- a/bin/tests/system/win32/feature-test.vcxproj.in +++ b/bin/tests/system/win32/feature-test.vcxproj.in @@ -113,6 +113,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/bin/tests/system/win32/gencheck.vcxproj.in b/bin/tests/system/win32/gencheck.vcxproj.in index fc702fe963..4af9da949e 100644 --- a/bin/tests/system/win32/gencheck.vcxproj.in +++ b/bin/tests/system/win32/gencheck.vcxproj.in @@ -113,6 +113,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/bin/tests/system/win32/keycreate.vcxproj.in b/bin/tests/system/win32/keycreate.vcxproj.in index 5066c3a9e0..0f6883ca8f 100644 --- a/bin/tests/system/win32/keycreate.vcxproj.in +++ b/bin/tests/system/win32/keycreate.vcxproj.in @@ -113,6 +113,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/tests/system/win32/keydelete.vcxproj.in b/bin/tests/system/win32/keydelete.vcxproj.in index b86bf7fa06..59b805cf16 100644 --- a/bin/tests/system/win32/keydelete.vcxproj.in +++ b/bin/tests/system/win32/keydelete.vcxproj.in @@ -113,6 +113,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/tests/system/win32/makejournal.vcxproj.in b/bin/tests/system/win32/makejournal.vcxproj.in index 3b1c2cf4c8..13cb6d13f5 100644 --- a/bin/tests/system/win32/makejournal.vcxproj.in +++ b/bin/tests/system/win32/makejournal.vcxproj.in @@ -42,13 +42,13 @@ true - ..\..\..\Build\$(Configuration)\ + ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ None false - ..\..\..\Build\$(Configuration)\ + ..\..\..\..\Build\$(Configuration)\ .\$(Configuration)\ None @@ -66,15 +66,15 @@ .\$(Configuration)\ $(OutDir)$(TargetName).pdb true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) + ..\..\..\..\config.h + .\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) CompileAsC Console true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) + ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) @@ -95,8 +95,8 @@ .\$(Configuration)\ .\$(Configuration)\ $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) + ..\..\..\..\config.h + .\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;%(AdditionalIncludeDirectories) CompileAsC @@ -104,15 +104,23 @@ false true true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) + ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) @OPENSSL_LIB@libisc.lib;libdns.lib;%(AdditionalDependencies) + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/tests/system/win32/pipequeries.vcxproj.in b/bin/tests/system/win32/pipequeries.vcxproj.in index 7385f5a72a..752beff740 100644 --- a/bin/tests/system/win32/pipequeries.vcxproj.in +++ b/bin/tests/system/win32/pipequeries.vcxproj.in @@ -113,6 +113,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/tests/win32/backtrace_test.vcxproj.filters.in b/bin/tests/win32/backtrace_test.vcxproj.filters.in deleted file mode 100644 index 307a6ec77e..0000000000 --- a/bin/tests/win32/backtrace_test.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/win32/backtrace_test.vcxproj.in b/bin/tests/win32/backtrace_test.vcxproj.in deleted file mode 100644 index 2f13f5e502..0000000000 --- a/bin/tests/win32/backtrace_test.vcxproj.in +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {14751171-C40E-40EE-A2F0-37FFC3CCD4A2} - Win32Proj - backtrace_test - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - Application - true - MultiByte - @PLATFORM_TOOLSET@ - - - Application - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - false - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/win32/backtrace_test.vcxproj.user b/bin/tests/win32/backtrace_test.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/bin/tests/win32/backtrace_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/bin/tests/win32/inter_test.vcxproj.filters.in b/bin/tests/win32/inter_test.vcxproj.filters.in deleted file mode 100644 index 2797475130..0000000000 --- a/bin/tests/win32/inter_test.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/win32/inter_test.vcxproj.in b/bin/tests/win32/inter_test.vcxproj.in deleted file mode 100644 index dc092d8494..0000000000 --- a/bin/tests/win32/inter_test.vcxproj.in +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1} - Win32Proj - inter_test - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - Application - true - MultiByte - @PLATFORM_TOOLSET@ - - - Application - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - false - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/win32/inter_test.vcxproj.user b/bin/tests/win32/inter_test.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/bin/tests/win32/inter_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/bin/tests/win32/rwlock_test.vcxproj.filters.in b/bin/tests/win32/rwlock_test.vcxproj.filters.in deleted file mode 100644 index 99ad56799c..0000000000 --- a/bin/tests/win32/rwlock_test.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/win32/rwlock_test.vcxproj.in b/bin/tests/win32/rwlock_test.vcxproj.in deleted file mode 100644 index 369b9f8267..0000000000 --- a/bin/tests/win32/rwlock_test.vcxproj.in +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {7705EEF6-6980-48F9-A045-699DAFE860C9} - Win32Proj - rwlock_test - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - Application - true - MultiByte - @PLATFORM_TOOLSET@ - - - Application - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - false - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/win32/rwlock_test.vcxproj.user b/bin/tests/win32/rwlock_test.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/bin/tests/win32/rwlock_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/bin/tests/win32/shutdown_test.vcxproj.filters.in b/bin/tests/win32/shutdown_test.vcxproj.filters.in deleted file mode 100644 index 64f052c8a4..0000000000 --- a/bin/tests/win32/shutdown_test.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/win32/shutdown_test.vcxproj.in b/bin/tests/win32/shutdown_test.vcxproj.in deleted file mode 100644 index a880966c60..0000000000 --- a/bin/tests/win32/shutdown_test.vcxproj.in +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {551561F6-4A2A-4824-8A34-A4AF0EB7C179} - Win32Proj - shutdown_test - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - Application - true - MultiByte - @PLATFORM_TOOLSET@ - - - Application - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - false - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/win32/shutdown_test.vcxproj.user b/bin/tests/win32/shutdown_test.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/bin/tests/win32/shutdown_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/bin/tests/win32/sock_test.vcxproj.filters.in b/bin/tests/win32/sock_test.vcxproj.filters.in deleted file mode 100644 index bbe2ff8d53..0000000000 --- a/bin/tests/win32/sock_test.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/win32/sock_test.vcxproj.in b/bin/tests/win32/sock_test.vcxproj.in deleted file mode 100644 index e02c53cb42..0000000000 --- a/bin/tests/win32/sock_test.vcxproj.in +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {6200ED9D-CAB1-4C00-8D79-478F64A19B8F} - Win32Proj - sock_test - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - Application - true - MultiByte - @PLATFORM_TOOLSET@ - - - Application - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - false - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/win32/sock_test.vcxproj.user b/bin/tests/win32/sock_test.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/bin/tests/win32/sock_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/bin/tests/win32/task_test.vcxproj.filters.in b/bin/tests/win32/task_test.vcxproj.filters.in deleted file mode 100644 index b229ca1067..0000000000 --- a/bin/tests/win32/task_test.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/win32/task_test.vcxproj.in b/bin/tests/win32/task_test.vcxproj.in deleted file mode 100644 index cce5a16a5e..0000000000 --- a/bin/tests/win32/task_test.vcxproj.in +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {CC7340C1-CBAF-4145-969A-73AE960401D6} - Win32Proj - task_test - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - Application - true - MultiByte - @PLATFORM_TOOLSET@ - - - Application - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - false - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/win32/task_test.vcxproj.user b/bin/tests/win32/task_test.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/bin/tests/win32/task_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/bin/tests/win32/timer_test.vcxproj.filters.in b/bin/tests/win32/timer_test.vcxproj.filters.in deleted file mode 100644 index 40a5b3692d..0000000000 --- a/bin/tests/win32/timer_test.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/win32/timer_test.vcxproj.in b/bin/tests/win32/timer_test.vcxproj.in deleted file mode 100644 index 8e92457b30..0000000000 --- a/bin/tests/win32/timer_test.vcxproj.in +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {E55653C8-5501-4871-A97C-C926631F40F9} - Win32Proj - timer_test - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - Application - true - MultiByte - @PLATFORM_TOOLSET@ - - - Application - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - false - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/win32/timer_test.vcxproj.user b/bin/tests/win32/timer_test.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/bin/tests/win32/timer_test.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/bin/tools/Makefile.am b/bin/tools/Makefile.am index 4fb47c9624..089f0bfec5 100644 --- a/bin/tools/Makefile.am +++ b/bin/tools/Makefile.am @@ -17,12 +17,16 @@ sbin_PROGRAMS = \ named-journalprint \ nsec3hash +arpaname_LDADD = \ + $(LIBISC_LIBS) + mdig_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(LIBBIND9_CFLAGS) -mdig_LDADD = \ - $(LDADD) \ +mdig_LDADD = \ + $(LIBISC_LIBS) \ + $(LIBDNS_LIBS) \ $(LIBBIND9_LIBS) if HAVE_DNSTAP @@ -35,7 +39,8 @@ dnstap_read_CPPFLAGS = \ -I$(top_builddir)/lib/dns dnstap_read_LDADD = \ - $(LDADD) \ + $(LIBISC_LIBS) \ + $(LIBDNS_LIBS) \ $(DNSTAP_LIBS) endif @@ -48,7 +53,8 @@ named_nzd2nzf_CFLAGS = \ $(LMDB_CFLAGS) named_nzd2nzf_LDADD = \ - $(LDADD) \ + $(LIBISC_LIBS) \ + $(LIBDNS_LIBS) \ $(LMDB_LIBS) endif diff --git a/bin/tools/win32/arpaname.vcxproj.in b/bin/tools/win32/arpaname.vcxproj.in index 5558f1cdeb..179a699b7b 100644 --- a/bin/tools/win32/arpaname.vcxproj.in +++ b/bin/tools/win32/arpaname.vcxproj.in @@ -113,6 +113,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/bin/tools/win32/journalprint.vcxproj.in b/bin/tools/win32/journalprint.vcxproj.in index a6989f181c..8ccb70d9ed 100644 --- a/bin/tools/win32/journalprint.vcxproj.in +++ b/bin/tools/win32/journalprint.vcxproj.in @@ -115,6 +115,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/tools/win32/mdig.vcxproj.in b/bin/tools/win32/mdig.vcxproj.in index 9aa5a37559..d0d86c2da0 100644 --- a/bin/tools/win32/mdig.vcxproj.in +++ b/bin/tools/win32/mdig.vcxproj.in @@ -113,6 +113,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {E741C10B-B075-4206-9596-46765B665E03} + + diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in index fa4361147c..17c014fb9e 100644 --- a/bin/tools/win32/nsec3hash.vcxproj.in +++ b/bin/tools/win32/nsec3hash.vcxproj.in @@ -113,6 +113,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/tools/win32/rrchecker.vcxproj.in b/bin/tools/win32/rrchecker.vcxproj.in index 0bc1f2ab50..e95fbe3dc9 100644 --- a/bin/tools/win32/rrchecker.vcxproj.in +++ b/bin/tools/win32/rrchecker.vcxproj.in @@ -115,6 +115,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in index 66c3d2691c..e54a8f5ba6 100644 --- a/bin/win32/BINDInstall/BINDInstall.vcxproj.in +++ b/bin/win32/BINDInstall/BINDInstall.vcxproj.in @@ -61,7 +61,7 @@ Level4 false Disabled - WIN32;@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;@USE_PYTHON@_DEBUG;_WINDOWS;%(PreprocessorDefinitions) ..\..\..;..\include;..\..\..\include;..\..\named\win32\include;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) @@ -92,7 +92,7 @@ MaxSpeed true false - WIN32;@USE_GSSAPI@@USE_PYTHON@NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;@USE_PYTHON@NDEBUG;_WINDOWS;%(PreprocessorDefinitions) ..\..\..;..\include;..\..\..\include;..\..\named\win32\include;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories) OnlyExplicitInline true @@ -130,8 +130,8 @@ NotUsing - UNICODE;WIN32;@USE_GSSAPI@@USE_PYTHON@NDEBUG;_WINDOWS;_MBCS - UNICODE;WIN32;@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;_MBCS + UNICODE;WIN32;@USE_PYTHON@NDEBUG;_WINDOWS;_MBCS + UNICODE;WIN32;@USE_PYTHON@_DEBUG;_WINDOWS;_MBCS @@ -149,6 +149,179 @@ + + + {03A96113-CB14-43AA-AEB2-48950E3915C5} + + + {2C1F7096-C5B5-48D4-846F-A7ACA454335D} + + + {66028555-7DD5-4016-B601-9EF9A1EE8BFA} + + + {64964B03-4815-41F0-9057-E766A94AF197} + + + {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1} + + + {1E2C1635-3093-4D59-80E7-4743AC10F22F} + + + {BE172EFE-C1DC-4812-BFB9-8C5F8ADB7E9F} + + + {F938F9B8-D395-4A40-BEC7-0122D289C692} + + + {140DE800-E552-43CC-B0C7-A33A92E368CA} + + + {BA1048A8-6961-4A20-BE12-08BE20611C9D} + + + {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5} + + + {0EB1727E-2BBD-47A6-AD12-418F9DEB0531} + + + {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} + + + {6E6297F4-69D7-4533-85E1-BD17C30017C8} + + + {AB6690A0-055E-458f-BAC5-BF38BCC5834F} + + + {17455DC6-5FBB-47C3-8F44-7DB574A188D3} + + + {0BF11E21-168C-4CAA-B784-429D126BBAE5} + + + {D171F185-D3C2-4463-9CF3-ED1D0B1D6832} + + + {03FB7588-C5A7-4572-968F-14F1206BC69C} + + + {205ED8A9-2E4C-41CC-9385-F3613402AA90} + + + {FD653434-F1A8-44A9-85B2-A7468491DA6D} + + + {723C65DA-A96C-4BA3-A34E-44F11CA346F9} + + + {C41266C7-E27E-4D60-9815-82D3B32BF82F} + +@IF PKCS11 + + {5B3137E5-7E1F-49AA-8810-A09AA417D326} + + + {5042D371-0402-4FA3-A52A-769708694422} + + + {C663B088-F7BC-4C8C-8D06-A76636EED651} + + + {403FD4B1-A4F9-4159-9013-5860E3A4417D} + +@END PKCS11 + + {39721F26-8B80-4AA9-9826-2AEF7322C3D5} + +@IF STESTS + + {61F9D673-EB5C-47A5-8907-24E034C75EF8} + + + {63A921F6-1200-4723-828A-98960127B73D} + + + {764DBE24-C8B3-46E8-BE73-196431353A5D} + + + {4F9A0F6F-366D-4483-B131-793832840508} + + + {85ADFF2A-BE31-4B8D-9089-9AD56CE78D7E} + + + {31715139-2C27-47D2-8394-71B71A8AC3D5} + + + {E1478F40-786C-4738-8E99-E7A71DD98661} + +@END STESTS + + {91E60FDA-E48C-4DA0-92A2-97F963348E00} + + + {B19042CE-D3D9-469B-BCD2-C3140150939A} + + + {3115091C-8135-481F-9757-F013A26255E0} + + + {4EE91023-94C3-48C0-B71C-5333B726C2EE} + + + {98743A7C-6AF8-467f-9911-FA69C451AF2B} + + + {E741C10B-B075-4206-9596-46765B665E03} + + + {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {B556705F-1920-4400-878A-B259D3556047} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} + +@IF SAMPLES + + {9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06} + + + {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE} + + + {CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD} + + + {FF440E85-7450-439C-82EE-04C464512D0E} + + + {F66D8B7E-721D-4602-99AD-820D19AD1313} + + + {05682E12-523F-4DAE-8E6D-ADFDBC308AFD} + +@END SAMPLES + + {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0} + + diff --git a/config.h.win32 b/config.h.win32 index 4f3dc96d30..52c53ffc70 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -61,6 +61,20 @@ #error Minimum Visual Studio version is 2017 or higher #endif +/* Setup package versions */ +@PACKAGE_VERSION_MAJOR@ +@PACKAGE_VERSION_MINOR@ +@PACKAGE_VERSION_PATCH@ +@PACKAGE_VERSION_EXTRA@ +@PACKAGE_VERSION@ +@PACKAGE_NAME@ +@PACKAGE_DESCRIPTION@ +@PACKAGE_SRCID@ +@PACKAGE_CONFIGARGS@ +@PACKAGE_BUILDER@ +@PACKAGE_STRING@ +@MAPAPI@ + /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -209,8 +223,6 @@ typedef __int64 off_t; /* * Set up the Version Information */ -#include - #include #include #include @@ -230,9 +242,9 @@ typedef __int64 off_t; #include #define isatty _isatty -#ifndef _WINSOCKAPI_ -#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */ -#endif +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 /* Prevent inclusion of winsock.h in windows.h */ +#endif /* WIN32_LEAN_AND_MEAN */ /* * Make the number of available sockets large @@ -354,21 +366,18 @@ typedef __int64 off_t; /* Define to 1 if you have the `uv_import' function. */ @HAVE_UV_IMPORT@ -/* - * Define to nothing if C supports flexible array members, and to 1 if it does - * not. That way, with a declaration like `struct s { int n; double - * d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99 - * compilers. When computing the size of such an object, don't use 'sizeof - * (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)' - * instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with - * MSVC and with C++ compilers. - */ -#define FLEXIBLE_ARRAY_MEMBER /**/ +/* GSSAPI Related defines */ +@HAVE_GSSAPI@ +@HAVE_GSSAPI_H@ +@HAVE_GSSAPI_GSSAPI_H@ +@HAVE_GSSAPI_KRB5_H@ +@HAVE_GSSAPI_GSSAPI_KRB5_H@ +@HAVE_KRB5_H@ +@HAVE_KRB5_KRB5_H@ /* Avoid warnings with strlen() */ #ifdef _WIN64 #define strlen(x) (unsigned int) strlen(x) #endif -/* Get SRCID */ -#include "srcid.h" +/* Hey Emacs, this is -*- c -*- file! */ diff --git a/configure.ac b/configure.ac index 2a5a9b4c51..a1787adf66 100644 --- a/configure.ac +++ b/configure.ac @@ -328,7 +328,6 @@ AX_TLS([AS_IF([test "$ac_cv_tls" != "thread_local"], AC_C_CONST AC_C_INLINE AC_C_VOLATILE -AC_C_FLEXIBLE_ARRAY_MEMBER # # Check for yield support on ARM processors diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in index 817c378e56..d483e97006 100644 --- a/lib/bind9/win32/libbind9.vcxproj.in +++ b/lib/bind9/win32/libbind9.vcxproj.in @@ -73,8 +73,8 @@ Console true - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) .\libbind9.def .\$(Configuration)\$(ProjectName).lib ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) @@ -106,8 +106,8 @@ false true true - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\ns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies) .\libbind9.def .\$(Configuration)\$(ProjectName).lib Default @@ -126,6 +126,20 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + diff --git a/lib/dns/Makefile.am b/lib/dns/Makefile.am index 8280d9a65f..5f6abc14db 100644 --- a/lib/dns/Makefile.am +++ b/lib/dns/Makefile.am @@ -183,6 +183,7 @@ libdns_la_SOURCES = \ ecs.c \ fixedname.c \ forward.c \ + gssapictx.c \ hmac_link.c \ ipkeylist.c \ iptable.c \ @@ -253,11 +254,7 @@ libdns_la_SOURCES = \ if HAVE_GSSAPI libdns_la_SOURCES += \ - gssapi_link.c \ - gssapictx.c -else !HAVE_GSSAPI -libdns_la_SOURCES += \ - gssapictx-dummy.c + gssapi_link.c endif if HAVE_PKCS11 diff --git a/lib/dns/client.c b/lib/dns/client.c index 7a68623ca2..a86a5da468 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -3061,7 +3061,7 @@ typedef struct { dns_rdata_t rdata; size_t size; isc_mem_t *mctx; - unsigned char data[FLEXIBLE_ARRAY_MEMBER]; + unsigned char data[]; } dns_client_updaterec_t; isc_result_t diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c index fe3bc7562f..9b18601d03 100644 --- a/lib/dns/gssapi_link.c +++ b/lib/dns/gssapi_link.c @@ -365,5 +365,3 @@ dst__gssapi_init(dst_func_t **funcp) { } return (ISC_R_SUCCESS); } - -/*! \file */ diff --git a/lib/dns/gssapictx-dummy.c b/lib/dns/gssapictx-dummy.c deleted file mode 100644 index b155ef710b..0000000000 --- a/lib/dns/gssapictx-dummy.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#include -#include - -#include -#include -#include - -#include - -#include - -isc_result_t -dst_gssapi_acquirecred(const dns_name_t *name, bool initiate, - gss_cred_id_t *cred) { - REQUIRE(cred != NULL && *cred == NULL); - - UNUSED(name); - UNUSED(initiate); - UNUSED(cred); - - return (ISC_R_NOTIMPLEMENTED); -} - -bool -dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, - const dns_name_t *name, - const dns_name_t *realm, bool subdomain) { - UNUSED(signer); - UNUSED(name); - UNUSED(realm); - UNUSED(subdomain); - - return (false); -} - -bool -dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, - const dns_name_t *name, - const dns_name_t *realm, bool subdomain) { - UNUSED(signer); - UNUSED(name); - UNUSED(realm); - UNUSED(subdomain); - - return (false); -} - -isc_result_t -dst_gssapi_releasecred(gss_cred_id_t *cred) { - UNUSED(cred); - - return (ISC_R_NOTIMPLEMENTED); -} - -isc_result_t -dst_gssapi_initctx(const dns_name_t *name, isc_buffer_t *intoken, - isc_buffer_t *outtoken, gss_ctx_id_t *gssctx, - isc_mem_t *mctx, char **err_message) { - UNUSED(name); - UNUSED(intoken); - UNUSED(outtoken); - UNUSED(gssctx); - UNUSED(mctx); - UNUSED(err_message); - - return (ISC_R_NOTIMPLEMENTED); -} - -isc_result_t -dst_gssapi_acceptctx(gss_cred_id_t cred, const char *gssapi_keytab, - isc_region_t *intoken, isc_buffer_t **outtoken, - gss_ctx_id_t *ctxout, dns_name_t *principal, - isc_mem_t *mctx) { - UNUSED(cred); - UNUSED(gssapi_keytab); - UNUSED(intoken); - UNUSED(outtoken); - UNUSED(ctxout); - UNUSED(principal); - UNUSED(mctx); - - return (ISC_R_NOTIMPLEMENTED); -} - -isc_result_t -dst_gssapi_deletectx(isc_mem_t *mctx, gss_ctx_id_t *gssctx) { - UNUSED(mctx); - UNUSED(gssctx); - return (ISC_R_NOTIMPLEMENTED); -} - -/*! \file */ diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index bf75147ef3..5852b5e35d 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -61,6 +61,8 @@ #include "dst_internal.h" +#if HAVE_GSSAPI + #ifndef GSS_KRB5_MECHANISM static unsigned char krb5_mech_oid_bytes[] = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x01, 0x02, 0x02 }; @@ -831,6 +833,98 @@ gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen) { return (buf); } +#else + +isc_result_t +dst_gssapi_acquirecred(const dns_name_t *name, bool initiate, + gss_cred_id_t *cred) { + REQUIRE(cred != NULL && *cred == NULL); + + UNUSED(name); + UNUSED(initiate); + UNUSED(cred); + + return (ISC_R_NOTIMPLEMENTED); +} + +bool +dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, + const dns_name_t *name, + const dns_name_t *realm, bool subdomain) { + UNUSED(signer); + UNUSED(name); + UNUSED(realm); + UNUSED(subdomain); + + return (false); +} + +bool +dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, + const dns_name_t *name, + const dns_name_t *realm, bool subdomain) { + UNUSED(signer); + UNUSED(name); + UNUSED(realm); + UNUSED(subdomain); + + return (false); +} + +isc_result_t +dst_gssapi_releasecred(gss_cred_id_t *cred) { + UNUSED(cred); + + return (ISC_R_NOTIMPLEMENTED); +} + +isc_result_t +dst_gssapi_initctx(const dns_name_t *name, isc_buffer_t *intoken, + isc_buffer_t *outtoken, gss_ctx_id_t *gssctx, + isc_mem_t *mctx, char **err_message) { + UNUSED(name); + UNUSED(intoken); + UNUSED(outtoken); + UNUSED(gssctx); + UNUSED(mctx); + UNUSED(err_message); + + return (ISC_R_NOTIMPLEMENTED); +} + +isc_result_t +dst_gssapi_acceptctx(gss_cred_id_t cred, const char *gssapi_keytab, + isc_region_t *intoken, isc_buffer_t **outtoken, + gss_ctx_id_t *ctxout, dns_name_t *principal, + isc_mem_t *mctx) { + UNUSED(cred); + UNUSED(gssapi_keytab); + UNUSED(intoken); + UNUSED(outtoken); + UNUSED(ctxout); + UNUSED(principal); + UNUSED(mctx); + + return (ISC_R_NOTIMPLEMENTED); +} + +isc_result_t +dst_gssapi_deletectx(isc_mem_t *mctx, gss_ctx_id_t *gssctx) { + UNUSED(mctx); + UNUSED(gssctx); + return (ISC_R_NOTIMPLEMENTED); +} + +char * +gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen) { + snprintf(buf, buflen, "GSSAPI error: Major = %u, Minor = %u.", major, + minor); + + return (buf); +} + +#endif + void gss_log(int level, const char *fmt, ...) { va_list ap; @@ -840,5 +934,3 @@ gss_log(int level, const char *fmt, ...) { ISC_LOG_DEBUG(level), fmt, ap); va_end(ap); } - -/*! \file */ diff --git a/lib/dns/win32/libdns.vcxproj.filters.in b/lib/dns/win32/libdns.vcxproj.filters.in index 4608114871..5ba61623f0 100644 --- a/lib/dns/win32/libdns.vcxproj.filters.in +++ b/lib/dns/win32/libdns.vcxproj.filters.in @@ -284,9 +284,11 @@ Dst Source Files +@IF GSSAPI Dst Source Files +@END GSSAPI Dst Source Files @@ -325,9 +327,6 @@ Dst Source Files @END PKCS11 - - Dst Source Files - @@ -655,8 +654,5 @@ Dst Header Files @END PKCS11 - - Dst Header Files - diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in index 20b06f1de2..9af373e06c 100644 --- a/lib/dns/win32/libdns.vcxproj.in +++ b/lib/dns/win32/libdns.vcxproj.in @@ -59,7 +59,7 @@ Level4 false Disabled - BIND9;WIN32;@USE_GSSAPI@@USE_ISC_SPNEGO@_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) + BIND9;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h .\;..\..\..\;include;..\include;..\..\isc;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) true @@ -89,7 +89,7 @@ MaxSpeed true @INTRINSIC@ - BIND9;WIN32;@USE_GSSAPI@@USE_ISC_SPNEGO@NDEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) + BIND9;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions) ..\..\..\config.h .\;..\..\..\;include;..\include;..\..\isc;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) OnlyExplicitInline @@ -148,7 +148,9 @@ @END GEOIP +@IF GSSAPI +@END GSSAPI @@ -202,7 +204,6 @@ - @@ -336,7 +337,14 @@ - + + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} + diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in index eaca5dac28..1b39b3c73f 100644 --- a/lib/irs/win32/libirs.vcxproj.in +++ b/lib/irs/win32/libirs.vcxproj.in @@ -123,6 +123,17 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {B2DFA58C-6347-478E-81E8-01E06999D4F1} + + diff --git a/lib/isc/glob.c b/lib/isc/glob.c index 559815525b..769acbda85 100644 --- a/lib/isc/glob.c +++ b/lib/isc/glob.c @@ -24,7 +24,6 @@ #include #elif defined(_WIN32) #include -#define WIN32_LEAN_AND_MEAN 1 #include #include diff --git a/lib/isc/ht.c b/lib/isc/ht.c index b3c9e5100d..7bda1cf662 100644 --- a/lib/isc/ht.c +++ b/lib/isc/ht.c @@ -29,7 +29,7 @@ struct isc_ht_node { void *value; isc_ht_node_t *next; size_t keysize; - unsigned char key[FLEXIBLE_ARRAY_MEMBER]; + unsigned char key[]; }; struct isc_ht { diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c index 0b0bde191f..176043eb41 100644 --- a/lib/isc/win32/condition.c +++ b/lib/isc/win32/condition.c @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in index 41eecd94aa..7f03d666a3 100644 --- a/lib/isc/win32/include/isc/platform.h.in +++ b/lib/isc/win32/include/isc/platform.h.in @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_PLATFORM_H -#define ISC_PLATFORM_H 1 +#pragma once /***** ***** Platform-dependent defines. @@ -34,10 +33,15 @@ typedef uint32_t socklen_t; #endif +#ifndef thread_local +#define thread_local __declspec(thread) +#endif /* thread_local */ + /* * Limits */ +#include #ifndef NAME_MAX #define NAME_MAX _MAX_FNAME #endif @@ -97,5 +101,3 @@ typedef uint32_t socklen_t; #else #define LIBTESTS_EXTERNAL_DATA __declspec(dllimport) #endif - -#endif /* ISC_PLATFORM_H */ diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h index aa028ceae2..fe19df001d 100644 --- a/lib/isc/win32/include/isc/stdatomic.h +++ b/lib/isc/win32/include/isc/stdatomic.h @@ -11,7 +11,6 @@ #pragma once -#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/lib/isc/win32/ltdl.h b/lib/isc/win32/ltdl.h new file mode 100644 index 0000000000..90bc10b097 --- /dev/null +++ b/lib/isc/win32/ltdl.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +#pragma once + +#include + +#define lt_dlhandle HMODULE +#define lt_dlinit() ISC_R_SUCCESS +#define lt_dlopen(f) LoadLibraryW(f) +#define lt_dlsym(h, s) GetProcAddress(h, s) +#define lt_dlclose(h) FreeLibrary(h) + +__declspec(thread) LPSTR __dlerror_message[1024] = { 0 }; + +static const char * +lt_dlerror(void) { + DWORD errorMessageID = GetLastError(); + if (errorMessageID == 0) { + return (NULL); + } + + LPSTR messageBuffer = NULL; + size_t size = FormatMessageA( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPSTR)&messageBuffer, 0, NULL); + + strlcpy(__dlerror_message, messageBuffer, sizeof(__dlerror_message)); + + LocalFree(messageBuffer); + + return ((const char *)__dlerror_message); +} diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in index 2ad7474781..0508dfd7b6 100644 --- a/lib/isccc/win32/libisccc.vcxproj.in +++ b/lib/isccc/win32/libisccc.vcxproj.in @@ -140,6 +140,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in index 07571f91ca..27811bbba4 100644 --- a/lib/isccfg/win32/libisccfg.vcxproj.in +++ b/lib/isccfg/win32/libisccfg.vcxproj.in @@ -135,6 +135,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/lib/ns/win32/libns.vcxproj.in b/lib/ns/win32/libns.vcxproj.in index 125699e16e..48488d14e0 100644 --- a/lib/ns/win32/libns.vcxproj.in +++ b/lib/ns/win32/libns.vcxproj.in @@ -58,7 +58,7 @@ Level4 false Disabled - WIN32;@USE_GSSAPI@_DEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) ..\..\..\config.h .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\..\lib\dns\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) true @@ -88,7 +88,7 @@ MaxSpeed true @INTRINSIC@ - WIN32;@USE_GSSAPI@NDEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_USRDLL;LIBNS_EXPORTS;%(PreprocessorDefinitions) ..\..\..\config.h .\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\..\lib\dns\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories) OnlyExplicitInline @@ -148,6 +148,14 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/lib/samples/win32/async.vcxproj.in b/lib/samples/win32/async.vcxproj.in index 9f82e16150..960e4fd4cb 100644 --- a/lib/samples/win32/async.vcxproj.in +++ b/lib/samples/win32/async.vcxproj.in @@ -74,8 +74,8 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -106,13 +106,21 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/lib/samples/win32/gai.vcxproj.filters.in b/lib/samples/win32/gai.vcxproj.filters.in deleted file mode 100644 index a709e03b47..0000000000 --- a/lib/samples/win32/gai.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/lib/samples/win32/gai.vcxproj.in b/lib/samples/win32/gai.vcxproj.in deleted file mode 100644 index 25e6c95c11..0000000000 --- a/lib/samples/win32/gai.vcxproj.in +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE} - Win32Proj - gai - @WINDOWS_TARGET_PLATFORM_VERSION@ - - - - Application - true - MultiByte - @PLATFORM_TOOLSET@ - - - Application - false - true - MultiByte - @PLATFORM_TOOLSET@ - - - - - - - - - - - - - true - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - false - ..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - None - - - - - - Level4 - false - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\win32\include;..\..\dns\include;..\..\irs\win32\include;..\..\irs\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level1 - true - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - ..\..\..\config.h - .\;..\..\..\;@LIBXML2_INC@..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\win32\include;..\..\dns\include;..\..\irs\win32\include;..\..\irs\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/lib/samples/win32/gai.vcxproj.user b/lib/samples/win32/gai.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/lib/samples/win32/gai.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/lib/samples/win32/nsprobe.vcxproj.in b/lib/samples/win32/nsprobe.vcxproj.in index b83d043563..65b61e426c 100644 --- a/lib/samples/win32/nsprobe.vcxproj.in +++ b/lib/samples/win32/nsprobe.vcxproj.in @@ -74,8 +74,8 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -106,13 +106,21 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/lib/samples/win32/request.vcxproj.in b/lib/samples/win32/request.vcxproj.in index b2fe8d6d87..9ba7f32c95 100644 --- a/lib/samples/win32/request.vcxproj.in +++ b/lib/samples/win32/request.vcxproj.in @@ -74,8 +74,8 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -106,13 +106,21 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/lib/samples/win32/resolve.vcxproj.in b/lib/samples/win32/resolve.vcxproj.in index 078f2af9f7..34941439aa 100644 --- a/lib/samples/win32/resolve.vcxproj.in +++ b/lib/samples/win32/resolve.vcxproj.in @@ -74,8 +74,8 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) @@ -106,13 +106,24 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\irs\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;libirs.lib;ws2_32.lib;%(AdditionalDependencies) + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + + {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} + + diff --git a/lib/samples/win32/update.vcxproj.in b/lib/samples/win32/update.vcxproj.in index 307496c4b0..814e7f93c6 100644 --- a/lib/samples/win32/update.vcxproj.in +++ b/lib/samples/win32/update.vcxproj.in @@ -74,8 +74,8 @@ Console true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) @@ -106,13 +106,21 @@ true ..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) Default - ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories) - @OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);%(AdditionalLibraryDirectories) + @OPENSSL_LIB@libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies) + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + + {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} + + diff --git a/lib/win32/bindevt/bindevt.vcxproj.in b/lib/win32/bindevt/bindevt.vcxproj.in index 78113e4248..7239b26c08 100644 --- a/lib/win32/bindevt/bindevt.vcxproj.in +++ b/lib/win32/bindevt/bindevt.vcxproj.in @@ -131,6 +131,11 @@ + + + {3840E563-D180-4761-AA9C-E6155F02EAFF} + + diff --git a/util/bindkeys.pl b/util/bindkeys.pl index 55d6cb2cc9..d2b8631974 100755 --- a/util/bindkeys.pl +++ b/util/bindkeys.pl @@ -12,20 +12,15 @@ use strict; use warnings; -my $lines; -while (<>) { +print "#pragma once\n"; +print "#define TRUST_ANCHORS \"\\\n"; + +my $fn = shift or die "Usage: $0 FILENAME\n"; +open(my $fh, '<', $fn) or die "cannot open file $ARGV[1]\n"; +while (<$fh>) { chomp; - if (/\/\* .Id:.* \*\//) { - next; - } s/\"/\\\"/g; - s/$/\\n\\/; - $lines .= $_ . "\n"; + print $_ . "\\n\\\n"; } - -my $mkey = "#define TRUST_ANCHORS \\\n\t\"\\\n" . $lines . "\"\n"; - -print "#ifndef BIND_KEYS_H\n"; -print "#define BIND_KEYS_H 1\n"; -print $mkey; -print "#endif /* BIND_KEYS_H */\n"; +close($fh); +print "\"\n"; diff --git a/util/check-win32util-configure b/util/check-win32util-configure index bc07b58dc5..b2556485e4 100644 --- a/util/check-win32util-configure +++ b/util/check-win32util-configure @@ -10,10 +10,9 @@ status=0 find */*/win32 win32utils -name \*.in | sed -e '/\/Makefile.in$/d' \ - -e 's/\//\\\\\\\\/g' \ -e 's/.in$/"/' \ - -e 's/^/"..\\\\\\\\/' \ - -e 's/"..\\\\\\\\win32utils\\\\\\\\/"/' | + -e 's/^/"..\//' \ + -e 's/"..\/win32utils\//"/' | while read f do if grep -F "$f" win32utils/Configure > /dev/null diff --git a/util/copyrights b/util/copyrights index ee53272280..347e19ef83 100644 --- a/util/copyrights +++ b/util/copyrights @@ -199,9 +199,6 @@ ./bin/rndc/win32/rndc.vcxproj.filters.in X 2013,2015,2018,2019,2020 ./bin/rndc/win32/rndc.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 ./bin/rndc/win32/rndc.vcxproj.user X 2013,2018,2019,2020 -./bin/rndc/win32/rndcutil.vcxproj.filters.in X 2013,2015,2018,2019,2020 -./bin/rndc/win32/rndcutil.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 -./bin/rndc/win32/rndcutil.vcxproj.user X 2013,2018,2019,2020 ./bin/tests/fromhex.pl PERL 2015,2016,2018,2019,2020 ./bin/tests/headerdep_test.sh.in SH 2000,2001,2004,2007,2012,2016,2018,2019,2020 ./bin/tests/prepare-softhsm2.sh SH 2020 @@ -960,27 +957,6 @@ ./bin/tests/testdata/wire/wire_test.data2 X 1999,2000,2001,2018,2019 ./bin/tests/testdata/wire/wire_test.data3 X 1999,2000,2001,2018,2019 ./bin/tests/testdata/wire/wire_test.data4 X 1999,2000,2001,2018,2019 -./bin/tests/win32/backtrace_test.vcxproj.filters.in X 2013,2015,2018,2019,2020 -./bin/tests/win32/backtrace_test.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 -./bin/tests/win32/backtrace_test.vcxproj.user X 2013,2018,2019,2020 -./bin/tests/win32/inter_test.vcxproj.filters.in X 2013,2015,2018,2019,2020 -./bin/tests/win32/inter_test.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 -./bin/tests/win32/inter_test.vcxproj.user X 2013,2018,2019,2020 -./bin/tests/win32/rwlock_test.vcxproj.filters.in X 2013,2015,2018,2019,2020 -./bin/tests/win32/rwlock_test.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 -./bin/tests/win32/rwlock_test.vcxproj.user X 2013,2018,2019,2020 -./bin/tests/win32/shutdown_test.vcxproj.filters.in X 2013,2015,2018,2019,2020 -./bin/tests/win32/shutdown_test.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 -./bin/tests/win32/shutdown_test.vcxproj.user X 2013,2018,2019,2020 -./bin/tests/win32/sock_test.vcxproj.filters.in X 2013,2015,2018,2019,2020 -./bin/tests/win32/sock_test.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 -./bin/tests/win32/sock_test.vcxproj.user X 2013,2018,2019,2020 -./bin/tests/win32/task_test.vcxproj.filters.in X 2013,2015,2018,2019,2020 -./bin/tests/win32/task_test.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 -./bin/tests/win32/task_test.vcxproj.user X 2013,2018,2019,2020 -./bin/tests/win32/timer_test.vcxproj.filters.in X 2013,2015,2018,2019,2020 -./bin/tests/win32/timer_test.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 -./bin/tests/win32/timer_test.vcxproj.user X 2013,2018,2019,2020 ./bin/tests/wire_test.c C 1999,2000,2001,2004,2005,2007,2015,2016,2018,2019,2020 ./bin/tools/arpaname.c C 2009,2015,2016,2018,2019,2020 ./bin/tools/arpaname.rst RST 2020 @@ -1308,7 +1284,6 @@ ./lib/dns/gen.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018,2019,2020 ./lib/dns/geoip2.c C 2019,2020 ./lib/dns/gssapi_link.c C 2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2018,2019,2020 -./lib/dns/gssapictx-dummy.c C 2020 ./lib/dns/gssapictx.c C 2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020 ./lib/dns/hmac_link.c C.NAI 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020 ./lib/dns/include/dns/acl.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013,2014,2016,2017,2018,2019,2020 @@ -2031,6 +2006,7 @@ ./lib/isc/win32/libisc.vcxproj.filters.in X 2013,2014,2015,2016,2018,2019,2020 ./lib/isc/win32/libisc.vcxproj.in X 2013,2014,2015,2016,2017,2018,2019,2020 ./lib/isc/win32/libisc.vcxproj.user X 2013,2018,2019,2020 +./lib/isc/win32/ltdl.h C 2020 ./lib/isc/win32/meminfo.c C 2015,2016,2018,2019,2020 ./lib/isc/win32/net.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2018,2019,2020 ./lib/isc/win32/netdb.h C 2000,2001,2004,2006,2007,2009,2013,2016,2018,2019,2020 @@ -2146,9 +2122,6 @@ ./lib/samples/win32/async.vcxproj.filters.in X 2014,2015,2018,2019,2020 ./lib/samples/win32/async.vcxproj.in X 2014,2015,2016,2017,2018,2019,2020 ./lib/samples/win32/async.vcxproj.user X 2014,2018,2019,2020 -./lib/samples/win32/gai.vcxproj.filters.in X 2014,2015,2018,2019,2020 -./lib/samples/win32/gai.vcxproj.in X 2014,2015,2016,2017,2018,2019,2020 -./lib/samples/win32/gai.vcxproj.user X 2014,2018,2019,2020 ./lib/samples/win32/nsprobe.vcxproj.filters.in X 2014,2015,2018,2019,2020 ./lib/samples/win32/nsprobe.vcxproj.in X 2014,2015,2016,2017,2018,2019,2020 ./lib/samples/win32/nsprobe.vcxproj.user X 2014,2018,2019,2020 diff --git a/win32utils/Configure b/win32utils/Configure index f15680f400..e33ed59215 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -14,168 +14,160 @@ # This script builds nmake and visual studio build files # -require 5.000; +require 5.18.0; +no warnings 'experimental::smartmatch'; + use strict; use File::Spec; -use Cwd; # files to configure -my $configfile = "..\\config.h"; -my $platformfile = "..\\lib\\isc\\win32\\include\\isc\\platform.h"; -my $confshfile = "..\\bin\\tests\\system\\conf.sh"; +my $configfile = "../config.h"; +my $platformfile = "../lib/isc/win32/include/isc/platform.h"; +my @confshlist = ("../bin/tests/system/conf.sh", + "../bin/tests/system/run.sh", + "../bin/tests/system/start.sh", + "../bin/tests/system/stop.sh"); -my @filelist = ("..\\lib\\dns\\win32\\libdns.def", - "..\\lib\\isc\\win32\\libisc.def"); +my @filelist = ("../lib/dns/win32/libdns.def", + "../lib/isc/win32/libisc.def"); -my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj", - "..\\bin\\check\\win32\\checkconf.vcxproj.filters", - "..\\bin\\check\\win32\\checktool.vcxproj", - "..\\bin\\check\\win32\\checktool.vcxproj.filters", - "..\\bin\\check\\win32\\checkzone.vcxproj", - "..\\bin\\check\\win32\\checkzone.vcxproj.filters", - "..\\bin\\confgen\\win32\\confgentool.vcxproj", - "..\\bin\\confgen\\win32\\confgentool.vcxproj.filters", - "..\\bin\\confgen\\win32\\ddnsconfgen.vcxproj", - "..\\bin\\confgen\\win32\\ddnsconfgen.vcxproj.filters", - "..\\bin\\confgen\\win32\\rndcconfgen.vcxproj", - "..\\bin\\confgen\\win32\\rndcconfgen.vcxproj.filters", - "..\\bin\\delv\\win32\\delv.vcxproj", - "..\\bin\\delv\\win32\\delv.vcxproj.filters", - "..\\bin\\dig\\win32\\dig.vcxproj", - "..\\bin\\dig\\win32\\dig.vcxproj.filters", - "..\\bin\\dig\\win32\\dighost.vcxproj", - "..\\bin\\dig\\win32\\dighost.vcxproj.filters", - "..\\bin\\dig\\win32\\host.vcxproj", - "..\\bin\\dig\\win32\\host.vcxproj.filters", - "..\\bin\\dig\\win32\\nslookup.vcxproj", - "..\\bin\\dig\\win32\\nslookup.vcxproj.filters", - "..\\bin\\dnssec\\win32\\cds.vcxproj", - "..\\bin\\dnssec\\win32\\cds.vcxproj.filters", - "..\\bin\\dnssec\\win32\\dnssectool.vcxproj", - "..\\bin\\dnssec\\win32\\dnssectool.vcxproj.filters", - "..\\bin\\dnssec\\win32\\dsfromkey.vcxproj", - "..\\bin\\dnssec\\win32\\dsfromkey.vcxproj.filters", - "..\\bin\\dnssec\\win32\\importkey.vcxproj", - "..\\bin\\dnssec\\win32\\importkey.vcxproj.filters", - "..\\bin\\dnssec\\win32\\keyfromlabel.vcxproj", - "..\\bin\\dnssec\\win32\\keyfromlabel.vcxproj.filters", - "..\\bin\\dnssec\\win32\\keygen.vcxproj", - "..\\bin\\dnssec\\win32\\keygen.vcxproj.filters", - "..\\bin\\dnssec\\win32\\revoke.vcxproj", - "..\\bin\\dnssec\\win32\\revoke.vcxproj.filters", - "..\\bin\\dnssec\\win32\\settime.vcxproj", - "..\\bin\\dnssec\\win32\\settime.vcxproj.filters", - "..\\bin\\dnssec\\win32\\signzone.vcxproj", - "..\\bin\\dnssec\\win32\\signzone.vcxproj.filters", - "..\\bin\\dnssec\\win32\\verify.vcxproj", - "..\\bin\\dnssec\\win32\\verify.vcxproj.filters", - "..\\bin\\named\\win32\\named.vcxproj", - "..\\bin\\named\\win32\\named.vcxproj.filters", - "..\\bin\\nsupdate\\win32\\nsupdate.vcxproj", - "..\\bin\\nsupdate\\win32\\nsupdate.vcxproj.filters", - "..\\bin\\pkcs11\\win32\\pk11destroy.vcxproj", - "..\\bin\\pkcs11\\win32\\pk11destroy.vcxproj.filters", - "..\\bin\\pkcs11\\win32\\pk11keygen.vcxproj", - "..\\bin\\pkcs11\\win32\\pk11keygen.vcxproj.filters", - "..\\bin\\pkcs11\\win32\\pk11list.vcxproj", - "..\\bin\\pkcs11\\win32\\pk11list.vcxproj.filters", - "..\\bin\\pkcs11\\win32\\pk11tokens.vcxproj", - "..\\bin\\pkcs11\\win32\\pk11tokens.vcxproj.filters", - "..\\bin\\rndc\\win32\\rndc.vcxproj", - "..\\bin\\rndc\\win32\\rndc.vcxproj.filters", - "..\\bin\\rndc\\win32\\rndcutil.vcxproj", - "..\\bin\\rndc\\win32\\rndcutil.vcxproj.filters", - "..\\bin\\tools\\win32\\arpaname.vcxproj", - "..\\bin\\tools\\win32\\arpaname.vcxproj.filters", - "..\\bin\\tools\\win32\\journalprint.vcxproj", - "..\\bin\\tools\\win32\\journalprint.vcxproj.filters", - "..\\bin\\tools\\win32\\mdig.vcxproj", - "..\\bin\\tools\\win32\\mdig.vcxproj.filters", - "..\\bin\\tools\\win32\\nsec3hash.vcxproj", - "..\\bin\\tools\\win32\\nsec3hash.vcxproj.filters", - "..\\bin\\tools\\win32\\rrchecker.vcxproj", - "..\\bin\\tools\\win32\\rrchecker.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\bigkey.vcxproj", - "..\\bin\\tests\\system\\win32\\bigkey.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\feature-test.vcxproj", - "..\\bin\\tests\\system\\win32\\feature-test.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\gencheck.vcxproj", - "..\\bin\\tests\\system\\win32\\gencheck.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\keycreate.vcxproj", - "..\\bin\\tests\\system\\win32\\keycreate.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\keydelete.vcxproj", - "..\\bin\\tests\\system\\win32\\keydelete.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\pipequeries.vcxproj", - "..\\bin\\tests\\system\\win32\\pipequeries.vcxproj.filters", - "..\\bin\\tests\\win32\\backtrace_test.vcxproj", - "..\\bin\\tests\\win32\\backtrace_test.vcxproj.filters", - "..\\bin\\tests\\win32\\inter_test.vcxproj", - "..\\bin\\tests\\win32\\inter_test.vcxproj.filters", - "..\\bin\\tests\\system\\win32\\makejournal.vcxproj", - "..\\bin\\tests\\system\\win32\\makejournal.vcxproj.filters", - "..\\bin\\tests\\win32\\rwlock_test.vcxproj", - "..\\bin\\tests\\win32\\rwlock_test.vcxproj.filters", - "..\\bin\\tests\\win32\\shutdown_test.vcxproj", - "..\\bin\\tests\\win32\\shutdown_test.vcxproj.filters", - "..\\bin\\tests\\win32\\sock_test.vcxproj", - "..\\bin\\tests\\win32\\sock_test.vcxproj.filters", - "..\\bin\\tests\\win32\\task_test.vcxproj", - "..\\bin\\tests\\win32\\task_test.vcxproj.filters", - "..\\bin\\tests\\win32\\timer_test.vcxproj", - "..\\bin\\tests\\win32\\timer_test.vcxproj.filters", - "..\\bin\\tests\\win32\\inter_test.vcxproj", - "..\\bin\\tests\\win32\\inter_test.vcxproj.filters", - "..\\bin\\tests\\win32\\rwlock_test.vcxproj", - "..\\bin\\tests\\win32\\rwlock_test.vcxproj.filters", - "..\\bin\\tests\\win32\\shutdown_test.vcxproj", - "..\\bin\\tests\\win32\\shutdown_test.vcxproj.filters", - "..\\bin\\tests\\win32\\sock_test.vcxproj", - "..\\bin\\tests\\win32\\sock_test.vcxproj.filters", - "..\\bin\\tests\\win32\\task_test.vcxproj", - "..\\bin\\tests\\win32\\task_test.vcxproj.filters", - "..\\bin\\tests\\win32\\timer_test.vcxproj", - "..\\bin\\tests\\win32\\timer_test.vcxproj.filters", - "..\\bin\\win32\\BINDInstall\\BINDInstall.vcxproj", - "..\\bin\\win32\\BINDInstall\\BINDInstall.vcxproj.filters", - "..\\lib\\bind9\\win32\\libbind9.vcxproj", - "..\\lib\\bind9\\win32\\libbind9.vcxproj.filters", - "..\\lib\\dns\\win32\\gen.vcxproj", - "..\\lib\\dns\\win32\\gen.vcxproj.filters", - "..\\lib\\dns\\win32\\libdns.vcxproj", - "..\\lib\\dns\\win32\\libdns.vcxproj.filters", - "..\\lib\\irs\\win32\\libirs.vcxproj", - "..\\lib\\irs\\win32\\libirs.vcxproj.filters", - "..\\lib\\isc\\win32\\libisc.vcxproj", - "..\\lib\\isc\\win32\\libisc.vcxproj.filters", - "..\\lib\\isccc\\win32\\libisccc.vcxproj", - "..\\lib\\isccc\\win32\\libisccc.vcxproj.filters", - "..\\lib\\isccfg\\win32\\libisccfg.vcxproj", - "..\\lib\\isccfg\\win32\\libisccfg.vcxproj.filters", - "..\\lib\\ns\\win32\\libns.vcxproj", - "..\\lib\\samples\\win32\\resolve.vcxproj", - "..\\lib\\samples\\win32\\resolve.vcxproj.filters", - "..\\lib\\samples\\win32\\async.vcxproj", - "..\\lib\\samples\\win32\\async.vcxproj.filters", - "..\\lib\\samples\\win32\\gai.vcxproj", - "..\\lib\\samples\\win32\\gai.vcxproj.filters", - "..\\lib\\samples\\win32\\update.vcxproj", - "..\\lib\\samples\\win32\\update.vcxproj.filters", - "..\\lib\\samples\\win32\\request.vcxproj", - "..\\lib\\samples\\win32\\request.vcxproj.filters", - "..\\lib\\samples\\win32\\nsprobe.vcxproj", - "..\\lib\\samples\\win32\\nsprobe.vcxproj.filters", - "..\\lib\\win32\\bindevt\\bindevt.vcxproj", - "..\\lib\\win32\\bindevt\\bindevt.vcxproj.filters", +my @projectlist = ("../bin/check/win32/checkconf.vcxproj", + "../bin/check/win32/checkconf.vcxproj.filters", + "../bin/check/win32/checktool.vcxproj", + "../bin/check/win32/checktool.vcxproj.filters", + "../bin/check/win32/checkzone.vcxproj", + "../bin/check/win32/checkzone.vcxproj.filters", + "../bin/confgen/win32/confgentool.vcxproj", + "../bin/confgen/win32/confgentool.vcxproj.filters", + "../bin/confgen/win32/ddnsconfgen.vcxproj", + "../bin/confgen/win32/ddnsconfgen.vcxproj.filters", + "../bin/confgen/win32/rndcconfgen.vcxproj", + "../bin/confgen/win32/rndcconfgen.vcxproj.filters", + "../bin/delv/win32/delv.vcxproj", + "../bin/delv/win32/delv.vcxproj.filters", + "../bin/dig/win32/dig.vcxproj", + "../bin/dig/win32/dig.vcxproj.filters", + "../bin/dig/win32/dighost.vcxproj", + "../bin/dig/win32/dighost.vcxproj.filters", + "../bin/dig/win32/host.vcxproj", + "../bin/dig/win32/host.vcxproj.filters", + "../bin/dig/win32/nslookup.vcxproj", + "../bin/dig/win32/nslookup.vcxproj.filters", + "../bin/dnssec/win32/cds.vcxproj", + "../bin/dnssec/win32/cds.vcxproj.filters", + "../bin/dnssec/win32/dnssectool.vcxproj", + "../bin/dnssec/win32/dnssectool.vcxproj.filters", + "../bin/dnssec/win32/dsfromkey.vcxproj", + "../bin/dnssec/win32/dsfromkey.vcxproj.filters", + "../bin/dnssec/win32/importkey.vcxproj", + "../bin/dnssec/win32/importkey.vcxproj.filters", + "../bin/dnssec/win32/keyfromlabel.vcxproj", + "../bin/dnssec/win32/keyfromlabel.vcxproj.filters", + "../bin/dnssec/win32/keygen.vcxproj", + "../bin/dnssec/win32/keygen.vcxproj.filters", + "../bin/dnssec/win32/revoke.vcxproj", + "../bin/dnssec/win32/revoke.vcxproj.filters", + "../bin/dnssec/win32/settime.vcxproj", + "../bin/dnssec/win32/settime.vcxproj.filters", + "../bin/dnssec/win32/signzone.vcxproj", + "../bin/dnssec/win32/signzone.vcxproj.filters", + "../bin/dnssec/win32/verify.vcxproj", + "../bin/dnssec/win32/verify.vcxproj.filters", + "../bin/named/win32/named.vcxproj", + "../bin/named/win32/named.vcxproj.filters", + "../bin/nsupdate/win32/nsupdate.vcxproj", + "../bin/nsupdate/win32/nsupdate.vcxproj.filters", + "../bin/pkcs11/win32/pk11destroy.vcxproj", + "../bin/pkcs11/win32/pk11destroy.vcxproj.filters", + "../bin/pkcs11/win32/pk11keygen.vcxproj", + "../bin/pkcs11/win32/pk11keygen.vcxproj.filters", + "../bin/pkcs11/win32/pk11list.vcxproj", + "../bin/pkcs11/win32/pk11list.vcxproj.filters", + "../bin/pkcs11/win32/pk11tokens.vcxproj", + "../bin/pkcs11/win32/pk11tokens.vcxproj.filters", + "../bin/rndc/win32/rndc.vcxproj", + "../bin/rndc/win32/rndc.vcxproj.filters", + "../bin/tools/win32/arpaname.vcxproj", + "../bin/tools/win32/arpaname.vcxproj.filters", + "../bin/tools/win32/journalprint.vcxproj", + "../bin/tools/win32/journalprint.vcxproj.filters", + "../bin/tools/win32/mdig.vcxproj", + "../bin/tools/win32/mdig.vcxproj.filters", + "../bin/tools/win32/nsec3hash.vcxproj", + "../bin/tools/win32/nsec3hash.vcxproj.filters", + "../bin/tools/win32/rrchecker.vcxproj", + "../bin/tools/win32/rrchecker.vcxproj.filters", + "../bin/tests/system/win32/bigkey.vcxproj", + "../bin/tests/system/win32/bigkey.vcxproj.filters", + "../bin/tests/system/win32/feature-test.vcxproj", + "../bin/tests/system/win32/feature-test.vcxproj.filters", + "../bin/tests/system/win32/gencheck.vcxproj", + "../bin/tests/system/win32/gencheck.vcxproj.filters", + "../bin/tests/system/win32/keycreate.vcxproj", + "../bin/tests/system/win32/keycreate.vcxproj.filters", + "../bin/tests/system/win32/keydelete.vcxproj", + "../bin/tests/system/win32/keydelete.vcxproj.filters", + "../bin/tests/system/win32/pipequeries.vcxproj", + "../bin/tests/system/win32/pipequeries.vcxproj.filters", + "../bin/tests/system/win32/makejournal.vcxproj", + "../bin/tests/system/win32/makejournal.vcxproj.filters", + "../bin/win32/BINDInstall/BINDInstall.vcxproj", + "../bin/win32/BINDInstall/BINDInstall.vcxproj.filters", + "../lib/bind9/win32/libbind9.vcxproj", + "../lib/bind9/win32/libbind9.vcxproj.filters", + "../lib/dns/win32/gen.vcxproj", + "../lib/dns/win32/gen.vcxproj.filters", + "../lib/dns/win32/libdns.vcxproj", + "../lib/dns/win32/libdns.vcxproj.filters", + "../lib/irs/win32/libirs.vcxproj", + "../lib/irs/win32/libirs.vcxproj.filters", + "../lib/isc/win32/libisc.vcxproj", + "../lib/isc/win32/libisc.vcxproj.filters", + "../lib/isccc/win32/libisccc.vcxproj", + "../lib/isccc/win32/libisccc.vcxproj.filters", + "../lib/isccfg/win32/libisccfg.vcxproj", + "../lib/isccfg/win32/libisccfg.vcxproj.filters", + "../lib/ns/win32/libns.vcxproj", + "../lib/samples/win32/resolve.vcxproj", + "../lib/samples/win32/resolve.vcxproj.filters", + "../lib/samples/win32/async.vcxproj", + "../lib/samples/win32/async.vcxproj.filters", + "../lib/samples/win32/update.vcxproj", + "../lib/samples/win32/update.vcxproj.filters", + "../lib/samples/win32/request.vcxproj", + "../lib/samples/win32/request.vcxproj.filters", + "../lib/samples/win32/nsprobe.vcxproj", + "../lib/samples/win32/nsprobe.vcxproj.filters", + "../lib/win32/bindevt/bindevt.vcxproj", + "../lib/win32/bindevt/bindevt.vcxproj.filters", "bind9.sln"); # for config.h my %configdefh; -my @substdefh = ("PACKAGE_CONFIGARGS", +my @substdefh = ("PACKAGE_VERSION_MAJOR", + "PACKAGE_VERSION_MINOR", + "PACKAGE_VERSION_PATCH", + "PACKAGE_VERSION_EXTRA", + "PACKAGE_VERSION", + "PACKAGE_NAME", + "PACKAGE_DESCRIPTION", + "PACKAGE_SRCID", + "PACKAGE_CONFIGARGS", + "PACKAGE_BUILDER", + "PACKAGE_STRING", + "MAPAPI", "DNS_RDATASET_FIXED", "HAVE_GEOIP2", + "HAVE_GSSAPI", + "HAVE_GSSAPI_H", + "HAVE_GSSAPI_KRB5_H", + "HAVE_KRB5_H", + "HAVE_GSSAPI_GSSAPI_H", + "HAVE_GSSAPI_GSSAPI_KRB5_H", + "HAVE_KRB5_KRB5_H", "HAVE_LIBXML2", "HAVE_OPENSSL_ED25519", "HAVE_OPENSSL_ED448", @@ -224,7 +216,15 @@ my @substtest = ("CRYPTO", "JSONSTATS", "NZD_TOOLS", "XMLSTATS", - "ZLIB"), + "ZLIB", + "builddir", + "srcdir", + "abs_builddir", + "abs_srcdir", + "top_builddir", + "top_srcdir", + "abs_top_builddir", + "abs_top_srcdir"); # includes @@ -273,7 +273,7 @@ my @substdll = ("COMERR_DLL", # variables my %configvar = ( - "TOOLS_VERSION" => "4.0", + "TOOLS_VERSION" => "4.0", ); my @substvar = ("BIND9_VERSION", @@ -296,16 +296,14 @@ my @substvar = ("BIND9_VERSION", "PYTHON", "TOOLS_VERSION", "VCREDIST_PATH", - "WINDOWS_TARGET_PLATFORM_VERSION"), + "WINDOWS_TARGET_PLATFORM_VERSION"); # defines my %configdefd; my @substdefd = ("PK11_LIB_LOCATION", - "USE_GSSAPI", - "USE_PYTHON", - "USE_ISC_SPNEGO"); + "USE_PYTHON"); # conditions @@ -322,11 +320,17 @@ my @substcond = ("ATOMIC", "SAMPLES", "STESTS", "TESTS", - "XTESTS", "ZLIB"); my @allcond = (@substcond, "NOTYET", "NOLONGER"); +# paths + +my $top_builddir = File::Spec->updir(); +my $top_srcdir = File::Spec->updir(); +my $abs_top_builddir = File::Spec->rel2abs($top_builddir); +my $abs_top_srcdir = File::Spec->rel2abs($top_srcdir); + # arguments # enable-xxx/disable-xxx @@ -334,7 +338,6 @@ my @allcond = (@substcond, "NOTYET", "NOLONGER"); my @enablelist = ("developer", "fixed-rrset", "intrinsics", - "isc-spnego", "native-pkcs11", "openssl-hash", "querytrace"); @@ -388,7 +391,6 @@ my @help = ( " enable-intrinsics enable intrinsic/atomic functions [default=yes]\n", " enable-native-pkcs11 use native PKCS#11 for all crypto [default=no]\n", " enable-openssl-hash use OpenSSL for hash functions [default=yes]\n", -" enable-isc-spnego use SPNEGO from lib/dns [default=yes]\n", " enable-fixed-rrset enable fixed rrset ordering [default=no]\n", " enable-developer enable developer build settings [default=no]\n", " enable-querytrace enable very verbose query trace [default=no]\n", @@ -431,41 +433,39 @@ my $enable_intrinsics = "yes"; my $cryptolib = ""; my $enable_native_pkcs11 = "no"; my $enable_crypto_rand = "yes"; -my $enable_isc_spnego = "yes"; my $enable_fixed_rrset = "no"; my $enable_developer = "no"; my $enable_querytrace = "no"; my $enable_rpz_nsip = "yes"; my $enable_rpz_nsdname = "yes"; my $use_tests = "no"; -my $use_xtests = "no"; my $use_stests = "no"; my $use_samples = "no"; my $use_libuv = "auto"; -my $libuv_path = "..\\..\\"; +my $libuv_path = "../../"; my $use_openssl = "auto"; -my $openssl_path = "..\\..\\"; +my $openssl_path = "../../"; my $use_pkcs11 = "no"; my $pkcs11_path = "unknown"; my $use_aes = "auto"; my $use_gssapi = "no"; my $validation_default = "auto"; -my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\"; +my $gssapi_path = "C:/Program\ Files/MIT/Kerberos/"; my $use_geoip2 = "no"; my $geoip2_path = ""; my $use_libxml2 = "auto"; -my $libxml2_path = "..\\..\\"; +my $libxml2_path = "../../"; my $with_pssuspend = "no"; my $pssuspend_command = "pssuspend.exe"; my $use_python = "auto"; my $python_command = "python.exe"; my $use_readline = "no"; -my $readline_path = "..\\..\\"; +my $readline_path = "../../"; my $use_idn = "no"; -my $idn_path = "..\\..\\"; +my $idn_path = "../../"; my $iconv_path = " --idn-- "; my $use_zlib = "no"; -my $zlib_path = "..\\..\\"; +my $zlib_path = "../../"; my $use_vcredist = "yes"; my $vcredist_path = " --infer-- "; my $cross_compile = "no"; @@ -530,7 +530,7 @@ if ($want_checkfiles eq "yes") { my $status=0; foreach (@filelist) { my $name = $_; - $name =~ s/\\/\\\\/g; + $name =~ s/\\/\//g; next if -r $_ . ".in"; s/\\/\//g; next if -r $_ . ".in"; @@ -539,7 +539,7 @@ if ($want_checkfiles eq "yes") { } foreach (@projectlist) { my $name = $_; - $name =~ s/\\/\\\\/g; + $name =~ s/\\/\//g; next if -r $_ . ".in"; s/\\/\//g; next if -r $_ . ".in"; @@ -567,44 +567,95 @@ if (($want_win32 eq "yes") && ($want_x64 eq "yes")) { # Standard configure variable $configvar{"EXEEXT"} = ".exe"; -# get the version information +$configtest{"builddir"} = kw("."); +$configtest{"srcdir"} = kw("."); +$configtest{"abs_top_builddir"} = kw($abs_top_builddir); +$configtest{"abs_top_builddir"} =~ s/\\/\//g; +$configtest{"abs_top_srcdir"} = kw($abs_top_srcdir); +$configtest{"abs_top_srcdir"} =~ s/\\/\//g; -my %Versions; +# Mimic AC_INIT() from autoconf by loading values from configure.ac -sub getversion { - my $data; - my $name; - my $value; - my $version; +sub ac_init { + my $package_name; + my $package_bugreport; + my $package_url; + my $package_version; + my $package_version_major; + my $package_version_minor; + my $package_version_patch; + my $package_version_extra; + my $package_description; + my $package_srcid; + my $mapapi; - open V, "..\\version" || die $!; + open V, "../configure.ac" || die $!; while () { chomp; - ($data) = split(/\#/); - if ($data) { - ($name, $value) = split(/=/, $data); - ($name) = split(/\s+/, $name); - if ($name eq 'PRODUCT' || $name eq 'DESCRIPTION') { - ($value) =~ s/^["\s]+//; - ($value) =~ s/["\s]+$//; - } else { - ($value) = split(/\s+/, $value); - } - $Versions{$name} = $value; + if (/^AC_INIT\(\[(.*?)\],\s*bind_PKG_VERSION,\s*\[(.*?)\],\s*\[(.*?)\],\s*\[(.*?)\]\)$/) { + $package_name = $1; + $package_bugreport = $2; + $package_url = $4; + } elsif (/m4_define\(\[bind_VERSION_MAJOR\],\s*(.*?)\)/) { + $package_version_major = $1; + } elsif (/m4_define\(\[bind_VERSION_MINOR\],\s*(.*?)\)/) { + $package_version_minor = $1; + } elsif (/m4_define\(\[bind_VERSION_PATCH\],\s*(.*?)\)/) { + $package_version_patch = $1; + } elsif (/m4_define\(\[bind_VERSION_EXTRA\],\s*(.*?)\)/) { + $package_version_extra = $1; + } elsif (/m4_define\(\[bind_DESCRIPTION\],\s*\[(.*?)\]\)/) { + $package_description = $1; + } elsif (/AC_DEFINE\(\[MAPAPI\],\s*\[(.*?)\],\s*\[.*?\]\)/) { + $mapapi = $1; } } close V; - $version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}"; - if ($Versions{'PATCHVER'} ne "") { - $version = "$version.$Versions{'PATCHVER'}"; + $package_version = "${package_version_major}.${package_version_minor}.${package_version_patch}${package_version_extra}"; + + my $srcid_fn = "../srcid"; + + if (-f $srcid_fn) { + open(my $fh, '<', $srcid_fn) or die "cannot open file $srcid_fn"; + { + local $/; + $package_srcid = <$fh>; + } + close($fh); + } elsif (-d "../.git") { + $package_srcid = substr(`git rev-list --max-count=1 HEAD`, 0, 7); + } else { + $package_srcid = ""; } - $version = "$version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}"; - $version = "$version$Versions{'EXTENSIONS'}"; - $configvar{"BIND9_VERSION"} = "$version"; + chomp($package_srcid); + + if (length($package_srcid) == 0) { + $package_srcid = "unset_id"; + } + if ($verbose) { + print "BIND SRCID: $package_srcid\n"; + } + + # Now define those in config.h + + $configdefh{'PACKAGE_NAME'} = "\"$package_name\""; + $configdefh{'PACKAGE_BUGREPORT'} = "\"$package_bugreport\""; + $configdefh{'PACKAGE_URL'} = "\"$package_url\""; + + $configdefh{'PACKAGE_VERSION_MAJOR'} = "\"$package_version_major\""; + $configdefh{'PACKAGE_VERSION_MINOR'} = "\"$package_version_minor\""; + $configdefh{'PACKAGE_VERSION_PATCH'} = "\"$package_version_patch\""; + $configdefh{'PACKAGE_VERSION_EXTRA'} = "\"$package_version_extra\""; + $configdefh{'PACKAGE_DESCRIPTION'} = "\" $package_description\""; + $configdefh{'PACKAGE_SRCID'} = "\"$package_srcid\""; + + $configdefh{'PACKAGE_VERSION'} = "\"$package_version\""; + $configdefh{'PACKAGE_STRING'} = "\"$package_name $package_version\""; + $configdefh{'MAPAPI'} = $mapapi; } -getversion(); +ac_init(); # append seen args to CONFIGARGS define @@ -642,10 +693,6 @@ sub myenable { if ($val =~ /^yes$/i) { $enable_native_pkcs11 = "yes"; } - } elsif ($key =~ /^isc-spnego$/i) { - if ($val =~ /^no$/i) { - $enable_isc_spnego = "no"; - } } elsif ($key =~ /^fixed-rrset$/i) { if ($val =~ /^yes$/i) { $enable_fixed_rrset = "yes"; @@ -681,7 +728,6 @@ if ($enable_developer eq "yes") { $enable_fixed_rrset = "yes"; # TODO: dlz filesystem $use_tests = "yes"; - $use_xtests = "yes"; $use_stests = "yes"; $use_samples = "yes"; } @@ -699,7 +745,6 @@ sub mywith { } elsif ($key =~ /^extra-tests$/i) { if ($val =~ /^yes$/i) { $use_tests = "yes"; - $use_xtests = "yes"; } } elsif ($key =~ /^system-tests$/i) { if ($val =~ /^yes$/i) { @@ -758,7 +803,7 @@ sub mywith { if ($val !~ /^yes$/i) { $geoip2_path = $val; } else { - $geoip2_path = "..\\..\\GeoIP2"; + $geoip2_path = "../../GeoIP2"; } } } elsif ($key =~ /^readline$/i) { @@ -850,7 +895,10 @@ if ($want_clean eq "yes") { unlink($configfile); unlink($platformfile); - unlink($confshfile); + + foreach $file (@confshlist) { + unlink($file); + } foreach $file (@filelist) { unlink($file); @@ -896,11 +944,6 @@ if ($verbose) { print "native-pkcs11: disabled\n"; } print "openssl-hash: enabled\n"; - if ($enable_isc_spnego eq "yes") { - print "isc-spnego: enabled\n"; - } else { - print "isc-spnego: disabled\n"; - } if ($enable_fixed_rrset eq "yes") { print "fixed-rrset: enabled\n"; } else { @@ -921,9 +964,6 @@ if ($verbose) { if ($use_tests eq "yes") { print "tests: enabled\n"; } - if ($use_xtests eq "yes") { - print "extra tests: enabled\n"; - } if ($use_stests eq "yes") { print "system tests: enabled\n"; } @@ -996,40 +1036,40 @@ if ($vcredist_path eq " --infer-- ") { my @vcpaths = {}; push(@vcpaths, $ENV{"VCRedistPath"}) if ($ENV{"VCRedistPath"} ne ""); - push(@vcpaths, File::Spec->catfile( cwd(), "..", ".." )); + push(@vcpaths, File::Spec->catdir( File::Spec->curdir(), "..", ".." )); if ($ENV{"FrameworkSDKDir"} ne "" && $want_win32 eq "yes") { - push(@vcpaths, File::Spec->catfile($ENV{"FrameworkSDKDir"}, + push(@vcpaths, File::Spec->catdir($ENV{"FrameworkSDKDir"}, "BootStrapper", "Packages", "vcredist_x86")); } elsif ($ENV{"FrameworkSDKDir"} ne "" && $want_x64 eq "yes") { - push(@vcpaths, File::Spec->catfile($ENV{"FrameworkSDKDir"}, + push(@vcpaths, File::Spec->catdir($ENV{"FrameworkSDKDir"}, "BootStrapper", "Packages", "vcredist_x64")); } if ($ENV{"WindowsSDKDir"} ne "" && $want_win32 eq "yes") { - push(@vcpaths, File::Spec->catfile($ENV{"WindowsSDKDir"}, + push(@vcpaths, File::Spec->catdir($ENV{"WindowsSDKDir"}, "BootStrapper", "Packages", "vcredist_x86")); } elsif ($ENV{"WindowsSDKDir"} ne "" && $want_x64 eq "yes") { - push(@vcpaths, File::Spec->catfile($ENV{"WindowsSDKDir"}, + push(@vcpaths, File::Spec->catdir($ENV{"WindowsSDKDir"}, "BootStrapper", "Packages", "vcredist_x64")); } if ($ENV{"WindowsSDKDir_old"} ne "" && $want_win32 eq "yes") { - push(@vcpaths, File::Spec->catfile($ENV{"WindowsSDKDir_old"}, + push(@vcpaths, File::Spec->catdir($ENV{"WindowsSDKDir_old"}, "BootStrapper", "Packages", "vcredist_x86")); } elsif ($ENV{"WindowsSDKDir_old"} ne "" && $want_x64 eq "yes") { - push(@vcpaths, File::Spec->catfile($ENV{"WindowsSDKDir_old"}, + push(@vcpaths, File::Spec->catdir($ENV{"WindowsSDKDir_old"}, "BootStrapper", "Packages", "vcredist_x64")); } if ($ENV{"VCINSTALLDIR"}) { - push(@vcpaths, File::Spec->catfile($ENV{"VCINSTALLDIR"}, + push(@vcpaths, File::Spec->catdir($ENV{"VCINSTALLDIR"}, "redist", "1033")); } @@ -1072,25 +1112,27 @@ print F << 'EOF'; int main(void) { - printf("%d\n", _MSC_VER); + printf("%d", _MSC_VER); return(0); } EOF close F; my $compret = `cl /nologo /MD mscver.c`; -if (grep { -f and -x } ".\\mscver.exe") { - $msc_ver = `.\\mscver.exe`; +if (grep { -f and -x } "./mscver.exe") { + $msc_ver = `./mscver.exe`; } else { die "can't get _MSC_VER value: $compret\n"; } if ($verbose) { print "_MSC_VER == $msc_ver\n"; } -if ($msc_ver < 1600) { +if ($msc_ver < 1910) { print STDERR "too old version of C++ compiler/Visual Studio\n"; exit 1; } +$configdefh{'PACKAGE_BUILDER'} = "\"MSVC $msc_ver\""; + # gen single threaded for < VS 2005 if ($msc_ver < 1400) { @@ -1146,8 +1188,8 @@ main(void) EOF close F; my $compret = `cl /nologo /MD cross.c`; - if (grep { -f and -x } ".\\cross.exe") { - my $cross = `.\\cross.exe`; + if (grep { -f and -x } "./cross.exe") { + my $cross = `./cross.exe`; if ($cross) { print STDERR $cross; } @@ -1171,8 +1213,8 @@ main(void) EOF close F; my $compret = `cl /nologo /MD cross.c`; - if (grep { -f and -x } ".\\cross.exe") { - my $cross = `.\\cross.exe`; + if (grep { -f and -x } "./cross.exe") { + my $cross = `./cross.exe`; if ($cross) { print STDERR $cross; } @@ -1214,11 +1256,6 @@ if ($use_tests eq "yes") { $configcond{"TESTS"} = 1; } -# with-extra-tests -if ($use_xtests eq "yes") { - $configcond{"XTESTS"} = 1; -} - # with-system-tests if ($use_stests eq "yes") { $configcond{"STESTS"} = 1; @@ -1249,7 +1286,7 @@ if ($use_libuv eq "auto") { foreach $file (sort {uc($b) cmp uc($a)} @dirlist) { if (-f File::Spec->catfile($libuv_path, $file, - "include\\uv.h")) { + "include", "uv.h")) { $libuv_path = File::Spec->catdir($libuv_path, $file); $use_libuv = "yes"; last; @@ -1276,7 +1313,7 @@ if ($use_libuv eq "yes") { } my $libuv_new = 0; if (!-f File::Spec->catfile($libuv_path, - "include\\uv.h")) { + "include", "uv.h")) { die "can't find libuv uv.h include\n"; } my $libuv_inc = File::Spec->catdir($libuv_path, "include"); @@ -1321,14 +1358,14 @@ if ($use_openssl eq "auto") { foreach $file (sort {uc($b) cmp uc($a)} @dirlist) { if (-f File::Spec->catfile($openssl_path, $file, - "inc32\\openssl\\opensslv.h")) { + "inc32/openssl/opensslv.h")) { $openssl_path = File::Spec->catdir($openssl_path, $file); $use_openssl = "yes"; last; } if (-f File::Spec->catfile($openssl_path, $file, - "include\\openssl\\opensslv.h")) { + "include/openssl/opensslv.h")) { $openssl_path = File::Spec->catdir($openssl_path, $file); $use_openssl = "yes"; last; @@ -1348,10 +1385,10 @@ if ($use_openssl eq "yes") { } my $openssl_new = 0; if (!-f File::Spec->catfile($openssl_path, - "inc32\\openssl\\opensslv.h")) { + "inc32/openssl/opensslv.h")) { $openssl_new = 1; if (!-f File::Spec->catfile($openssl_path, - "include\\openssl\\opensslv.h")) { + "include/openssl/opensslv.h")) { die "can't find OpenSSL opensslv.h include\n"; } } @@ -1388,7 +1425,7 @@ if ($use_openssl eq "yes") { if (scalar(@dirlist) != 1) { die "find more than one OpenSSL libcrypto-*.dll DLL candidate\n"; } - $openssl_dll = File::Spec->catdir($openssl_path, "@dirlist[0]"); + $openssl_dll = File::Spec->catdir($openssl_path, "$dirlist[0]"); } $cryptolib = "openssl"; @@ -1431,8 +1468,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" testossl.c "$library"`; - if (grep { -f and -x } ".\\testossl.exe") { - `.\\testossl.exe`; + if (grep { -f and -x } "./testossl.exe") { + `./testossl.exe`; if ($? != 0) { die "OpenSSL test failed\n"; } @@ -1465,8 +1502,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" testosslv.c "$library"`; - if (grep { -f and -x } ".\\testosslv.exe") { - `.\\testosslv.exe`; + if (grep { -f and -x } "./testosslv.exe") { + `./testosslv.exe`; if ($? != 0) { die "OpenSSL version test failed\n"; } @@ -1499,8 +1536,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" testosslfunc.c "$library"`; - if (grep { -f and -x } ".\\testosslfunc.exe") { - `.\\testosslfunc.exe`; + if (grep { -f and -x } "./testosslfunc.exe") { + `./testosslfunc.exe`; if ($? == 0) { $configdefh{"HAVE_DH_GET0_KEY"} = 1; $configdefh{"HAVE_ECDSA_SIG_GET0"} = 1; @@ -1543,8 +1580,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" tested25519.c "$library"`; - if (grep { -f and -x } ".\\tested25519.exe") { - `.\\tested25519.exe`; + if (grep { -f and -x } "./tested25519.exe") { + `./tested25519.exe`; if ($? == 0) { $configdefh{"HAVE_OPENSSL_ED25519"} = 1; } else { @@ -1584,8 +1621,8 @@ EOF my $include = $configinc{"OPENSSL_INC"}; my $library = $configlib{"OPENSSL_LIB"}; $compret = `cl /nologo /MD /I "$include" tested448.c "$library"`; - if (grep { -f and -x } ".\\tested448.exe") { - `.\\tested448.exe`; + if (grep { -f and -x } "./tested448.exe") { + `./tested448.exe`; if ($? == 0) { $configdefh{"HAVE_OPENSSL_ED448"} = 1; } else { @@ -1631,17 +1668,32 @@ if ($use_gssapi eq "no") { print "checking for gssapi directory at \"$gssapi_path\"\n"; } $configcond{"GSSAPI"} = 1; - $configdefd{"USE_GSSAPI"} = "GSSAPI"; - if (!-f File::Spec->catfile($gssapi_path, "include", + $configdefh{"HAVE_GSSAPI"} = 1; + if (-f File::Spec->catfile($gssapi_path, "include", "gssapi", "gssapi.h")) { + $configdefh{"HAVE_GSSAPI_GSSAPI_H"} = 1; + } elsif (-f File::Spec->catfile($gssapi_path, "include", + "gssapi", "gssapi.h")) { + $configdefh{"HAVE_GSSAPI_H"} = 1; + } else { die "can't find gssapi.h include\n"; } - if (!-f File::Spec->catfile($gssapi_path, "include", + if (-f File::Spec->catfile($gssapi_path, "include", "gssapi", "gssapi_krb5.h")) { + $configdefh{"HAVE_GSSAPI_GSSAPI_KRB5_H"} = 1; + } elsif (-f File::Spec->catfile($gssapi_path, "include", + "gssapi_krb5.h")) { + $configdefh{"HAVE_GSSAPI_KRB5_H"} = 1; + } else { die "can't find gssapi_krb5.h include\n"; } - if (!-f File::Spec->catfile($gssapi_path, "include", + if (-f File::Spec->catfile($gssapi_path, "include", "krb5", "krb5.h")) { + $configdefh{"HAVE_KRB5_KRB5_H"} = 1; + } elsif (-f File::Spec->catfile($gssapi_path, "include", + "krb5", "krb5.h")) { + $configdefh{"HAVE_KRB5_H"} = 1; + } else { die "can't find krb5.h include\n"; } $configinc{"GSSAPI_INC"} = File::Spec->catdir($gssapi_path, "include"); @@ -1713,16 +1765,6 @@ if ($use_gssapi eq "no") { $configdll{"WSHELP_DLL"} = "$wshelp_dll"; } -# enable-isc-spnego -if ($use_gssapi ne "yes") { - $enable_isc_spnego = "no"; -} elsif ($enable_isc_spnego eq "yes") { - if ($use_gssapi eq "no") { - die "No GSSAPI for SPNEGO\n"; - } - $configdefd{"USE_ISC_SPNEGO"} = "USE_ISC_SPNEGO"; -} - # disable-auto-validation $configdefh{"VALIDATION_DEFAULT"} = "\"$validation_default\""; @@ -1764,8 +1806,8 @@ int main(void) { EOF close F; $compret = `cl /nologo $geoip_inc /MD testgeoip2.c $geoip2_libs`; - if (grep { -f and -x } ".\\testgeoip2.exe") { - `.\\testgeoip2.exe`; + if (grep { -f and -x } "./testgeoip2.exe") { + `./testgeoip2.exe`; if ($? == 0) { die "GeoIP2 test failed\n"; } @@ -1816,7 +1858,7 @@ if ($use_idn eq "no") { print "checking for IDN kit directory at \"$idn_path\"\n"; } if (!-f File::Spec->catfile($idn_path, "idn", "api.h")) { - die "can't find idn\\api.h include\n"; + die "can't find idn/api.h include\n"; } if (!-f File::Spec->catfile($idn_path, "idn", "idnkit.lib")) { die "can't find idnkit.lib library\n"; @@ -1835,7 +1877,7 @@ if ($use_idn eq "no") { my $iconv_dll = File::Spec->catfile($idn_path, "idn", "iconv.dll"); $configdll{"ICONV_DLL"} = "$iconv_dll"; } else { - my $iconv_dll =File::Spec->catfile($iconv_path, "iconv.dll"); + my $iconv_dll = File::Spec->catfile($iconv_path, "iconv.dll"); $configdll{"ICONV_DLL"} = "$iconv_dll"; } } @@ -1864,7 +1906,7 @@ if ($use_libxml2 eq "no") { foreach $file (sort {uc($b) cmp uc($a)} @dirlist) { if (-f File::Spec->catfile($libxml2_path, $file, - "include\\libxml", + "include", "libxml", "xmlversion.h")) { $libxml2_path = File::Spec->catdir($libxml2_path, $file); $use_libxml2 = "yes"; @@ -1884,17 +1926,17 @@ if ($use_libxml2 eq "yes") { print "checking for libxml2 built directory at \"$libxml2_path\"\n"; } if (!-f File::Spec->catfile($libxml2_path, - "include\\libxml", + "include" , "libxml", "xmlversion.h")) { die "can't find libxml2 xmlversion.h include\n"; } if (!-f File::Spec->catfile($libxml2_path, - "win32\\bin.msvc", + "win32" , "bin.msvc", "libxml2.lib")) { die "can't find Libxml2 libxml2.lib library\n"; } if (!-f File::Spec->catfile($libxml2_path, - "win32\\bin.msvc", + "win32", "bin.msvc", "libxml2.dll")) { die "can't find Libxml2 DLL\n"; } @@ -1903,7 +1945,7 @@ if ($use_libxml2 eq "yes") { $configtest{"XMLSTATS"} = 1; my $libxml2_inc = File::Spec->catdir($libxml2_path, "include"); $configinc{"LIBXML2_INC"} = "$libxml2_inc"; - my $libxml2_libdir = File::Spec->catdir($libxml2_path, "win32\\bin.msvc"); + my $libxml2_libdir = File::Spec->catdir($libxml2_path, "win32", "bin.msvc"); my $libxml2_lib = File::Spec->catfile($libxml2_libdir, "libxml2.lib"); $configlib{"LIBXML2_LIB"} = "$libxml2_lib"; my $libxml2_dll = File::Spec->catfile($libxml2_libdir, "libxml2.dll"); @@ -2069,45 +2111,70 @@ sub setupplatformh { sub setupconfsh { my $line; - my @Lines; + my @lines; my $val; + my $confshvolume; + my $confshdirectory; + my $confshbasefile; - open F, $confshfile . ".win32" || die $!; - @Lines = ; - close F; + foreach my $confshfile (@confshlist) { + my $confshfilein; + if (-f $confshfile . ".win32") { + $confshfilein = $confshfile . ".win32"; + } else { + $confshfilein = $confshfile . ".in"; + } + open(my $fin, "<" . $confshfilein) || die $!; - foreach $line (@Lines) { - chomp $line; - while ($line =~ /@([^@]+)\@/) { - if ($1 ~~ @substtest) { - if (defined($configtest{$1})) { - $val = kw($configtest{$1}); - $line = "$`$val$'"; - } else { - $line = "$`$'"; - } - } elsif ($1 ~~ @substvar) { - if (defined($configvar{$1})) { - $val = kw($configvar{$1}); - $line = "$`$val$'"; - } else { - $line = "$`$'"; - } - } else { - die "unknown control $& in $confshfile.win32\n"; - } - } - } + ($confshvolume, $confshdirectory, $confshbasefile) = File::Spec->splitpath($confshfile); - open F, ">" . $confshfile || die $!; - if ($verbose) { - print "Setting up $confshfile\n"; + @lines = <$fin>; + close($fin); + + foreach $line (@lines) { + chomp $line; + while ($line =~ /@([^@]+)\@/) { + if ($1 ~~ @substtest) { + if (defined($configtest{$1})) { + $val = kw($configtest{$1}); + } elsif ($1 eq "abs_builddir") { + $val = kw(File::Spec->rel2abs($confshdirectory, File::Spec->curdir())); + $val =~ s/\\/\//g; + } elsif ($1 eq "abs_srcdir") { + $val = kw(File::Spec->rel2abs($confshdirectory, File::Spec->curdir())); + $val =~ s/\\/\//g; + } elsif ($1 eq "top_builddir") { + $val = kw(File::Spec->abs2rel($top_builddir, $confshdirectory)); + $val =~ s/\\/\//g; + } elsif ($1 eq "top_srcdir") { + $val = kw(File::Spec->abs2rel($top_srcdir, $confshdirectory)); + $val =~ s/\\/\//g; + } else { + $val = ""; + } + } elsif ($1 ~~ @substvar) { + if (defined($configvar{$1})) { + $val = kw($configvar{$1}); + } else { + $val = ""; + } + } else { + die "unknown control $& in $confshfilein\n"; + } + $line = "$`$val$'"; + } + } + + open(my $fout, ">" . $confshfile) || die $!; + if ($verbose) { + print "Setting up $confshfile\n"; + } + binmode($fout); + foreach $line (@lines) { + print $fout $line . "\n"; + } + close($fout); } - binmode(F); - foreach $line (@Lines) { - print F $line . "\n"; - } - close F; } # setup a file with %configcond stack and %config{var,defd,inc,lib,dll,test} @@ -2347,191 +2414,16 @@ sub setupproject { close F; } -# make versions.h +# Make bind.keys.h +# Keep this in sync with util/bindkeys.pl -sub makeversion { - # List of directories with version files +sub makebindkeysh { + my $bindkeysh = `perl.exe ../util/bindkeys.pl ../bind.keys`; + die "Failed to generate bind.keys.h!\n" unless (length($bindkeysh)); - my @dirlist = ("isc", "dns", "ns", "isccc", "isccfg", "bind9", "irs"); - my %LibMacros = ( - "bind9" => "LIBBIND9_EXPORTS", - "dns" => "LIBDNS_EXPORTS", - "irs" => "LIBIRS_EXPORTS", - "isc" => "LIBISC_EXPORTS", - "isccc" => "LIBISCCC_EXPORTS", - "isccfg" => "LIBISCCFG_EXPORTS", - "ns" => "LIBNS_EXPORTS"); - my @VersionNames = ("LIBINTERFACE", "LIBREVISION", "LIBAGE"); - my $Version; - my %ApiVersions; - my $Mapapi; - my $versionfile = "versions.h"; - my $versionpath = "..\\$versionfile"; - - my $data; - my $name; - my $value; - - # And the mapapi one - - open M, "..\\lib\\dns\\mapapi" || die $!; - while () { - chomp; - ($data) = split(/\#/); - if ($data) { - ($name, $value) = split(/=/, $data); - ($name) = split(/\s+/, $name); - if ($name eq 'MAPAPI') { - ($value) =~ s/^["\s]+//; - ($value) =~ s/["\s]+$//; - } else { - ($value) = split(/\s+/, $value); - } - $Mapapi = $value; - } - } - close M; - - # Now set up the output version file - - my $ThisDate = scalar localtime(); - open O, ">$versionpath" || - die "Can't open output file $versionpath: $!\n"; - - # Standard Header - - print O '/* - * Copyright (C) 2001 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -'; - - print O "/*\n"; - print O " * $versionfile."; - print O " Generated automatically by Configure.pl.\n"; - print O " * Date generated: $ThisDate\n"; - print O " */\n\n"; - - print O ' -#ifndef VERSIONS_H -#define VERSIONS_H 1 - -'; - - $Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}"; - if ($Versions{'PATCHVER'} ne "") { - $Version = "$Version.$Versions{'PATCHVER'}"; - } - $Version = "$Version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}"; - $Version = "$Version$Versions{'EXTENSIONS'}"; - if ($verbose) { - print "BIND Version: $Version\n"; - } - - print O "#define VERSION \"$Version\"\n"; - print O "#define PRODUCT \"$Versions{'PRODUCT'}\"\n\n"; - print O "#define DESCRIPTION \"$Versions{'DESCRIPTION'}\"\n\n"; - print O - "#define MAJOR \"$Versions{'MAJORVER'}.$Versions{'MINORVER'}\"\n\n"; - print O "#define MAPAPI \"$Mapapi\"\n\n"; - - my $dir; - my $apifile; - foreach $dir (@dirlist) { - $apifile = "..\\lib\\$dir\\api"; - open A, $apifile || die $!; - while () { - chomp; - ($data) = split(/\#/); - if ($data) { - ($name, $value) = split(/=/, $data); - $name =~ s/\s+//; - $value =~ s/\s+//; - $ApiVersions{$name} = $value; - } - } - close A; - - print O "\n#ifdef $LibMacros{$dir}\n"; - foreach $name (@VersionNames) { - print O "#define $name\t$ApiVersions{$name}\n"; - } - print O "#endif\n\n"; - } - - print O "#endif /* VERSIONS_H */\n"; - close O; -} - -# make srcid.h - -sub makesrcid { - my $data; - my $name; - my $value; - my $srcid = "unset_id"; - - open SOUT, ">..\\srcid.h" || die "cannot open srcid.h: $!\n"; - if (open (SIN, "..\\srcid")) { - LOOP: while () { - chomp; - ($data) = split(/\#/); - if ($data) { - ($name, $value) = split(/=/, $data); - ($name) = split(/\s+/, $name); - ($value) = split(/\s+/, $value); - next LOOP if ($name != "SRCID"); - $srcid = $value; - } - } - close SIN; - } - - if ($srcid eq "unset_id" and -d "..\\.git") { - $data = `git rev-list --max-count=1 HEAD`; - if (length($data) > 0) { - $srcid = substr($data, 0, 7); - } - } - - # Now set up the output version file - - my $ThisDate = scalar localtime(); - - # Standard Header - - print SOUT '/* - * Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -'; - - print SOUT "/*\n"; - print SOUT " * srcid.h"; - print SOUT " * Generated automatically by Configure.pl.\n"; - print SOUT " * Date generated: $ThisDate\n"; - print SOUT " */\n\n"; - - print SOUT ' -#ifndef SRCID_H -#define SRCID_H 1 -'; - - if ($verbose) { - print "BIND SRCID: $srcid\n"; - } - - print SOUT "#define SRCID\t\"$srcid\"\n"; - print SOUT "#endif /* SRCID_H */\n"; - close SOUT; + open(my $fout, ">" . "../bind.keys.h") || die $!; + print $fout $bindkeysh; + close($fout); } # Build install files @@ -2741,12 +2633,10 @@ if (($want_win32 eq "yes") || ($want_x64 eq "yes")) { setupproject($file); } - makeversion(); - - makesrcid(); - makeinstallfile(); + makebindkeysh(); + print "Configured.\n"; } else { print "add win32 or x64 to commit configuration to build files\n"; @@ -2756,7 +2646,6 @@ exit 0; # Notes: Unix configure.in options # --enable-developer partially supported -# --enable-newstats (9.9/9.9sub only) # --enable-native-pkcs11 supported # --enable-openssl-version-check included without a way to disable it # --enable-openssl-hash supported @@ -2765,7 +2654,6 @@ exit 0; # --enable-symtable incompatible with DLLs (or libtool) # --enable-ipv6 included without a way to disable it # --enable-atomic supported (renamed to intrinsic) -# --enable-isc-spnego supported (part of GSSAPI) # --enable-fixed-rrset supported # --enable-querytrace supported # --enable-full-report supported by verbose diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in index b7de279f19..1cd3ca3283 100644 --- a/win32utils/bind9.sln.in +++ b/win32utils/bind9.sln.in @@ -3,568 +3,121 @@ Microsoft Visual Studio Solution File, Format Version 11.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}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} = {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} - {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0} = {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0} -@IF SAMPLES - {F66D8B7E-721D-4602-99AD-820D19AD1313} = {F66D8B7E-721D-4602-99AD-820D19AD1313} - {9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06} = {9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06} - {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE} = {D42B8670-8DF6-4D90-90F7-DB5FB845AFAE} - {05682E12-523F-4DAE-8E6D-ADFDBC308AFD} = {05682E12-523F-4DAE-8E6D-ADFDBC308AFD} - {FF440E85-7450-439C-82EE-04C464512D0E} = {FF440E85-7450-439C-82EE-04C464512D0E} - {CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD} = {CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD} -@END SAMPLES - {723C65DA-A96C-4BA3-A34E-44F11CA346F9} = {723C65DA-A96C-4BA3-A34E-44F11CA346F9} - {7C8681A1-E3A8-470E-9EEF-16054D111A19} = {7C8681A1-E3A8-470E-9EEF-16054D111A19} - {39721F26-8B80-4AA9-9826-2AEF7322C3D5} = {39721F26-8B80-4AA9-9826-2AEF7322C3D5} - {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA} - {F938F9B8-D395-4A40-BEC7-0122D289C692} = {F938F9B8-D395-4A40-BEC7-0122D289C692} - {BA1048A8-6961-4A20-BE12-08BE20611C9D} = {BA1048A8-6961-4A20-BE12-08BE20611C9D} - {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5} = {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5} - {BE172EFE-C1DC-4812-BFB9-8C5F8ADB7E9F} = {BE172EFE-C1DC-4812-BFB9-8C5F8ADB7E9F} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - {0BF11E21-168C-4CAA-B784-429D126BBAE5} = {0BF11E21-168C-4CAA-B784-429D126BBAE5} - {205ED8A9-2E4C-41CC-9385-F3613402AA90} = {205ED8A9-2E4C-41CC-9385-F3613402AA90} - {17455DC6-5FBB-47C3-8F44-7DB574A188D3} = {17455DC6-5FBB-47C3-8F44-7DB574A188D3} - {6E6297F4-69D7-4533-85E1-BD17C30017C8} = {6E6297F4-69D7-4533-85E1-BD17C30017C8} - {D171F185-D3C2-4463-9CF3-ED1D0B1D6832} = {D171F185-D3C2-4463-9CF3-ED1D0B1D6832} - {03FB7588-C5A7-4572-968F-14F1206BC69C} = {03FB7588-C5A7-4572-968F-14F1206BC69C} - {FD653434-F1A8-44A9-85B2-A7468491DA6D} = {FD653434-F1A8-44A9-85B2-A7468491DA6D} - {AB6690A0-055E-458F-BAC5-BF38BCC5834F} = {AB6690A0-055E-458F-BAC5-BF38BCC5834F} - {91E60FDA-E48C-4DA0-92A2-97F963348E00} = {91E60FDA-E48C-4DA0-92A2-97F963348E00} - {B19042CE-D3D9-469B-BCD2-C3140150939A} = {B19042CE-D3D9-469B-BCD2-C3140150939A} - {4EE91023-94C3-48C0-B71C-5333B726C2EE} = {4EE91023-94C3-48C0-B71C-5333B726C2EE} - {98743A7C-6AF8-467F-9911-FA69C451AF2B} = {98743A7C-6AF8-467F-9911-FA69C451AF2B} - {3115091C-8135-481F-9757-F013A26255E0} = {3115091C-8135-481F-9757-F013A26255E0} - {C41266C7-E27E-4D60-9815-82D3B32BF82F} = {C41266C7-E27E-4D60-9815-82D3B32BF82F} - {2C1F7096-C5B5-48D4-846F-A7ACA454335D} = {2C1F7096-C5B5-48D4-846F-A7ACA454335D} - {03A96113-CB14-43AA-AEB2-48950E3915C5} = {03A96113-CB14-43AA-AEB2-48950E3915C5} - {66028555-7DD5-4016-B601-9EF9A1EE8BFA} = {66028555-7DD5-4016-B601-9EF9A1EE8BFA} - {64964B03-4815-41F0-9057-E766A94AF197} = {64964B03-4815-41F0-9057-E766A94AF197} - {1E2C1635-3093-4D59-80E7-4743AC10F22F} = {1E2C1635-3093-4D59-80E7-4743AC10F22F} - {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1} = {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1} -@IF PKCS11 - {5042D371-0402-4FA3-A52A-769708694422} = {5042D371-0402-4FA3-A52A-769708694422} - {C663B088-F7BC-4C8C-8D06-A76636EED651} = {C663B088-F7BC-4C8C-8D06-A76636EED651} - {5B3137E5-7E1F-49AA-8810-A09AA417D326} = {5B3137E5-7E1F-49AA-8810-A09AA417D326} - {403FD4B1-A4F9-4159-9013-5860E3A4417D} = {403FD4B1-A4F9-4159-9013-5860E3A4417D} -@END PKCS11 -@IF XTESTS - {14751171-C40E-40EE-A2F0-37FFC3CCD4A2} = {14751171-C40E-40EE-A2F0-37FFC3CCD4A2} - {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1} = {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1} - {7705EEF6-6980-48F9-A045-699DAFE860C9} = {7705EEF6-6980-48F9-A045-699DAFE860C9} - {551561F6-4A2A-4824-8A34-A4AF0EB7C179} = {551561F6-4A2A-4824-8A34-A4AF0EB7C179} - {6200ED9D-CAB1-4C00-8D79-478F64A19B8F} = {6200ED9D-CAB1-4C00-8D79-478F64A19B8F} - {CC7340C1-CBAF-4145-969A-73AE960401D6} = {CC7340C1-CBAF-4145-969A-73AE960401D6} - {E55653C8-5501-4871-A97C-C926631F40F9} = {E55653C8-5501-4871-A97C-C926631F40F9} -@END XTESTS -@IF STESTS - {31715139-2C27-47D2-8394-71B71A8AC3D5} = {31715139-2C27-47D2-8394-71B71A8AC3D5} - {764DBE24-C8B3-46E8-BE73-196431353A5D} = {764DBE24-C8B3-46E8-BE73-196431353A5D} - {61F9D673-EB5C-47A5-8907-24E034C75EF8} = {61F9D673-EB5C-47A5-8907-24E034C75EF8} - {E1478F40-786C-4738-8E99-E7A71DD98661} = {E1478F40-786C-4738-8E99-E7A71DD98661} - {4F9A0F6F-366D-4483-B131-793832840508} = {4F9A0F6F-366D-4483-B131-793832840508} - {85ADFF2A-BE31-4B8D-9089-9AD56CE78D7E} = {85ADFF2A-BE31-4B8D-9089-9AD56CE78D7E} - {63A921F6-1200-4723-828A-98960127B73D} = {63A921F6-1200-4723-828A-98960127B73D} -@END STESTS - EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisc", "..\lib\isc\win32\libisc.vcxproj", "{3840E563-D180-4761-AA9C-E6155F02EAFF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen", "..\lib\dns\win32\gen.vcxproj", "{A3F71D12-F38A-4C77-8D87-8E8854CA74A1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisc", "..\lib\isc\win32\libisc.vcxproj", "{3840E563-D180-4761-AA9C-E6155F02EAFF}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns", "..\lib\dns\win32\libdns.vcxproj", "{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisccc", "..\lib\isccc\win32\libisccc.vcxproj", "{B556705F-1920-4400-878A-B259D3556047}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns", "..\lib\dns\win32\libdns.vcxproj", "{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libns", "..\lib\ns\win32\libns.vcxproj", "{82ACD33C-E75F-45B8-BB6D-42643A10D7EE}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisccfg", "..\lib\isccfg\win32\libisccfg.vcxproj", "{B2DFA58C-6347-478E-81E8-01E06999D4F1}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbind9", "..\lib\bind9\win32\libbind9.vcxproj", "{E741C10B-B075-4206-9596-46765B665E03}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libirs", "..\lib\irs\win32\libirs.vcxproj", "{A4F29CEB-7644-4A7F-BE9E-02B6A90E4919}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bindevt", "..\lib\win32\bindevt\bindevt.vcxproj", "{0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject @IF SAMPLES Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resolve", "..\lib\samples\win32\resolve.vcxproj", "{F66D8B7E-721D-4602-99AD-820D19AD1313}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "async", "..\lib\samples\win32\async.vcxproj", "{9FC33CA3-CE4A-4EDF-BA99-EECA4B81AD06}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gai", "..\lib\samples\win32\gai.vcxproj", "{D42B8670-8DF6-4D90-90F7-DB5FB845AFAE}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "update", "..\lib\samples\win32\update.vcxproj", "{05682E12-523F-4DAE-8E6D-ADFDBC308AFD}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "request", "..\lib\samples\win32\request.vcxproj", "{FF440E85-7450-439C-82EE-04C464512D0E}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsprobe", "..\lib\samples\win32\nsprobe.vcxproj", "{CB2A29F6-E73B-40AB-8AC4-2C1AAE7280BD}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - EndProjectSection EndProject @END SAMPLES Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "named", "..\bin\named\win32\named.vcxproj", "{723C65DA-A96C-4BA3-A34E-44F11CA346F9}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} = {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rndcutil", "..\bin\rndc\win32\rndcutil.vcxproj", "{7C8681A1-E3A8-470E-9EEF-16054D111A19}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rndc", "..\bin\rndc\win32\rndc.vcxproj", "{39721F26-8B80-4AA9-9826-2AEF7322C3D5}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {7C8681A1-E3A8-470E-9EEF-16054D111A19} = {7C8681A1-E3A8-470E-9EEF-16054D111A19} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dighost", "..\bin\dig\win32\dighost.vcxproj", "{140DE800-E552-43CC-B0C7-A33A92E368CA}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dig", "..\bin\dig\win32\dig.vcxproj", "{F938F9B8-D395-4A40-BEC7-0122D289C692}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "host", "..\bin\dig\win32\host.vcxproj", "{BA1048A8-6961-4A20-BE12-08BE20611C9D}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA} - {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nslookup", "..\bin\dig\win32\nslookup.vcxproj", "{C15A6E1A-94CE-4686-99F9-6BC5FD623EB5}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA} - {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "delv", "..\bin\delv\win32\delv.vcxproj", "{BE172EFE-C1DC-4812-BFB9-8C5F8ADB7E9F}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnssectool", "..\bin\dnssec\win32\dnssectool.vcxproj", "{2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keygen", "..\bin\dnssec\win32\keygen.vcxproj", "{0BF11E21-168C-4CAA-B784-429D126BBAE5}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signzone", "..\bin\dnssec\win32\signzone.vcxproj", "{205ED8A9-2E4C-41CC-9385-F3613402AA90}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cds", "..\bin\dnssec\win32\cds.vcxproj", "{0EB1727E-2BBD-47A6-AD12-418F9DEB0531}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keyfromlabel", "..\bin\dnssec\win32\keyfromlabel.vcxproj", "{17455DC6-5FBB-47C3-8F44-7DB574A188D3}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfromkey", "..\bin\dnssec\win32\dsfromkey.vcxproj", "{6E6297F4-69D7-4533-85E1-BD17C30017C8}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "revoke", "..\bin\dnssec\win32\revoke.vcxproj", "{D171F185-D3C2-4463-9CF3-ED1D0B1D6832}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settime", "..\bin\dnssec\win32\settime.vcxproj", "{03FB7588-C5A7-4572-968F-14F1206BC69C}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "verify", "..\bin\dnssec\win32\verify.vcxproj", "{FD653434-F1A8-44A9-85B2-A7468491DA6D}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "importkey", "..\bin\dnssec\win32\importkey.vcxproj", "{AB6690A0-055E-458F-BAC5-BF38BCC5834F}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arpaname", "..\bin\tools\win32\arpaname.vcxproj", "{91E60FDA-E48C-4DA0-92A2-97F963348E00}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "journalprint", "..\bin\tools\win32\journalprint.vcxproj", "{B19042CE-D3D9-469B-BCD2-C3140150939A}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsec3hash", "..\bin\tools\win32\nsec3hash.vcxproj", "{4EE91023-94C3-48C0-B71C-5333B726C2EE}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrchecker", "..\bin\tools\win32\rrchecker.vcxproj", "{98743A7C-6AF8-467F-9911-FA69C451AF2B}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdig", "..\bin\tools\win32\mdig.vcxproj", "{3115091C-8135-481F-9757-F013A26255E0}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsupdate", "..\bin\nsupdate\win32\nsupdate.vcxproj", "{C41266C7-E27E-4D60-9815-82D3B32BF82F}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} = {A4F29CEB-7644-4A7F-BE9E-02B6A90E4919} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checktool", "..\bin\check\win32\checktool.vcxproj", "{2C1F7096-C5B5-48D4-846F-A7ACA454335D}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} = {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkconf", "..\bin\check\win32\checkconf.vcxproj", "{03A96113-CB14-43AA-AEB2-48950E3915C5}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03} - {2C1F7096-C5B5-48D4-846F-A7ACA454335D} = {2C1F7096-C5B5-48D4-846F-A7ACA454335D} - {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} = {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkzone", "..\bin\check\win32\checkzone.vcxproj", "{66028555-7DD5-4016-B601-9EF9A1EE8BFA}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {2C1F7096-C5B5-48D4-846F-A7ACA454335D} = {2C1F7096-C5B5-48D4-846F-A7ACA454335D} - {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} = {82ACD33C-E75F-45B8-BB6D-42643A10D7EE} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "confgentool", "..\bin\confgen\win32\confgentool.vcxproj", "{64964B03-4815-41F0-9057-E766A94AF197}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rndcconfgen", "..\bin\confgen\win32\rndcconfgen.vcxproj", "{1E2C1635-3093-4D59-80E7-4743AC10F22F}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {64964B03-4815-41F0-9057-E766A94AF197} = {64964B03-4815-41F0-9057-E766A94AF197} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddnsconfgen", "..\bin\confgen\win32\ddnsconfgen.vcxproj", "{1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} - {64964B03-4815-41F0-9057-E766A94AF197} = {64964B03-4815-41F0-9057-E766A94AF197} - EndProjectSection EndProject @IF PKCS11 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11keygen", "..\bin\pkcs11\win32\pk11keygen.vcxproj", "{5042D371-0402-4FA3-A52A-769708694422}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11list", "..\bin\pkcs11\win32\pk11list.vcxproj", "{C663B088-F7BC-4C8C-8D06-A76636EED651}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11destroy", "..\bin\pkcs11\win32\pk11destroy.vcxproj", "{5B3137E5-7E1F-49AA-8810-A09AA417D326}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11tokens", "..\bin\pkcs11\win32\pk11tokens.vcxproj", "{403FD4B1-A4F9-4159-9013-5860E3A4417D}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject @END PKCS11 -@IF XTESTS -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "backtrace_test", "..\bin\tests\win32\backtrace_test.vcxproj", "{14751171-C40E-40EE-A2F0-37FFC3CCD4A2}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inter_test", "..\bin\tests\win32\inter_test.vcxproj", "{06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rwlock_test", "..\bin\tests\win32\rwlock_test.vcxproj", "{7705EEF6-6980-48F9-A045-699DAFE860C9}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shutdown_test", "..\bin\tests\win32\shutdown_test.vcxproj", "{551561F6-4A2A-4824-8A34-A4AF0EB7C179}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sock_test", "..\bin\tests\win32\sock_test.vcxproj", "{6200ED9D-CAB1-4C00-8D79-478F64A19B8F}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "task_test", "..\bin\tests\win32\task_test.vcxproj", "{CC7340C1-CBAF-4145-969A-73AE960401D6}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timer_test", "..\bin\tests\win32\timer_test.vcxproj", "{E55653C8-5501-4871-A97C-C926631F40F9}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection -EndProject -@END XTESTS @IF STESTS Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makejournal", "..\bin\tests\system\win32\makejournal.vcxproj", "{31715139-2C27-47D2-8394-71B71A8AC3D5}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencheck", "..\bin\tests\system\win32\gencheck.vcxproj", "{764DBE24-C8B3-46E8-BE73-196431353A5D}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bigkey", "..\bin\tests\system\win32\bigkey.vcxproj", "{61F9D673-EB5C-47A5-8907-24E034C75EF8}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pipequeries", "..\bin\tests\system\win32\pipequeries.vcxproj", "{E1478F40-786C-4738-8E99-E7A71DD98661}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keycreate", "..\bin\tests\system\win32\keycreate.vcxproj", "{4F9A0F6F-366D-4483-B131-793832840508}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keydelete", "..\bin\tests\system\win32\keydelete.vcxproj", "{85ADFF2A-BE31-4B8D-9089-9AD56CE78D7E}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "feature-test", "..\bin\tests\system\win32\feature-test.vcxproj", "{63A921F6-1200-4723-828A-98960127B73D}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - EndProjectSection EndProject @END STESTS Global @@ -643,10 +196,6 @@ Global {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {7C8681A1-E3A8-470E-9EEF-16054D111A19}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {7C8681A1-E3A8-470E-9EEF-16054D111A19}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {7C8681A1-E3A8-470E-9EEF-16054D111A19}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {7C8681A1-E3A8-470E-9EEF-16054D111A19}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ {39721F26-8B80-4AA9-9826-2AEF7322C3D5}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ {39721F26-8B80-4AA9-9826-2AEF7322C3D5}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ {39721F26-8B80-4AA9-9826-2AEF7322C3D5}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ @@ -777,36 +326,6 @@ Global {403FD4B1-A4F9-4159-9013-5860E3A4417D}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ {403FD4B1-A4F9-4159-9013-5860E3A4417D}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ @END PKCS11 -@IF XTESTS - {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {7705EEF6-6980-48F9-A045-699DAFE860C9}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {7705EEF6-6980-48F9-A045-699DAFE860C9}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {7705EEF6-6980-48F9-A045-699DAFE860C9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {7705EEF6-6980-48F9-A045-699DAFE860C9}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {551561F6-4A2A-4824-8A34-A4AF0EB7C179}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {551561F6-4A2A-4824-8A34-A4AF0EB7C179}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {551561F6-4A2A-4824-8A34-A4AF0EB7C179}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {551561F6-4A2A-4824-8A34-A4AF0EB7C179}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {CC7340C1-CBAF-4145-969A-73AE960401D6}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {CC7340C1-CBAF-4145-969A-73AE960401D6}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {CC7340C1-CBAF-4145-969A-73AE960401D6}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {CC7340C1-CBAF-4145-969A-73AE960401D6}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ - {E55653C8-5501-4871-A97C-C926631F40F9}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ - {E55653C8-5501-4871-A97C-C926631F40F9}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@ - {E55653C8-5501-4871-A97C-C926631F40F9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@ - {E55653C8-5501-4871-A97C-C926631F40F9}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@ -@END XTESTS @IF STESTS {31715139-2C27-47D2-8394-71B71A8AC3D5}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@ {31715139-2C27-47D2-8394-71B71A8AC3D5}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@