VC 64-bit compiler complains that /FD is invalid, add a new conversion

  option to strip those.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@61746 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 33 insertions, 0 deletions

diff --git a/build/cvtdsp.pl b/build/cvtdsp.pl
index 0c0eb61b7..74a3fef61 100644
--- a/build/cvtdsp.pl
+++ b/build/cvtdsp.pl
@@ -13,9 +13,13 @@ elsif ($ARGV[0] == '-w3') {
 elsif ($ARGV[0] == '-w4') {
     find(\&tow4, '.');
 }
+elsif ($ARGV[0] == '-ia64') {
+    find(\&tovc64, '.');
+}
 else {
     print "Specify -5 or -6 for Visual Studio 5 or 6 (98) .dsp format\n";
     print "Specify -w3 or -w4 for .dsp build with warning level 3 or 4 (strict)\n\n";
+    print "Specify -ia64 for build targeted at Itanium (req's psdk tools)\n\n";
     die "Missing argument";
 }
 
@@ -157,3 +161,32 @@ sub tow4 {
     }
 }
 
+sub tovc64 { 
+
+    if (m|.dsp$| || m|.mak$|) {
+        $oname = $_;
+	$tname = '.#' . $_;
+	$verchg = 0;
+	$srcfl = new IO::File $_, "r" || die;
+	$dstfl = new IO::File $tname, "w" || die;
+	while ($src = <$srcfl>) {
+	    while ($src =~ m|\\\n$|) {
+		$src = $src . <$srcfl>
+            }
+	    if ($src =~ s|(\bCPP.*)/FD (.*)|$1$2|s) {
+		$verchg = -1;
+	    }
+            print $dstfl $src; 
+	}
+	undef $srcfl;
+	undef $dstfl;
+	if ($verchg) {
+	    unlink $oname || die;
+	    rename $tname, $oname || die;
+	    print "Converted build file " . $oname . " to Win64 in " . $File::Find::dir . "\n"; 
+	}
+	else {
+	    unlink $tname;
+	}
+    }
+}