mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 14:35:26 +00:00
[master] add libns and remove liblwres
4708. [cleanup] Legacy Windows builds (i.e. for XP and earlier) are no longer supported. [RT #45186] 4707. [func] The lightweight resolver daemon and library (lwresd and liblwres) have been removed. [RT #45186] 4706. [func] Code implementing name server query processing has been moved from bin/named to a new library "libns". Functions remaining in bin/named are now prefixed with "named_" rather than "ns_". This will make it easier to write unit tests for name server code, or link name server functionality into new tools. [RT #45186]
This commit is contained in:
@@ -23,55 +23,7 @@ my $platformfile = "..\\lib\\isc\\win32\\include\\isc\\platform.h";
|
||||
my $confshfile = "..\\bin\\tests\\system\\conf.sh";
|
||||
my $icshfile = "..\\isc-config.sh";
|
||||
|
||||
my @filelist = ("..\\bin\\check\\win32\\checktool.dsp",
|
||||
"..\\bin\\check\\win32\\checkconf.dsp",
|
||||
"..\\bin\\check\\win32\\checkconf.mak",
|
||||
"..\\bin\\check\\win32\\checkzone.dsp",
|
||||
"..\\bin\\check\\win32\\checkzone.mak",
|
||||
"..\\bin\\confgen\\win32\\confgentool.dsp",
|
||||
"..\\bin\\confgen\\win32\\ddnsconfgen.dsp",
|
||||
"..\\bin\\confgen\\win32\\ddnsconfgen.mak",
|
||||
"..\\bin\\confgen\\win32\\rndcconfgen.dsp",
|
||||
"..\\bin\\confgen\\win32\\rndcconfgen.mak",
|
||||
"..\\bin\\delv\\win32\\delv.dsp",
|
||||
"..\\bin\\delv\\win32\\delv.mak",
|
||||
"..\\bin\\dig\\win32\\dig.dsp",
|
||||
"..\\bin\\dig\\win32\\dig.mak",
|
||||
"..\\bin\\dig\\win32\\dighost.dsp",
|
||||
"..\\bin\\dig\\win32\\host.dsp",
|
||||
"..\\bin\\dig\\win32\\host.mak",
|
||||
"..\\bin\\dig\\win32\\nslookup.dsp",
|
||||
"..\\bin\\dig\\win32\\nslookup.mak",
|
||||
"..\\bin\\dnssec\\win32\\dnssectool.dsp",
|
||||
"..\\bin\\dnssec\\win32\\dsfromkey.dsp",
|
||||
"..\\bin\\dnssec\\win32\\dsfromkey.mak",
|
||||
"..\\bin\\dnssec\\win32\\importkey.dsp",
|
||||
"..\\bin\\dnssec\\win32\\importkey.mak",
|
||||
"..\\bin\\dnssec\\win32\\keyfromlabel.dsp",
|
||||
"..\\bin\\dnssec\\win32\\keyfromlabel.mak",
|
||||
"..\\bin\\dnssec\\win32\\keygen.dsp",
|
||||
"..\\bin\\dnssec\\win32\\keygen.mak",
|
||||
"..\\bin\\dnssec\\win32\\revoke.dsp",
|
||||
"..\\bin\\dnssec\\win32\\revoke.mak",
|
||||
"..\\bin\\dnssec\\win32\\settime.dsp",
|
||||
"..\\bin\\dnssec\\win32\\settime.mak",
|
||||
"..\\bin\\dnssec\\win32\\signzone.dsp",
|
||||
"..\\bin\\dnssec\\win32\\signzone.mak",
|
||||
"..\\bin\\dnssec\\win32\\verify.dsp",
|
||||
"..\\bin\\dnssec\\win32\\verify.mak",
|
||||
"..\\bin\\named\\win32\\named.dsp",
|
||||
"..\\bin\\named\\win32\\named.mak",
|
||||
"..\\bin\\nsupdate\\win32\\nsupdate.dsp",
|
||||
"..\\bin\\nsupdate\\win32\\nsupdate.mak",
|
||||
"..\\bin\\pkcs11\\win32\\pk11destroy.dsp",
|
||||
"..\\bin\\pkcs11\\win32\\pk11destroy.mak",
|
||||
"..\\bin\\pkcs11\\win32\\pk11keygen.dsp",
|
||||
"..\\bin\\pkcs11\\win32\\pk11keygen.mak",
|
||||
"..\\bin\\pkcs11\\win32\\pk11list.dsp",
|
||||
"..\\bin\\pkcs11\\win32\\pk11list.mak",
|
||||
"..\\bin\\pkcs11\\win32\\pk11tokens.dsp",
|
||||
"..\\bin\\pkcs11\\win32\\pk11tokens.mak",
|
||||
"..\\bin\\python\\dnssec-checkds.py",
|
||||
my @filelist = ("..\\bin\\python\\dnssec-checkds.py",
|
||||
"..\\bin\\python\\dnssec-coverage.py",
|
||||
"..\\bin\\python\\dnssec-keymgr.py",
|
||||
"..\\bin\\python\\isc\\__init__.py",
|
||||
@@ -89,130 +41,9 @@ my @filelist = ("..\\bin\\check\\win32\\checktool.dsp",
|
||||
"..\\bin\\python\\isc\\tests\\dnskey_test.py",
|
||||
"..\\bin\\python\\isc\\tests\\policy_test.py",
|
||||
"..\\bin\\python\\isc\\utils.py",
|
||||
"..\\bin\\rndc\\win32\\rndc.dsp",
|
||||
"..\\bin\\rndc\\win32\\rndc.mak",
|
||||
"..\\bin\\rndc\\win32\\rndcutil.dsp",
|
||||
"..\\bin\\tests\\system\\dlz\\prereq.sh",
|
||||
"..\\bin\\tools\\win32\\arpaname.dsp",
|
||||
"..\\bin\\tools\\win32\\arpaname.mak",
|
||||
"..\\bin\\tools\\win32\\genrandom.dsp",
|
||||
"..\\bin\\tools\\win32\\genrandom.mak",
|
||||
"..\\bin\\tools\\win32\\ischmacfixup.dsp",
|
||||
"..\\bin\\tools\\win32\\ischmacfixup.mak",
|
||||
"..\\bin\\tools\\win32\\journalprint.dsp",
|
||||
"..\\bin\\tools\\win32\\journalprint.mak",
|
||||
"..\\bin\\tools\\win32\\mdig.dsp",
|
||||
"..\\bin\\tools\\win32\\mdig.mak",
|
||||
"..\\bin\\tools\\win32\\nsec3hash.dsp",
|
||||
"..\\bin\\tools\\win32\\nsec3hash.mak",
|
||||
"..\\bin\\tools\\win32\\rrchecker.dsp",
|
||||
"..\\bin\\tools\\win32\\rrchecker.mak",
|
||||
"..\\bin\\tests\\atomic\\win32\\t_atomic.dsp",
|
||||
"..\\bin\\tests\\atomic\\win32\\t_atomic.mak",
|
||||
"..\\bin\\tests\\db\\win32\\t_db.dsp",
|
||||
"..\\bin\\tests\\db\\win32\\t_db.mak",
|
||||
"..\\bin\\tests\\dst\\win32\\t_dst.dsp",
|
||||
"..\\bin\\tests\\dst\\win32\\t_dst.mak",
|
||||
"..\\bin\\tests\\master\\win32\\t_master.dsp",
|
||||
"..\\bin\\tests\\master\\win32\\t_master.mak",
|
||||
"..\\bin\\tests\\mem\\win32\\t_mem.dsp",
|
||||
"..\\bin\\tests\\mem\\win32\\t_mem.mak",
|
||||
"..\\bin\\tests\\hashes\\win32\\t_hashes.dsp",
|
||||
"..\\bin\\tests\\hashes\\win32\\t_hashes.mak",
|
||||
"..\\bin\\tests\\names\\win32\\t_names.dsp",
|
||||
"..\\bin\\tests\\names\\win32\\t_names.mak",
|
||||
"..\\bin\\tests\\rbt\\win32\\t_rbt.dsp",
|
||||
"..\\bin\\tests\\rbt\\win32\\t_rbt.mak",
|
||||
"..\\bin\\tests\\resolver\\win32\\t_resolver.dsp",
|
||||
"..\\bin\\tests\\resolver\\win32\\t_resolver.mak",
|
||||
"..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.dsp",
|
||||
"..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.mak",
|
||||
"..\\bin\\tests\\tasks\\win32\\t_tasks.dsp",
|
||||
"..\\bin\\tests\\tasks\\win32\\t_tasks.mak",
|
||||
"..\\bin\\tests\\timers\\win32\\t_timers.dsp",
|
||||
"..\\bin\\tests\\timers\\win32\\t_timers.mak",
|
||||
"..\\bin\\tests\\system\\win32\\bigkey.dsp",
|
||||
"..\\bin\\tests\\system\\win32\\bigkey.mak",
|
||||
"..\\bin\\tests\\system\\win32\\feature-test.dsp",
|
||||
"..\\bin\\tests\\system\\win32\\feature-test.mak",
|
||||
"..\\bin\\tests\\system\\win32\\gencheck.dsp",
|
||||
"..\\bin\\tests\\system\\win32\\gencheck.mak",
|
||||
"..\\bin\\tests\\system\\win32\\keycreate.dsp",
|
||||
"..\\bin\\tests\\system\\win32\\keycreate.mak",
|
||||
"..\\bin\\tests\\system\\win32\\keydelete.dsp",
|
||||
"..\\bin\\tests\\system\\win32\\keydelete.mak",
|
||||
"..\\bin\\tests\\system\\win32\\lwtest.dsp",
|
||||
"..\\bin\\tests\\system\\win32\\lwtest.mak",
|
||||
"..\\bin\\tests\\system\\win32\\pipequeries.dsp",
|
||||
"..\\bin\\tests\\system\\win32\\pipequeries.mak",
|
||||
"..\\bin\\tests\\win32\\backtrace_test.dsp",
|
||||
"..\\bin\\tests\\win32\\backtrace_test.mak",
|
||||
"..\\bin\\tests\\win32\\inter_test.dsp",
|
||||
"..\\bin\\tests\\win32\\inter_test.mak",
|
||||
"..\\bin\\tests\\win32\\makejournal.dsp",
|
||||
"..\\bin\\tests\\win32\\makejournal.mak",
|
||||
"..\\bin\\tests\\win32\\rwlock_test.dsp",
|
||||
"..\\bin\\tests\\win32\\rwlock_test.mak",
|
||||
"..\\bin\\tests\\win32\\shutdown_test.dsp",
|
||||
"..\\bin\\tests\\win32\\shutdown_test.mak",
|
||||
"..\\bin\\tests\\win32\\sock_test.dsp",
|
||||
"..\\bin\\tests\\win32\\sock_test.mak",
|
||||
"..\\bin\\tests\\win32\\task_test.dsp",
|
||||
"..\\bin\\tests\\win32\\task_test.mak",
|
||||
"..\\bin\\tests\\win32\\timer_test.dsp",
|
||||
"..\\bin\\tests\\win32\\timer_test.mak",
|
||||
"..\\bin\\tests\\win32\\inter_test.dsp",
|
||||
"..\\bin\\tests\\win32\\inter_test.mak",
|
||||
"..\\bin\\tests\\win32\\rwlock_test.dsp",
|
||||
"..\\bin\\tests\\win32\\rwlock_test.mak",
|
||||
"..\\bin\\tests\\win32\\shutdown_test.dsp",
|
||||
"..\\bin\\tests\\win32\\shutdown_test.mak",
|
||||
"..\\bin\\tests\\win32\\sock_test.dsp",
|
||||
"..\\bin\\tests\\win32\\sock_test.mak",
|
||||
"..\\bin\\tests\\win32\\task_test.dsp",
|
||||
"..\\bin\\tests\\win32\\task_test.mak",
|
||||
"..\\bin\\tests\\win32\\timer_test.dsp",
|
||||
"..\\bin\\tests\\win32\\timer_test.mak",
|
||||
"..\\bin\\win32\\BINDInstall\\BINDInstall.dsp",
|
||||
"..\\bin\\win32\\BINDInstall\\BINDInstall.mak",
|
||||
"..\\lib\\bind9\\win32\\libbind9.dsp",
|
||||
"..\\lib\\bind9\\win32\\libbind9.mak",
|
||||
"..\\lib\\dns\\win32\\gen.dsp",
|
||||
"..\\lib\\dns\\win32\\gen.mak",
|
||||
"..\\lib\\dns\\win32\\libdns.def",
|
||||
"..\\lib\\dns\\win32\\libdns.dsp",
|
||||
"..\\lib\\dns\\win32\\libdns.mak",
|
||||
"..\\lib\\irs\\win32\\libirs.dsp",
|
||||
"..\\lib\\irs\\win32\\libirs.mak",
|
||||
"..\\lib\\isc\\win32\\libisc.def",
|
||||
"..\\lib\\isc\\win32\\libisc.dsp",
|
||||
"..\\lib\\isc\\win32\\libisc.mak",
|
||||
"..\\lib\\isccc\\win32\\libisccc.dsp",
|
||||
"..\\lib\\isccc\\win32\\libisccc.mak",
|
||||
"..\\lib\\isccfg\\win32\\libisccfg.dsp",
|
||||
"..\\lib\\isccfg\\win32\\libisccfg.mak",
|
||||
"..\\lib\\lwres\\win32\\liblwres.dsp",
|
||||
"..\\lib\\lwres\\win32\\liblwres.mak",
|
||||
"..\\lib\\samples\\win32\\async.dsp",
|
||||
"..\\lib\\samples\\win32\\async.mak",
|
||||
"..\\lib\\samples\\win32\\gai.dsp",
|
||||
"..\\lib\\samples\\win32\\gai.mak",
|
||||
"..\\lib\\samples\\win32\\nsprobe.dsp",
|
||||
"..\\lib\\samples\\win32\\nsprobe.mak",
|
||||
"..\\lib\\samples\\win32\\request.dsp",
|
||||
"..\\lib\\samples\\win32\\request.mak",
|
||||
"..\\lib\\samples\\win32\\resolve.dsp",
|
||||
"..\\lib\\samples\\win32\\resolve.mak",
|
||||
"..\\lib\\samples\\win32\\update.dsp",
|
||||
"..\\lib\\samples\\win32\\update.mak",
|
||||
"..\\lib\\tests\\win32\\libtests.dsp",
|
||||
"..\\lib\\tests\\win32\\libtests.mak",
|
||||
"..\\lib\\win32\\bindevt\\bindevt.dsp",
|
||||
"..\\lib\\win32\\bindevt\\bindevt.mak",
|
||||
"legacy\\BINDBuild.dsw",
|
||||
"legacy\\BuildAll.bat",
|
||||
"legacy\\BuildPost.bat",
|
||||
"legacy\\BuildSetup.bat");
|
||||
"..\\lib\\isc\\win32\\libisc.def");
|
||||
|
||||
my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
|
||||
"..\\bin\\check\\win32\\checkconf.vcxproj.filters",
|
||||
@@ -314,8 +145,6 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.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\\lwtest.vcxproj",
|
||||
"..\\bin\\tests\\system\\win32\\lwtest.vcxproj.filters",
|
||||
"..\\bin\\tests\\system\\win32\\pipequeries.vcxproj",
|
||||
"..\\bin\\tests\\system\\win32\\pipequeries.vcxproj.filters",
|
||||
"..\\bin\\tests\\tasks\\win32\\t_tasks.vcxproj",
|
||||
@@ -366,8 +195,7 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
|
||||
"..\\lib\\isccc\\win32\\libisccc.vcxproj.filters",
|
||||
"..\\lib\\isccfg\\win32\\libisccfg.vcxproj",
|
||||
"..\\lib\\isccfg\\win32\\libisccfg.vcxproj.filters",
|
||||
"..\\lib\\lwres\\win32\\liblwres.vcxproj",
|
||||
"..\\lib\\lwres\\win32\\liblwres.vcxproj.filters",
|
||||
"..\\lib\\ns\\win32\\libns.vcxproj",
|
||||
"..\\lib\\samples\\win32\\resolve.vcxproj",
|
||||
"..\\lib\\samples\\win32\\resolve.vcxproj.filters",
|
||||
"..\\lib\\samples\\win32\\async.vcxproj",
|
||||
@@ -611,7 +439,6 @@ my @help = (
|
||||
"\nGeneral Options and Commands:\n",
|
||||
" verbose (options) print messages\n",
|
||||
" help (command) print this help\n",
|
||||
" legacy (options) process only files for legacy build\n",
|
||||
" win32 (command) configure for Win32 platform\n",
|
||||
" x64 (command) configure for x64 platform\n",
|
||||
" clean (command) clean up generated files\n",
|
||||
@@ -755,10 +582,10 @@ foreach (@ARGV) {
|
||||
}
|
||||
}
|
||||
|
||||
# legacy default to win32
|
||||
# old legacy mode
|
||||
|
||||
if ($legacy_only && ($want_x64 ne "yes")) {
|
||||
$want_win32 = "yes";
|
||||
if ($legacy_only) {
|
||||
print "legacy mode is obsolete (so ignored)\n";
|
||||
}
|
||||
|
||||
if ($want_checkfiles eq "yes") {
|
||||
@@ -1380,8 +1207,8 @@ if ($verbose) {
|
||||
print "_MSC_VER == $msc_ver\n";
|
||||
}
|
||||
if ($msc_ver < 1600) {
|
||||
print STDERR "warning: old version of C++ compiler/Visual Studio\n";
|
||||
print STDERR "only the legacy (cf legacy\\win32-build.txt) will work\n";
|
||||
print STDERR "too old version of C++ compiler/Visual Studio\n";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
# gen single threaded for < VS 2005
|
||||
@@ -3006,9 +2833,7 @@ sub setupfile {
|
||||
if ($verbose) {
|
||||
print "Setting up $filename\n";
|
||||
}
|
||||
if (!$legacy_only) {
|
||||
binmode(F);
|
||||
}
|
||||
binmode(F);
|
||||
foreach $line (@Linesout) {
|
||||
print F $line . "\n";
|
||||
}
|
||||
@@ -3137,7 +2962,7 @@ sub setupproject {
|
||||
sub makeversion {
|
||||
# List of directories with version files
|
||||
|
||||
my @dirlist = ("isc", "dns", "isccc", "isccfg", "lwres", "bind9", "irs");
|
||||
my @dirlist = ("isc", "dns", "ns", "isccc", "isccfg", "bind9", "irs");
|
||||
my %LibMacros = (
|
||||
"bind9" => "LIBBIND9_EXPORTS",
|
||||
"dns" => "LIBDNS_EXPORTS",
|
||||
@@ -3145,7 +2970,7 @@ sub makeversion {
|
||||
"isc" => "LIBISC_EXPORTS",
|
||||
"isccc" => "LIBISCCC_EXPORTS",
|
||||
"isccfg" => "LIBISCCFG_EXPORTS",
|
||||
"lwres" => "LIBLWRES_EXPORTS");
|
||||
"ns" => "LIBNS_EXPORTS");
|
||||
my @VersionNames = ("LIBINTERFACE", "LIBREVISION", "LIBAGE");
|
||||
my $Version;
|
||||
my %ApiVersions;
|
||||
@@ -3342,8 +3167,8 @@ sub makeinstallfile {
|
||||
print LOUT "libisccfg.dll-BCFT\n";
|
||||
print LOUT "libisccc.dll-BCFT\n";
|
||||
print LOUT "libdns.dll-BCFT\n";
|
||||
print LOUT "liblwres.dll-BCFT\n";
|
||||
print LOUT "libirs.dll-BCFT\n";
|
||||
print LOUT "libns.dll-BCFT\n";
|
||||
if ($use_openssl eq "yes") {
|
||||
my $v;
|
||||
my $d;
|
||||
@@ -3529,10 +3354,8 @@ if (($want_win32 eq "yes") || ($want_x64 eq "yes")) {
|
||||
setupfile($file);
|
||||
}
|
||||
|
||||
if (!$legacy_only) {
|
||||
foreach $file (@projectlist) {
|
||||
setupproject($file);
|
||||
}
|
||||
foreach $file (@projectlist) {
|
||||
setupproject($file);
|
||||
}
|
||||
|
||||
makeversion();
|
||||
|
Reference in New Issue
Block a user