[v9_6] added todos.pl for win32 build

3608.	[port]		win32: added todos.pl script to ensure all text files
			the win32 build depends on are converted to DOS
			newline format. [RT #22067]
(cherry picked from commit 1da46be57223340c07ea8505d485ec4397a4e484)

diff --git a/CHANGES b/CHANGES
index 0adeec7157d3e78e7672c369204ba5c00eeae837..56053f078de8513da74ce0f3952a1d2fa3c85bf5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+3608.  [port]          win32: added todos.pl script to ensure all text files
+                       the win32 build depends on are converted to DOS
+                       newline format. [RT #22067]
+
+
        --- 9.6-ESV-R10b1 released ---
 
 3605.  [port]          win32: Addressed several compatibility issues

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 753e6b771c0057c902094181c93e9af0a935784f..178c46a27bbf8e292d87d0926cc4ce5ca3d01ab4 100644 (file)
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -27,6 +27,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 Generate the version information
 perl makeversion.pl
 

diff --git a/win32utils/todos.pl b/win32utils/todos.pl
new file mode 100644 (file)
index 0000000..a149465
--- /dev/null
+++ b/win32utils/todos.pl
@@ -0,0 +1,39 @@
+#!/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 ($^I, @ARGV) = (defined, @_);
+        while (<>) {
+                s/[\r\n]+$/\r\n/;
+                print;
+        }
+}
+
+sub wanted {
+        return unless -f && $_ =~ qr/\.(mak|dsp|dsw|txt|bat)$/;
+        todos $File::Find::dir . "/" . $_;
+}
+
+finddepth(\&wanted, "..");

diff --git a/win32utils/win32-build.txt b/win32utils/win32-build.txt
index 006bbcd1a703cdce8c44e57a150ff72b1cbccdc4..54500561ea2e2564589cdb2d70dda0ad24c1674c 100644 (file)
--- a/win32utils/win32-build.txt
+++ b/win32utils/win32-build.txt
@@ -71,7 +71,16 @@ Step 2 Building BIND
 
 You must build openssl first. 
 
-From the command prompt cd to the win32utils under the BIND root.
+From the command prompt cd to the win32utils directory under
+the BIND9 root:
+
+  cd bind-9.6.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
+
 Execute the BuildAll.bat file. This will do the following:
 1) copy config.h.win32 to config.h in the root.
 2) create the versions.h file in the root.