PR:

Obtained from:
Submitted by:
Reviewed by:

  Whoops, though I had already knocked off that nasty chomp() side effect.

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

diff --git a/build/cvstodsp5.pl b/build/cvstodsp5.pl
index 183ce2a4bc0987cdba0e6bfda962133297093d5a..d04597fd686e19618ae0dca3fa29b925d8d6ad1b 100644 (file)
--- a/build/cvstodsp5.pl
+++ b/build/cvstodsp5.pl
@@ -8,7 +8,7 @@ sub tovc5 {
 
     if (m|.dsp$|) {
        $tname = '.#' . $_;
-       print "Convert project " . $_ . " to CVS standard VC5 in " . $File::Find::dir . "\n"; 
+       print "Convert VC6 project " . $_ . " to VC5 in " . $File::Find::dir . "\n"; 
        $srcfl = new IO::File $_, "r" || die;
        $dstfl = new IO::File $tname, "w" || die;
        while ($src = <$srcfl>) {

diff --git a/build/dsp5tocvs.pl b/build/dsp5tocvs.pl
index 4f18d15a52c5cb2ccf3209e43ac36ed2dae799e3..47867e6cb60606891150d3b1803e413dbfb8e116 100644 (file)
--- a/build/dsp5tocvs.pl
+++ b/build/dsp5tocvs.pl
@@ -8,7 +8,7 @@ sub tovc6 {
 
     if (m|.dsp$|) {
        $tname = '.#' . $_;
-       print "Convert project " . $_ . " to VC6 in " . $File::Find::dir . "\n"; 
+       print "Convert VC6 project " . $_ . " to VC5 in " . $File::Find::dir . "\n"; 
        $srcfl = new IO::File $_, "r" || die;
        $dstfl = new IO::File $tname, "w" || die;
        while ($src = <$srcfl>) {
@@ -17,8 +17,7 @@ sub tovc6 {
            $src =~ s|^(# ADD BASE CPP .*)/Zi (.*)|$1/ZI $2|;
            if ($src =~ s|^(!MESSAGE .*)\\\n|$1|) {
                 $cont = <$srcfl>;
-               chomp $src;
-               $src = chomp($src) . $cont;
+               $src = $src . $cont;
             }
             print $dstfl $src; 
            if ($src =~ m|^# Begin Project|) {