9.9.4rc1

3 files changed, 60 insertions, 1 deletions

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 5494b26b..a0d6dffc 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -24,6 +24,9 @@ cd ..
 copy config.h.win32 config.h

 cd win32utils

 

+rem Make sure all the files that need to be in DOS format really are

+perl todos.pl

+

 rem Get and update for the latest build of the openssl and libxml libraries

 perl updateopenssl.pl

 perl updatelibxml2.pl

@@ -53,6 +56,7 @@ copy index.html ..\Build\Release
 copy ..\doc\arm\*.html ..\Build\Release

 copy ..\doc\arm\Bv9ARM.pdf ..\Build\Release

 copy ..\CHANGES ..\Build\Release

+if Exist ..\CHANGES.SE copy ..\CHANGES.SE ..\Build\Release

 copy ..\FAQ ..\Build\Release

 

 echo Copying the standalone manual pages.

diff --git a/win32utils/todos.pl b/win32utils/todos.pl
new file mode 100644
index 00000000..2baf6634
--- /dev/null
+++ b/win32utils/todos.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+#
+# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+# todos.pl
+# This script performs the equivalent of unix2dos on all the files in
+# the BIND 9 source tree that require DOS-style newlines when building
+# for win32.
+#
+# Path and directory
+use strict;
+use File::Find;
+
+sub todos {
+	local @ARGV = @_;
+	unshift (@ARGV, '-') unless @ARGV;
+	while ($ARGV = shift) {
+		open(FH, $ARGV);
+		binmode(FH);
+		my @lines = <FH>;
+		close(FH);
+
+		open(FH, ">$ARGV");
+		binmode(FH);
+		for my $line (@lines) {
+			$line =~ s/[\r\n]+$/\r\n/;
+			print FH $line;
+		}
+		close(FH);
+	}
+}
+
+sub wanted {
+	return unless -f && $_ =~ qr/\.(mak|dsp|dsw|txt|bat)$/;
+	todos $_;
+}
+
+finddepth(\&wanted, "..");
diff --git a/win32utils/win32-build.txt b/win32utils/win32-build.txt
index 76a3ea9a..25efe865 100644
--- a/win32utils/win32-build.txt
+++ b/win32utils/win32-build.txt
@@ -104,11 +104,16 @@ the BIND9 root:
 

   cd bind-9.9.0\win32utils

 

+Text files used by the Windows build should be in DOS format.

+If for some reason they aren't, this can be corrected by running:

+

+  perl todos.pl

+

 If you wish to use PKCS #11 to control a cryptographic hardware service

 module, set the path to the PKCS #11 provider library:

 

   perl setpk11provider.pl <DLL path>

-  

+

 If using VC++ 6.0, run the BuildAll.bat file:

 

   BuildAll