Time to jump back into 2.0 again... here are yesterday's updates to

  the MSVC conversion scripts, since the old ones would occasional be
  whacked.  Again I ask, if you see better code here, please commit it.

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/build/cvstodsp5.pl b/build/cvstodsp5.pl
index 1bec5dce82280976bd7a268c0aa3d861c66b5c7e..d37442735f4140e5c257f0167a32d174845f1747 100644 (file)
--- a/build/cvstodsp5.pl
+++ b/build/cvstodsp5.pl
@@ -7,9 +7,10 @@ find(\&tovc5, '.');
 sub tovc5 { 
 
     if (m|.dsp$|) {
+        $oname = $_;
        $tname = '.#' . $_;
         $verchg = 0;
-       $srcfl = new IO::File $_, "r" || die;
+       $srcfl = new IO::File $oname, "r" || die;
        $dstfl = new IO::File $tname, "w" || die;
        while ($src = <$srcfl>) {
            if ($src =~ s|Format Version 6\.00|Format Version 5\.00|) {
@@ -31,9 +32,9 @@ sub tovc5 {
        undef $srcfl;
        undef $dstfl;
        if ($verchg) {
-           unlink $_;
-           rename $tname, $_;
-           print "Converted VC6 project " . $_ . " to VC5 in " . $File::Find::dir . "\n"; 
+           unlink $oname || die;
+           rename $tname, $oname || die;
+           print "Converted VC6 project " . $oname . " to VC5 in " . $File::Find::dir . "\n"; 
        }
        else {
            unlink $tname;

diff --git a/build/dsp5tocvs.pl b/build/dsp5tocvs.pl
index 7b3c13fc559982881bbef5c9fd0187a075b9607d..9686b43634b9f58ec29b8d824c60bd27b672fd1a 100644 (file)
--- a/build/dsp5tocvs.pl
+++ b/build/dsp5tocvs.pl
@@ -7,6 +7,7 @@ find(\&tovc6, '.');
 sub tovc6 { 
 
     if (m|.dsp$|) {
+        $oname = $_;
        $tname = '.#' . $_;
        $verchg = 0;
        $srcfl = new IO::File $_, "r" || die;
@@ -34,9 +35,9 @@ sub tovc6 {
        undef $srcfl;
        undef $dstfl;
        if ($verchg) {
-           unlink $_;
-           rename $tname, $_;
-           print "Converted VC5 project " . $_ . " to VC6 in " . $File::Find::dir . "\n"; 
+           unlink $oname || die;
+           rename $tname, $oname || die;
+           print "Converted VC5 project " . $oname . " to VC6 in " . $File::Find::dir . "\n"; 
        }
        else {
            unlink $tname;