diff --git a/CHANGES b/CHANGES index 569d86307e..c25b9c28c5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +2208. [port] win32: make sure both build methods produce the + same output. [RT #17058] + 2207. [port] Some implementations of getaddrinfo() fail to set ai_canonname correctly. [RT #17061] diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat index 038e7db287..762d1828ea 100644 --- a/win32utils/BuildAll.bat +++ b/win32utils/BuildAll.bat @@ -30,9 +30,6 @@ rem a future release of BIND 9 for Windows NT/2000/XP. echo Setting up the BIND files required for the build -rem Get and update for the latest build of the openssl library -perl updateopenssl.pl - rem Setup the files call BuildSetup.bat @@ -79,33 +76,27 @@ cd bin cd named\win32 nmake /nologo -f named.mak CFG="named - Win32 Release" NO_EXTERNAL_DEPS="1" -copy ..\named.html ..\..\..\Build\Release cd ..\.. cd rndc\win32 nmake /nologo -f rndc.mak CFG="rndc - Win32 Release" NO_EXTERNAL_DEPS="1" nmake /nologo -f confgen.mak CFG="rndcconfgen - Win32 Release" NO_EXTERNAL_DEPS="1" -copy ..\*.html ..\..\..\Build\Release cd ..\.. cd dig\win32 nmake /nologo -f dig.mak CFG="dig - Win32 Release" NO_EXTERNAL_DEPS="1" nmake /nologo /nologo -f host.mak CFG="host - Win32 Release" NO_EXTERNAL_DEPS="1" nmake /nologo -f nslookup.mak CFG="nslookup - Win32 Release" NO_EXTERNAL_DEPS="1" -copy ..\*.html ..\..\..\Build\Release cd ..\.. cd nsupdate\win32 nmake /nologo -f nsupdate.mak CFG="nsupdate - Win32 Release" NO_EXTERNAL_DEPS="1" -copy ..\*.html ..\..\..\Build\Release cd ..\.. cd check\win32 nmake /nologo -f namedcheckconf.mak CFG="namedcheckconf - Win32 Release" NO_EXTERNAL_DEPS="1" nmake /nologo -f namedcheckzone.mak CFG="namedcheckzone - Win32 Release" NO_EXTERNAL_DEPS="1" -copy /Y ..\..\..\Build\Release\named-checkzone.exe ..\..\..\Build\Release\named-compilezone.exe -copy ..\*.html ..\..\..\Build\Release cd ..\.. cd dnssec\win32 @@ -113,9 +104,6 @@ nmake /nologo -f keygen.mak CFG="keygen - Win32 Release" NO_EXTERNAL_DEPS="1" rem nmake /nologo -f makekeyset.mak CFG="makekeyset - Win32 Release" NO_EXTERNAL_DEPS="1" rem nmake /nologo -f signkey.mak CFG="signkey - Win32 Release" NO_EXTERNAL_DEPS="1" nmake /nologo -f signzone.mak CFG="signzone - Win32 Release" NO_EXTERNAL_DEPS="1" -rem copy ..\*.html ..\..\..\Build\Release -copy ..\dnssec-keygen.html ..\..\..\Build\Release -copy ..\dnssec-signzone.html ..\..\..\Build\Release cd ..\.. rem This is the BIND 9 Installer @@ -128,8 +116,7 @@ cd .. cd win32utils -copy ..\doc\misc\migration ..\Build\Release -copy ..\doc\misc\migration-4to9 ..\Build\Release +call BuildPost.bat echo Done. diff --git a/win32utils/BuildOpenSSL.bat b/win32utils/BuildOpenSSL.bat new file mode 100644 index 0000000000..8231460c16 --- /dev/null +++ b/win32utils/BuildOpenSSL.bat @@ -0,0 +1,26 @@ +echo off +rem +rem Copyright (C) 2007 Internet Systems Consortium, Inc. ("ISC") +rem +rem Permission to use, copy, modify, and distribute this software for any +rem purpose with or without fee is hereby granted, provided that the above +rem copyright notice and this permission notice appear in all copies. +rem +rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +rem AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +rem PERFORMANCE OF THIS SOFTWARE. + +rem BuildOpenSSL.bat +rem This script copys the OpenSSL dlls into place. +rem This script may be modified by updateopenssl.pl. + +echo Copying the OpenSSL DLL. + +copy ..\..\openssl-0.9.8d\out32dll\libeay32.dll ..\Build\Release\ +copy ..\..\openssl-0.9.8d\out32dll\libeay32.dll ..\Build\Debug\ + +rem Done diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat index bfa2ed1cd5..f02a8c6338 100644 --- a/win32utils/BuildSetup.bat +++ b/win32utils/BuildSetup.bat @@ -19,6 +19,9 @@ rem BuildSetup.bat rem This script sets up the files necessary ready to build BIND 9. rem This requires perl to be installed on the system. +rem Get and update for the latest build of the openssl library +perl updateopenssl.pl + rem Set up the configuration file cd .. copy config.h.win32 config.h @@ -31,10 +34,6 @@ rem Generate header files for lib/dns call dnsheadergen.bat -echo Ensure that the OpenSSL sources are at the same level in -echo the directory tree and is named openssl-0.9.8d or libdns -echo will not build. - rem Make sure that the Build directories are there. if NOT Exist ..\Build mkdir ..\Build @@ -52,10 +51,22 @@ copy ..\doc\arm\Bv9ARM.pdf ..\Build\Release copy ..\CHANGES ..\Build\Release copy ..\FAQ ..\Build\Release -echo Copying the OpenSSL DLL. +echo Copying the standalone manual pages. -copy ..\..\openssl-0.9.8d\out32dll\libeay32.dll ..\Build\Release\ -copy ..\..\openssl-0.9.8d\out32dll\libeay32.dll ..\Build\Debug\ +copy ..\bin\named\named.html ..\Build\Release +copy ..\bin\rndc\*.html ..\Build\Release +copy ..\bin\dig\*.html ..\Build\Release +copy ..\bin\nsupdate\*.html ..\Build\Release +copy ..\bin\check\*.html ..\Build\Release +copy ..\bin\dnssec\dnssec-keygen.html ..\Build\Release +copy ..\bin\dnssec\dnssec-signzone.html ..\Build\Release + +echo Copying the migration notes. + +copy ..\doc\misc\migration ..\Build\Release +copy ..\doc\misc\migration-4to9 ..\Build\Release + +call BuildOpenSSL.bat rem rem set vcredist here so that it is correctly expanded in the if body diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl index 4c63982aca..6376a74024 100644 --- a/win32utils/updateopenssl.pl +++ b/win32utils/updateopenssl.pl @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: updateopenssl.pl,v 1.7 2007/06/19 23:47:24 tbox Exp $ +# $Id: updateopenssl.pl,v 1.8 2007/08/06 04:42:38 marka Exp $ # updateopenssl.pl # This script locates the latest version of OpenSSL in the grandparent @@ -25,7 +25,7 @@ $path = "..\\..\\"; # List of files that need to be updated with the actual version of the # openssl directory -@filelist = ("BuildSetup.bat", +@filelist = ("BuildOpenSSL.bat", "../lib/dns/win32/libdns.mak", "../lib/dns/win32/libdns.dsp");