[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r495117 - /apr/apr/trunk/build/fixwin32mak.pl
From:       wrowe () apache ! org
Date:       2007-01-11 4:59:02
Message-ID: 20070111045902.6B9891A981A () eris ! apache ! org
[Download RAW message or body]

Author: wrowe
Date: Wed Jan 10 20:59:01 2007
New Revision: 495117

URL: http://svn.apache.org/viewvc?view=rev&rev=495117
Log:
Revert the changes to fixwin32mak.pl - not tested, and didn't
intend to commit this

Modified:
    apr/apr/trunk/build/fixwin32mak.pl

Modified: apr/apr/trunk/build/fixwin32mak.pl
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/fixwin32mak.pl?view=diff&rev=495117&r1=495116&r2=495117
 ==============================================================================
--- apr/apr/trunk/build/fixwin32mak.pl (original)
+++ apr/apr/trunk/build/fixwin32mak.pl Wed Jan 10 20:59:01 2007
@@ -14,9 +14,7 @@
 # ignore our own direcory (allowing us to move into any parallel tree)
 $root =~ s|^.:(.*)?$|cd "$1|;
 $root =~ s|/|\\\\|g;
-$altroot = $root;
-$altroot =~ s| ".:| "|;
-print "Stripping " . $root . " and " . $altroot . "\n";
+print "Testing " . $root . "\n";
 find(\&fixcwd, '.');
 
 sub fixcwd { 
@@ -25,29 +23,26 @@
 	$thisroot =~ s|^./(.*)$|$1|;
 	$thisroot =~ s|/|\\\\|g;
         $thisroot = $root . "\\\\" . $thisroot;
-        $thisaltroot = $altroot . "\\\\" . $thisroot;
         $oname = $_;
 	$tname = '.#' . $_;
 	$verchg = 0;
+#print "Processing " . $thisroot . " of " . $_ . "\n";
 	$srcfl = new IO::File $_, "r" || die;
 	$dstfl = new IO::File $tname, "w" || die;
 	while ($src = <$srcfl>) {
 	    if ($src =~ m|^\s*($root[^\"]*)\".*$|) {
+#print "Found " . $1 . "\"\n";
 		$orig = $thisroot;
-            } elsif ($src =~ m|^\s*($altroot[^\"]*)\".*$|) {
-		$orig = $thisaltroot;
-            }
-            if (defined($orig)) {
                 $repl = "cd \".";
                 while (!($src =~ s|$orig|$repl|)) {
+#print "Tried replacing " . $orig . " with " . $repl . "\n";
 		   if (!($orig =~ s|^(.*)\\\\[^\\]+$|$1|)) {
                        break;
                    }
 		   $repl .= "\\..";
 		}
-print "Replaced " . $orig . " with " . $repl . "\n";
+#print "Replaced " . $orig . " with " . $repl . "\n";
 		$verchg = -1;
-                undef $orig;
 	    }
             print $dstfl $src; 
 	}


[prev in list] [next in list] [prev in thread] [next in thread]